Ysurac / FlightAirMap

install/class.update_schema.php

Spacing +235 added lines, -235 removed lines

@@ -14,11 +14,11 @@ 
             try {
             	$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+    	    } catch (PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
     	    }
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
     	    }
 	
 	}
@@ -50,7 +50,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		// Copy schedules data to routes table
@@ -60,7 +60,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
     		}
     		// Add source column
@@ -68,7 +68,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Delete unused column
@@ -76,7 +76,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Add ModeS column
@@ -84,14 +84,14 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
     		}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
     		}
     		// Add auto_increment for aircraft_modes
@@ -99,7 +99,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -110,7 +110,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -123,7 +123,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -134,7 +134,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -147,7 +147,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		// Add image_source_website column to spotter_image
@@ -155,7 +155,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -164,7 +164,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -182,7 +182,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -196,7 +196,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to aircraft
@@ -204,7 +204,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to spotter_live
@@ -212,7 +212,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -225,7 +225,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -233,7 +233,7 @@ 
 
 	private static function update_from_6() {
     		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
@@ -250,7 +250,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -265,7 +265,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -274,12 +274,12 @@ 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -287,7 +287,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -299,15 +299,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -320,7 +320,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -339,14 +339,14 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
     		}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -354,12 +354,12 @@ 
 
 	private static function update_from_9() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -371,7 +371,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -379,11 +379,11 @@ 
 
 	private static function update_from_10() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -401,7 +401,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -410,18 +410,18 @@ 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
     		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -429,7 +429,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -441,15 +441,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -459,7 +459,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -487,7 +487,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -495,12 +495,12 @@ 
 
 	private static function update_from_13() {
     		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+	    		} catch (PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
     			}
 		}
@@ -509,7 +509,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -527,7 +527,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -538,11 +538,11 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
 		if ($error != '') return $error;
@@ -550,7 +550,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -571,7 +571,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -589,7 +589,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -598,12 +598,12 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
     	        	try {
 	            	    $sth = $Connection->db->prepare($query);
 			    $sth->execute();
-    			} catch(PDOException $e) {
+    			} catch (PDOException $e) {
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
@@ -612,7 +612,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -629,73 +629,73 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
     		}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
     		}
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -704,7 +704,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -719,13 +719,13 @@ 
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
 			// Add column over_country
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
         		try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
@@ -741,7 +741,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -750,13 +750,13 @@ 
 	private static function update_from_21() {
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
 			// Rename type to stats_type
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
 			if ($error != '') return $error;
@@ -765,7 +765,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -788,7 +788,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -814,17 +814,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -833,7 +833,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -849,23 +849,23 @@ 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
 		if ($error != '') return 'Import airlines.sql : '.$error;
-		if (!$Connection->checkColumnName('airlines','forsource')) {
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add forsource column) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -877,17 +877,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -899,17 +899,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -921,36 +921,36 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
 			}
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
 				// Add unique key
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			} else {
@@ -963,18 +963,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -986,17 +986,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1008,17 +1008,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1030,7 +1030,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1039,7 +1039,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1049,13 +1049,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1067,17 +1067,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1089,7 +1089,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1097,7 +1097,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1107,12 +1107,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('atc','format_source')) {
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1120,7 +1120,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1130,13 +1130,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1148,7 +1148,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1156,7 +1156,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1166,23 +1166,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
 			// Add unique key
 			$query = "alter table spotter_live add index(latitude,longitude)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1198,7 +1198,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1208,13 +1208,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($Connection->checkColumnName('aircraft','mfr')) {
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
 			// drop mfr to aircraft
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1230,7 +1230,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1240,33 +1240,33 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('notam','ref_idx')) {
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
 			// Add index key
 			$query = "create index ref_idx on notam (ref)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','registration_idx')) {
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','rdts')) {
+		if (!$Connection->indexExists('accidents', 'rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1275,7 +1275,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1285,23 +1285,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
 			// Add airline_name to accidents
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
 			// Add airline_icao to accidents
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1309,7 +1309,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1319,13 +1319,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','alliance')) {
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
 			// Add alliance to airlines
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1352,7 +1352,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1362,13 +1362,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
 			// Add ban_eu to airlines
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1376,7 +1376,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1387,19 +1387,19 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
 				}
 				
@@ -1407,7 +1407,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
@@ -1458,7 +1458,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (fix date) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1543,7 +1543,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1552,13 +1552,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('accidents','type')) {
+		if (!$Connection->indexExists('accidents', 'type')) {
 			// Add index key
 			$query = "create index type on accidents (type,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1566,7 +1566,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1576,12 +1576,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1647,7 +1647,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1699,7 +1699,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
 			}
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -1708,18 +1708,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
 			// Add index key
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1727,7 +1727,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1738,148 +1738,148 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1888,7 +1888,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1903,14 +1903,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		} else {
@@ -1918,14 +1918,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1933,7 +1933,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1943,32 +1943,32 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1977,7 +1977,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1987,12 +1987,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','description')) {
+		if (!$Connection->checkColumnName('source_location', 'description')) {
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2000,7 +2000,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2010,39 +2010,39 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2050,7 +2050,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2072,14 +2072,14 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
 		}
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2120,7 +2120,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2143,7 +2143,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2193,7 +2193,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2216,7 +2216,7 @@ 
 					try {
 						$sth = $Connection->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error (check_version): ".$e->getMessage()."\n";
 					}
 					$result = $sth->fetch(PDO::FETCH_ASSOC);

search.php

Spacing +102 added lines, -102 removed lines

@@ -26,24 +26,24 @@ 
 $sql_date = '';
 if (isset($_GET['start_date'])) {
 	//for the date manipulation into the query
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			//$end_date = $_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $start_date.",".$end_date;
 		}
-	} else if($_GET['start_date'] != ""){
+	} else if ($_GET['start_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			$sql_date = $start_date;
 		}
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['end_date']) !== false) {
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $end_date;
 		}
 	} else $sql_date = '';
@@ -51,21 +51,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $start_altitude.",".$end_altitude;
-	} else if($_GET['highest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	} else if ($_GET['highest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $end_altitude;
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
 	} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	if (!isset($_GET['number_results']))
 	{
@@ -73,17 +73,17 @@ 
 		$limit_end = 25;
 		$absolute_difference = 25;
 	} else {
-		if ($_GET['number_results'] > 1000){
+		if ($_GET['number_results'] > 1000) {
 			$_GET['number_results'] = 1000;
 		}
 		$limit_start = 0;
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 }
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -112,31 +112,31 @@ 
     ((isset($_GET['origlat']) && $_GET['origlat'] != '') &&
     (isset($_GET['origlon']) && $_GET['origlon'] != '') &&
     (isset($_GET['dist']) && $_GET['dist'] != ''))
-    ){  
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
-	$mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT);
-	$imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT);
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT);
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT);
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
-	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+    ) {  
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+	$mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT);
+	$imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT);
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT);
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT);
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
+	$number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	if ($dist != '') {
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
@@ -145,15 +145,15 @@ 
 	if ($archive == 1) {
 		if ($type == 'aircraft') {
 			$SpotterArchive = new SpotterArchive();
-			$spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'tracker') {
-			$spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'marine') {
-			$spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	}
 	 
@@ -189,12 +189,12 @@ 
 	//remove 3D=true parameter
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
-	if (!isset($_GET['3D'])){
+	if (!isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
 	} else {
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
 	}
-	if (isset($_GET['3D'])){
+	if (isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
 	} else {
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
@@ -215,32 +215,32 @@ 
 		print '<div class="column">';
 		print '<div class="info">';
 		print '<h1>'._("Search Results for").' ';
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
-		if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; }
-		if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
+		if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; }
+		if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
 		print '</h1>';
 		print '</div>';
 
@@ -374,7 +374,7 @@ 
 					    </select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
 						<div class="col-sm-10">
@@ -383,7 +383,7 @@ 
 							</select>
 						</div>
 				</div>
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> 
 					<div class="col-sm-10">
@@ -406,7 +406,7 @@ 
 					</div>
 				</div>
 <?php
-	}else {
+	} else {
 ?>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -419,8 +419,8 @@ 
 ?>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -434,7 +434,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -443,7 +443,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> 
 					<div class="col-sm-10">
@@ -452,10 +452,10 @@ 
 				</div>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -469,7 +469,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -478,7 +478,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Route"); ?></legend>
@@ -490,7 +490,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> 
 					<div class="col-sm-10">
@@ -499,7 +499,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend>Altitude</legend>
@@ -510,9 +510,9 @@ 
 							<option></option>
 <?php
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-foreach($altitude_array as $altitude)
+foreach ($altitude_array as $altitude)
 {
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
 	{
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 	} else {
@@ -530,9 +530,9 @@ 
 							<option></option>
 <?php
 	$altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-	foreach($altitude_array as $altitude)
+	foreach ($altitude_array as $altitude)
 	{
-		if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
+		if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
 		{
 			print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 		} else {
@@ -655,10 +655,10 @@ 
 				<div class="col-sm-10">
 					<select class="form-control" name="number_results">
 <?php
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
-foreach($number_results_array as $number)
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
+foreach ($number_results_array as $number)
 {
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
 	{
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
 	} else {
@@ -677,7 +677,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 					<p class="help-block">Disabled in demo</p>
 				</div>
 			</div>
@@ -688,7 +688,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 				</div>
 			</div>
 		</fieldset>

statistics.php

Spacing +148 added lines, -148 removed lines

@@ -23,7 +23,7 @@ 
 }
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -32,7 +32,7 @@ 
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
 	if (isset($airline_info[0]['name'])) {
 		$airline_name = $airline_info[0]['name'];
-	} elseif (strpos($airline_icao,'alliance_') !== FALSE) {
+	} elseif (strpos($airline_icao, 'alliance_') !== FALSE) {
 		$alliance_name = $airline_icao;
 	}
 }
@@ -42,8 +42,8 @@ 
 	$title = _("Statistics");
 }
 
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 
 require_once('header.php');
 
@@ -74,7 +74,7 @@ 
 	date_default_timezone_set('UTC');
 	$lastupdate = strtotime($last_update[0]['value']);
 	if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
-	print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
+	print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
 }
 
 ?>
@@ -86,31 +86,31 @@ 
 <?php
 if ($type == 'aircraft') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
@@ -118,8 +118,8 @@ 
 	if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) {
 		if ($airline_icao == '' || $airline_icao == 'all') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 		}
 	}
@@ -127,22 +127,22 @@ 
 <?php
 } elseif ($type == 'marine') {
 ?>
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 } elseif ($type == 'tracker') {
 ?>
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 }
 ?>
     </p>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     <div class="specific-stats">
 <?php
 if ($type == 'aircraft') {
@@ -151,13 +151,13 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
 <?php
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
 	if (count($aircraft_array) == 0) {
 		print _("No data available");
 	} else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$aircraft_data = '';
-		foreach($aircraft_array as $aircraft_item) {
+		foreach ($aircraft_array as $aircraft_item) {
 			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 		}
@@ -186,16 +186,16 @@ 
 ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '' || $airline_icao == 'all') {
-		$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
+		$airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month);
 		if (count($airline_array) > 0) {
 			print '<div class="col-md-6">';
 			print '<h2>'._("Top 10 Most Common Airline").'</h2>';
 			print '<div id="chart2" class="chart" width="100%"></div><script>';
 			$airline_data = '';
-			foreach($airline_array as $airline_item) {
+			foreach ($airline_array as $airline_item) {
 				$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 			}
 			$airline_data = substr($airline_data, 0, -1);
@@ -220,7 +220,7 @@ 
 		}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 }
@@ -232,12 +232,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
 <?php
-	$marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
+	$marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month);
 	if (count($marine_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$marine_data = '';
-		foreach($marine_array as $marine_item) {
+		foreach ($marine_array as $marine_item) {
 			$marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],';
 		}
 		$marine_data = substr($marine_data, 0, -1);
@@ -267,7 +267,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -277,12 +277,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
 <?php
-	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
+	$tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month);
 	if (count($tracker_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$tracker_data = '';
-		foreach($tracker_array as $tracker_item) {
+		foreach ($tracker_array as $tracker_item) {
 			$tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],';
 		}
 		$tracker_data = substr($tracker_data, 0, -1);
@@ -312,7 +312,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -327,7 +327,7 @@ 
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -347,7 +347,7 @@ 
                 </div>
                 -->
             </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2>
 <?php
@@ -356,7 +356,7 @@ 
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($countries_array as $owner_item) {
+			foreach ($countries_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['country_name'].'",'.$owner_item['country_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -377,7 +377,7 @@ 
                 -->
             </div>
             
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 ²	</div>
         <div class="row column">
             <div class="col-md-6">
@@ -388,7 +388,7 @@ 
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$launch_site_data = '';
-			foreach($launch_site_array as $launch_site_item) {
+			foreach ($launch_site_array as $launch_site_item) {
 				$launch_site_data .= '["'.$launch_site_item['launch_site'].'",'.$launch_site_item['launch_site_count'].'],';
 			}
 			$launch_site_data = substr($launch_site_data, 0, -1);
@@ -415,7 +415,7 @@ 
 ?>
         <div class="row column">
 <?php
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month);
 	//if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 		if (empty($flightover_array)) {
@@ -426,12 +426,12 @@ 
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
-		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
+		$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month);
 		if (count($pilot_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$pilot_data = '';
-			foreach($pilot_array as $pilot_item) {
+			foreach ($pilot_array as $pilot_item) {
 				$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 			}
 			$pilot_data = substr($pilot_data, 0, -1);
@@ -452,7 +452,7 @@ 
 ?>
             </div>
 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	// else {
@@ -461,12 +461,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
-		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
+		$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month);
 		if (count($owner_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -485,7 +485,7 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if (!empty($flightover_array)) {
@@ -499,7 +499,7 @@ 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
-			foreach($flightover_array as $flightover_item) {
+			foreach ($flightover_array as $flightover_item) {
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 			}
 			$flightover_data = substr($flightover_data, 0, -1);
@@ -544,7 +544,7 @@ 
 	}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 }
@@ -560,7 +560,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -617,7 +617,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -667,14 +667,14 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array) > 0) {
 		print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 		print '<div id="chart3" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array as $airport_item) {
+		foreach ($airport_airport_array as $airport_item) {
 			$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 		}
 		$airport_data = substr($airport_data, 0, -1);
@@ -724,18 +724,18 @@ 
 	}
 ?>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array2) > 0) {
 		print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 		print '<div id="chart4" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array2 as $airport_item)
+		foreach ($airport_airport_array2 as $airport_item)
 		{
 			$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 		}
@@ -787,7 +787,7 @@ 
 ?>
             </div>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php 
 }
 if ($type == 'aircraft') {
@@ -799,18 +799,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -823,22 +823,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -851,23 +851,23 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -880,22 +880,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -908,7 +908,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -924,18 +924,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['vessels',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -949,22 +949,22 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['vessels',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -977,23 +977,23 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['vessels',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1006,22 +1006,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1034,7 +1034,7 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1056,12 +1056,12 @@ 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['trackers',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -1075,7 +1075,7 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
@@ -1085,12 +1085,12 @@ 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['trackers',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -1103,7 +1103,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
@@ -1114,12 +1114,12 @@ 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['trackers',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1132,22 +1132,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Tracker->countAllHours('hour',true);
+		$hour_array = $Tracker->countAllHours('hour', true);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1160,7 +1160,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1182,12 +1182,12 @@ 
 			print '<div id="chart21" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart21",
 			    data: { x: "x",
@@ -1203,7 +1203,7 @@ 
             -->
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2>
 <?php
@@ -1213,12 +1213,12 @@ 
 			print '<div id="chart22" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-01-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart22",
 			    data: { x: "x",
@@ -1234,7 +1234,7 @@ 
             -->
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1256,12 +1256,12 @@ 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-01-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart32",
 			    data: { x: "x",
@@ -1274,7 +1274,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
@@ -1286,12 +1286,12 @@ 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart33",
 			    data: { x: "x",
@@ -1304,7 +1304,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <br/>
 <?php
 	}
@@ -1318,19 +1318,19 @@ 
 	//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',$year,$month);
+			$polar = $Stats->getStatsSource('polar', $year, $month);
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',$year,$month);
+			$polar = $Stats->getStatsSource('polar_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',$year,$month);
+			$polar = $Stats->getStatsSource('polar_tracker', $year, $month);
 		}
 	}
 	if (!empty($polar)) {
@@ -1339,7 +1339,7 @@ 
 			unset($polar_data);
 			$Spotter = new Spotter();
 			$data = json_decode($eachpolar['source_data']);
-			foreach($data as $value => $key) {
+			foreach ($data as $value => $key) {
 				$direction = $Spotter->parseDirection(($value*22.5));
 				$distance = $key;
 				$unit = 'km';
@@ -1359,7 +1359,7 @@ 
 ?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
         	<script>
         	    (function() {
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -1383,7 +1383,7 @@ 
 		      color: color,
 		      unit: '<?php echo $unit; ?>'
 		    };
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
 		    })();
 		</script>
             </div>
@@ -1398,19 +1398,19 @@ 
 	//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',$year,$month);
+			$msg = $Stats->getStatsSource('msg', $year, $month);
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',$year,$month);
+			$msg = $Stats->getStatsSource('msg_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',$year,$month);
+			$msg = $Stats->getStatsSource('msg_tracker', $year, $month);
 		}
 	}
 	if (!empty($msg)) {
@@ -1418,13 +1418,13 @@ 
 		foreach ($msg as $eachmsg) {
 			//$eachmsg = $msg[0];
 			$data = $eachmsg['source_data'];
-			if ($data > 500) $max = (round(($data+100)/100))*100;
+			if ($data > 500) $max = (round(($data + 100)/100))*100;
 			else $max = 500;
 ?>
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
 			    value: <?php echo $data; ?>,
 			    min: 0,
 			    max: <?php print $max; ?>,
@@ -1446,19 +1446,19 @@ 
 	//$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',$year,$month);
+			$hist = $Stats->getStatsSource('hist', $year, $month);
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',$year,$month);
+			$hist = $Stats->getStatsSource('hist_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',$year,$month);
+			$hist = $Stats->getStatsSource('hist_tracker', $year, $month);
 		}
 	}
 	foreach ($hist as $hists) {
@@ -1468,7 +1468,7 @@ 
 		$source = $hists['source_name'];
 		$hist_array = json_decode($hists['source_data']);
 		$unit = 'km';
-		foreach($hist_array as $distance => $nb) {
+		foreach ($hist_array as $distance => $nb) {
 			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 				$distance = round($distance*0.539957);
 				$unit = 'nm';
@@ -1488,18 +1488,18 @@ 
 		$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
 ?>
             <div class="col-md-6">
-                <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2>
+                <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2>
 <?php
-		print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
+		print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>';
 		print 'c3.generate({
-		    bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
+		    bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'",
 		    data: { x: "x",
 		    columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
 		    axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 		print '</script>';
 ?>
     	    </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>

require/class.Stats.php

Spacing +586 added lines, -586 removed lines

@@ -21,14 +21,14 @@ 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
 	}
 
-	public function addLastStatsUpdate($type,$stats_date) {
+	public function addLastStatsUpdate($type, $stats_date) {
 		$query = "DELETE FROM config WHERE name = :type;
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -38,7 +38,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -59,7 +59,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -72,14 +72,14 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -91,77 +91,77 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
 		}
 		return $all;
 	}
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$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";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$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";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -169,23 +169,23 @@ 
 	}
 
 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -196,29 +196,29 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -227,7 +227,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -235,32 +235,32 @@ 
 		if (empty($all)) {
 			$Spotter = new Spotter($this->db);
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
 		}
 		return $all;
 	}
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -271,21 +271,21 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -294,23 +294,23 @@ 
 		return $all;
 	}
 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -321,61 +321,61 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
 		}
 		return $all;
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
 			$query_values = array(':filter_name' => $filter_name);
 		} else {
 			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";
 			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";
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -384,7 +384,7 @@ 
 		return $all;
 	}
 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -393,7 +393,7 @@ 
 			if (isset($forsource)) {
 				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";
 				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";
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
 			} else {
 				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";
 				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";
@@ -402,7 +402,7 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -410,32 +410,32 @@ 
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
             		if ($filter_name != '') {
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
                 }
                 return $all;
 	}
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -446,45 +446,45 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -495,46 +495,46 @@ 
 				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";
 				 try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		$Connection = new Connection($this->db);
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($Connection->tableExists('countries')) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
 				$Spotter = new Spotter($this->db);
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 				if ($year == '' && $month == '') {
 					$alliance_airlines = array();
 					foreach ($airlines as $airline) {
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 					}
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':filter_name' => $filter_name));
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						echo "error : ".$e->getMessage();
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -546,8 +546,8 @@ 
 					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";
 					 try {
 						$sth = $this->db->prepare($query);
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-					} catch(PDOException $e) {
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+					} catch (PDOException $e) {
 						echo "error : ".$e->getMessage();
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -564,7 +564,7 @@ 
 			return array();
 		}
 	}
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -572,41 +572,41 @@ 
 			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";
 			try {
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		} else $all = array();
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
 		}
 		return $all;
 	}
 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -617,45 +617,45 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
 		}
 		return $all;
 	}
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -666,27 +666,27 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
 			$all = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -702,27 +702,27 @@ 
 			foreach ($all as $key => $row) {
 				$count[$key] = $row['airport_departure_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$all);
+			array_multisort($count, SORT_DESC, $all);
 		}
 		return $all;
 	}
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -733,27 +733,27 @@ 
 				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";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			} else $all = array();
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
 			$all = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -769,26 +769,26 @@ 
 			foreach ($all as $key => $row) {
 				$count[$key] = $row['airport_arrival_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$all);
+			array_multisort($count, SORT_DESC, $all);
 		}
 		return $all;
 	}
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
 			} else {
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -799,23 +799,23 @@ 
 				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";
 				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";
 			}
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllMonthsLastYear($filters);
@@ -823,57 +823,57 @@ 
 		return $all;
 	}
 	
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			$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";
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDatesLastMonth($filters);
 		}
 		return $all;
 	}
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			} else {
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -882,60 +882,60 @@ 
 			} else {
 				$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 			}
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDatesLast7Days($filters);
 		}
 		return $all;
 	}
-	public function countAllDates($stats_airline = '',$filter_name = '') {
+	public function countAllDates($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			$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";
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDates($filters);
@@ -950,7 +950,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -972,7 +972,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -994,34 +994,34 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllDatesByAirlines($filters);
 		}
 		return $all;
 	}
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
 			} else {
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
@@ -1035,18 +1035,18 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllMonths($filters);
@@ -1063,7 +1063,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1083,7 +1083,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1100,32 +1100,32 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
 			$filters = array();
 			if ($filter_name != '') {
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllMilitaryMonths($filters);
 		}
 		return $all;
 	}
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			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";
@@ -1143,37 +1143,37 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			} else {
 				$filters = array('airlines' => array($stats_airline));
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
-			$all = $Spotter->countAllHours($orderby,$filters);
+			$all = $Spotter->countAllHours($orderby, $filters);
 		}
 		return $all;
 	}
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1181,16 +1181,16 @@ 
 		}
 		return $all;
 	}
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1198,19 +1198,19 @@ 
 		}
 		return $all;
 	}
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '') $year = date('Y');
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1218,48 +1218,48 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		} else {
 			if ($year == '' && $month == '') {
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 				try {
 					$sth = $this->db->prepare($query);
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
-				} catch(PDOException $e) {
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1267,7 +1267,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($year == '' && $month == '') {
@@ -1275,17 +1275,17 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
 		if (empty($all)) {
 			$filters = array();
-			$filters = array('year' => $year,'month' => $month);
+			$filters = array('year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1293,29 +1293,29 @@ 
 		}
 		return $all;
 	}
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			if ($year == '' && $month == '') {
 				$alliance_airlines = array();
 				foreach ($airlines as $airline) {
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 				}
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 				$query_values = array(':filter_name' => $filter_name);
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
 			} else {
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 			}
 		} else {
 			if ($year == '' && $month == '') {
@@ -1324,23 +1324,23 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
 			} else {
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
 			}
 		}
 		if (empty($all)) {
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
 			} else {
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			}
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1348,7 +1348,7 @@ 
 		}
 		return $all;
 	}
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		//if ($year == '') $year = date('Y');
@@ -1358,18 +1358,18 @@ 
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
 		} else {
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
 		}
 		if (empty($all)) {
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
 			if ($filter_name != '') {
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
 			}
 			$Spotter = new Spotter($this->db);
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1378,104 +1378,104 @@ 
 		return $all;
 	}
 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
 		} else {
 			$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";
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 	}
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		global $globalArchiveMonths, $globalDBdriver;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
 				if ($month == '') {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
 				} else {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			} else {
 				if ($month == '') {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
 				} else {
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			}
 		} else {
 			if ($globalDBdriver == 'mysql') {
 				if ($month == '') {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 				} else {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			} else {
 				if ($month == '') {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 				} else {
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
 				}
 			}
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1484,17 +1484,17 @@ 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			} else {
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			}
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
 		} else {
@@ -1508,7 +1508,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1517,17 +1517,17 @@ 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
 			$alliance_airlines = array();
 			foreach ($airlines as $airline) {
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			} else {
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
 			}
 		} else {
 			if ($globalDBdriver == 'mysql') {
@@ -1539,7 +1539,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1556,7 +1556,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1573,20 +1573,20 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all[0]['total'];
 	}
-	public function getStatsOwner($owner_name,$filter_name = '') {
+	public function getStatsOwner($owner_name, $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
-		} catch(PDOException $e) {
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1604,20 +1604,20 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':filter_name' => $filter_name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all[0]['total'];
 	}
-	public function getStatsPilot($pilot,$filter_name = '') {
+	public function getStatsPilot($pilot, $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
-		} catch(PDOException $e) {
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1625,7 +1625,7 @@ 
 		else return 0;
 	}
 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -1633,15 +1633,15 @@ 
 		} else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($filter_name == '') $filter_name = $this->filter_name;
 		if ($globalDBdriver == 'mysql') {
@@ -1650,11 +1650,11 @@ 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 		}
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -1678,95 +1678,95 @@ 
         }
         */
 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
 		global $globalDBdriver;
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
 		$query_values = array();
 		if ($globalDBdriver == 'mysql') {
 			if ($year != '') {
 				$query .= ' AND YEAR(stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND MONTH(stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND DAY(stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		} else {
 			if ($year != '') {
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 			if ($month != '') {
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 			if ($day != '') {
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " ORDER BY source_name";
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 		return $all;
 	}
 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
+	public function addStatSource($data, $source_name, $stats_type, $date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
 		}
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1781,15 +1781,15 @@ 
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1804,15 +1804,15 @@ 
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1827,15 +1827,15 @@ 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
 			}
 		}
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1850,15 +1850,15 @@ 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1873,15 +1873,15 @@ 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1896,15 +1896,15 @@ 
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1919,15 +1919,15 @@ 
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1942,15 +1942,15 @@ 
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
 		}
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			if ($reset) {
@@ -1965,15 +1965,15 @@ 
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
 			}
 		}
-		$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
+		$query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -1989,16 +1989,16 @@ 
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 	}
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2006,16 +2006,16 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 	}
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2031,16 +2031,16 @@ 
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
 				}
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
 	}
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
 		global $globalDBdriver;
 		if ($airport_icao != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -2048,11 +2048,11 @@ 
 			} else {
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
 			}
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -2064,7 +2064,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2074,7 +2074,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2084,7 +2084,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2094,7 +2094,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -2104,13 +2104,13 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
 
 	public function addOldStats() {
-		global $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
+		global $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
 		$Common = new Common();
 		$Connection = new Connection($this->db);
 		date_default_timezone_set('UTC');
@@ -2125,9 +2125,9 @@ 
 			$filtername = 'marine';
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
+					$this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
@@ -2137,38 +2137,38 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			echo 'Marine data...'."\n";
 			$this->deleteStatMarine('month');
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDatesMarine();
 			$this->deleteStatMarine('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatMarine('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
 			}
 			echo 'Insert last stats update date...'."\n";
 			date_default_timezone_set('UTC');
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
 		}
 		if (isset($globalTracker) && $globalTracker) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
@@ -2180,9 +2180,9 @@ 
 			$Tracker = new Tracker($this->db);
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
@@ -2192,38 +2192,38 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
+				$this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
 			}
 			echo 'Tracker data...'."\n";
 			$this->deleteStatTracker('month');
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDatesTracker();
 			$this->deleteStatTracker('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatTracker('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
 			}
 			echo 'Insert last stats update date...'."\n";
 			date_default_timezone_set('UTC');
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
 		}
 
 		if (isset($globalAircraft) && $globalAircraft) {
@@ -2241,41 +2241,41 @@ 
 			$Spotter = new Spotter($this->db);
 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all airlines...'."\n";
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all registrations...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners...'."\n";
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots...'."\n";
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
 			}
 			
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order departure airports...'."\n";
 			$alldata = array();
 			foreach ($pall as $value) {
@@ -2292,14 +2292,14 @@ 
 			foreach ($alldata as $key => $row) {
 				$count[$key] = $row['airport_departure_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				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);
+				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);
 			}
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
 			$alldata = array();
 			foreach ($pall as $value) {
@@ -2316,18 +2316,18 @@ 
 			foreach ($alldata as $key => $row) {
 				$count[$key] = $row['airport_arrival_icao_count'];
 			}
-			array_multisort($count,SORT_DESC,$alldata);
+			array_multisort($count, SORT_DESC, $alldata);
 			foreach ($alldata as $number) {
-				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);
+				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);
 			}
 			if ($Connection->tableExists('countries')) {
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
 				}
 			}
 			
@@ -2337,12 +2337,12 @@ 
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
 				}
 				$this->deleteStatsByType('fatalities_bymonth');
 				$alldata = $Accident->countFatalitiesLast12Months();
 				foreach ($alldata as $number) {
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
 				}
 			}
 
@@ -2356,37 +2356,37 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
 			foreach ($alldata as $number) {
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
 			foreach ($alldata as $number) {
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
 			foreach ($alldata as $number) {
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
 			foreach ($alldata as $number) {
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
 			foreach ($alldata as $number) {
-				$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'])));
+				$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'])));
 			}
 			if ($globalDebug) echo 'Airports data...'."\n";
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2431,7 +2431,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -2472,7 +2472,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
 			}
 
 			echo 'Flights data...'."\n";
@@ -2480,28 +2480,28 @@ 
 			echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
 			}
 			echo '-> countAllDates...'."\n";
 			$previousdata = $this->countAllDates();
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
 			$this->deleteStatFlight('date');
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
 			}
 			
 			$this->deleteStatFlight('hour');
 			echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
 			}
 
 			// Count by airlines
@@ -2510,42 +2510,42 @@ 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
 				$SpotterArchive = new SpotterArchive($this->db);
 				//$Spotter = new Spotter($this->db);
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 				foreach ($alldata as $number) {
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
 				}
 			}
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
 			}
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
 			foreach ($alldata as $number) {
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
 			}
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
 			//$alldata = array();
 			foreach ($dall as $value) {
@@ -2565,12 +2565,12 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				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);
+				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);
 			}
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
 			//$alldata = array();
 			foreach ($dall as $value) {
@@ -2590,7 +2590,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				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);
+				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);
 			}
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
@@ -2598,27 +2598,27 @@ 
 			$lastyear = false;
 			foreach ($alldata as $number) {
 				if ($number['year_name'] != date('Y')) $lastyear = true;
-				$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']);
+				$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']);
 			}
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$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']);
+				$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']);
 			}
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$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']);
+				$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']);
 			}
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$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']);
+				$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']);
 			}
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$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']);
+				$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']);
 			}
 			if ($globalDebug) echo '...Departure'."\n";
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -2641,7 +2641,7 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$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']);
+				$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']);
 			}
 			if ($globalDebug) echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -2664,32 +2664,32 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				$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']);
+				$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']);
 			}
 
 			if ($globalDebug) echo 'Flights data...'."\n";
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			if ($globalDebug) echo '-> countAllDates...'."\n";
 			//$previousdata = $this->countAllDatesByAirlines();
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
 			foreach ($alldata as $cnt) {
 				$values[] = $cnt['date_count'];
 			}
-			array_multisort($values,SORT_DESC,$alldata);
-			array_splice($alldata,11);
+			array_multisort($values, SORT_DESC, $alldata);
+			array_splice($alldata, 11);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
 			}
 			
 			if ($globalDebug) echo '-> countAllHours...'."\n";
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
 			foreach ($alldata as $number) {
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
 			}
 
 			// Stats by filters
@@ -2713,7 +2713,7 @@ 
 							$last_update_day = date('Y').'-01-01 00:00:00';
 						}
 					}
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
 						$last_update_day = date('Y').'-01-01 00:00:00';
 						$reset = true;
 					}
@@ -2721,38 +2721,38 @@ 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
 					$Spotter = new Spotter($this->db);
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all airlines...'."\n";
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all owners...'."\n";
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all pilots...'."\n";
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
 					foreach ($alldata as $number) {
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
 					}
 					if ($globalDebug) echo 'Count departure airports...'."\n";
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
 					$alldata = array();
 					foreach ($pall as $value) {
 						$icao = $value['airport_departure_icao'];
@@ -2768,13 +2768,13 @@ 
 					foreach ($alldata as $key => $row) {
 						$count[$key] = $row['airport_departure_icao_count'];
 					}
-					array_multisort($count,SORT_DESC,$alldata);
+					array_multisort($count, SORT_DESC, $alldata);
 					foreach ($alldata as $number) {
-						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
 					$alldata = array();
 					foreach ($pall as $value) {
 						$icao = $value['airport_arrival_icao'];
@@ -2790,9 +2790,9 @@ 
 					foreach ($alldata as $key => $row) {
 						$count[$key] = $row['airport_arrival_icao_count'];
 					}
-					array_multisort($count,SORT_DESC,$alldata);
+					array_multisort($count, SORT_DESC, $alldata);
 					foreach ($alldata as $number) {
-						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
+						echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
 					}
 					if ($globalDebug) echo 'Count all months...'."\n";
 					$Spotter = new Spotter($this->db);
@@ -2800,36 +2800,36 @@ 
 					$lastyear = false;
 					foreach ($alldata as $number) {
 						if ($number['year_name'] != date('Y')) $lastyear = true;
-						$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);
+						$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);
 					}
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
 					$alldata = $Spotter->countAllMonthsOwners($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
 					$alldata = $Spotter->countAllMonthsPilots($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all military by months...'."\n";
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
 				    	foreach ($alldata as $number) {
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+			    			$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
 					foreach ($alldata as $number) {
-						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
+						$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
 					}
 					echo '...Departure'."\n";
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
 					foreach ($dall as $value) {
 						$icao = $value['departure_airport_icao'];
 						$ddate = $value['date'];
@@ -2847,11 +2847,11 @@ 
 					}
 					$alldata = $pall;
 					foreach ($alldata as $number) {
-						$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
+						$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
 					}
 					echo '...Arrival'."\n";
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
 					foreach ($dall as $value) {
 						$icao = $value['arrival_airport_icao'];
 						$ddate = $value['date'];
@@ -2869,39 +2869,39 @@ 
 					}
 					$alldata = $pall;
 					foreach ($alldata as $number) {
-						$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
+						$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
 					}
 					echo 'Flights data...'."\n";
 					echo '-> countAllDatesLastMonth...'."\n";
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
 					foreach ($alldata as $number) {
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
 					}
 					echo '-> countAllDates...'."\n";
-					$previousdata = $this->countAllDates('',$filter_name);
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
+					$previousdata = $this->countAllDates('', $filter_name);
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
 					$values = array();
 					foreach ($alldata as $cnt) {
 						$values[] = $cnt['date_count'];
 					}
-					array_multisort($values,SORT_DESC,$alldata);
-					array_splice($alldata,11);
+					array_multisort($values, SORT_DESC, $alldata);
+					array_splice($alldata, 11);
 					foreach ($alldata as $number) {
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
 					}
 				
 					echo '-> countAllHours...'."\n";
-					$alldata = $Spotter->countAllHours('hour',$filter);
+					$alldata = $Spotter->countAllHours('hour', $filter);
 					foreach ($alldata as $number) {
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
 					}
 					echo 'Insert last stats update date...'."\n";
 					date_default_timezone_set('UTC');
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
 							$this->deleteOldStats($filter_name);
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
 						}
 					}
 				}
@@ -2914,16 +2914,16 @@ 
 				// SUM all previous month to put as year
 				$previous_year = date('Y');
 				$previous_year--;
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
 				$allairlines = $this->getAllAirlineNames();
 				foreach ($allairlines as $data) {
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
 				}
 				
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2932,21 +2932,21 @@ 
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
 						try {
 							$sth = $this->db->prepare($query);
 							$sth->execute();
-						} catch(PDOException $e) {
+						} catch (PDOException $e) {
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
 						}
 					}
@@ -2959,7 +2959,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 					if ($globalDBdriver == 'mysql') {
@@ -2970,7 +2970,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 					if ($globalDBdriver == 'mysql') {
@@ -2981,15 +2981,15 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
 					}
 				}
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
 						$this->deleteOldStats();
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
 						$lastyearupdate = true;
 					}
 				}
@@ -3011,7 +3011,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					echo 'Archive old tracker data...'."\n";
@@ -3027,7 +3027,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 					echo 'Archive old marine data...'."\n";
@@ -3043,7 +3043,7 @@ 
 					try {
 						$sth = $this->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -3056,7 +3056,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 				echo 'Deleting old tracker data...'."\n";
@@ -3068,7 +3068,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 				echo 'Deleting old marine data...'."\n";
@@ -3080,14 +3080,14 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 			if (!isset($lastyearupdate)) {
 				echo 'Insert last stats update date...'."\n";
 				date_default_timezone_set('UTC');
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
 			}
 			if ($globalStatsResetYear) {
 				require_once(dirname(__FILE__).'/../install/class.settings.php');

require/class.Connection.php

Spacing +29 added lines, -29 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 require_once(dirname(__FILE__).'/settings.php');
 
-class Connection{
+class Connection {
 	public $db = null;
 	public $dbs = array();
 	public $latest_schema = 47;
 
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
 		global $globalNoDB;
 		if (isset($globalNoDB) && $globalNoDB === TRUE) {
 			$this->db = null;
@@ -16,7 +16,7 @@ 
 					if ($user === null && $pass === null) {
 						$this->createDBConnection();
 					} else {
-						$this->createDBConnection(null,$user,$pass);
+						$this->createDBConnection(null, $user, $pass);
 					}
 				} else {
 					$this->createDBConnection($dbname);
@@ -100,14 +100,14 @@ 
 		while (true) {
 			try {
 				if ($globalDBSdriver == 'mysql') {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -117,19 +117,19 @@ 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
 				} else {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				$i++;
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
 				//exit;
@@ -154,10 +154,10 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
-		if($results->rowCount()>0) {
+		if ($results->rowCount() > 0) {
 		    return true; 
 		}
 		else return false;
@@ -179,8 +179,8 @@ 
 			     return false;
 			}
 			
-		} catch(PDOException $e) {
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
+		} catch (PDOException $e) {
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
             			throw $e;
 	                }
 	                //echo 'error ! '.$e->getMessage();
@@ -192,7 +192,7 @@ 
 	/*
 	* Check if index exist
 	*/
-	public function indexExists($table,$index)
+	public function indexExists($table, $index)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -203,11 +203,11 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
-		if($nb[0]['nb'] > 0) {
+		if ($nb[0]['nb'] > 0) {
 			return true; 
 		}
 		else return false;
@@ -222,7 +222,7 @@ 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
 		try {
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
 		}
 		$columns = array();
@@ -234,7 +234,7 @@ 
 		return $columns;
 	}
 
-	public function getColumnType($table,$column) {
+	public function getColumnType($table, $column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
 		return $tomet['native_type'];
@@ -244,7 +244,7 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
-	public function checkColumnName($table,$name)
+	public function checkColumnName($table, $name)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -254,8 +254,8 @@ 
 		}
 			try {
 				$sth = $this->db()->prepare($query);
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -294,7 +294,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage()."\n";
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);

require/class.Elevation.php

Spacing +28 added lines, -28 removed lines

@@ -41,7 +41,7 @@ 
 			default:
 				throw new \Exception("bad resolution can be only one of 1,3");
 		}
-		register_shutdown_function(function () {
+		register_shutdown_function(function() {
 			$this->closeAllFiles();
 		});
 	}
@@ -55,10 +55,10 @@ 
 
 	private function getElevationAtPosition($fileName, $row, $column) {
 		if (!array_key_exists($fileName, $this->openedFiles)) {
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 				throw new \Exception("File '{$fileName}' not exists.");
 			}
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
 			if ($file === false) {
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
 			}
@@ -72,7 +72,7 @@ 
 			throw new \Exception("Not implemented yet");
 		}
 		$aRow     = $this->measPerDeg - $row;
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
 		$position *= 2;
 		fseek($file, $position);
 		$short  = fread($file, 2);
@@ -100,8 +100,8 @@ 
 		$latSec = $this->getSec($lat);
 		$lonSec = $this->getSec($lon);
 
-		$Xn = round($latSec / $this->resolution, 3);
-		$Yn = round($lonSec / $this->resolution, 3);
+		$Xn = round($latSec/$this->resolution, 3);
+		$Yn = round($lonSec/$this->resolution, 3);
 
 		$a1 = round($Xn);
 		$a2 = round($Yn);
@@ -133,55 +133,55 @@ 
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
 
 		return $zN;
 	}
 
 	private function getDeg($deg, $numPrefix) {
 		$deg = abs($deg);
-		$d   = floor($deg);     // round degrees
+		$d   = floor($deg); // round degrees
 		if ($numPrefix >= 3) {
 			if ($d < 100) {
-				$d = '0' . $d;
+				$d = '0'.$d;
 			}
 		} // pad with leading zeros
 		if ($d < 10) {
-			$d = '0' . $d;
+			$d = '0'.$d;
 		}
 		return $d;
 	}
 
 	private function getSec($deg) {
 		$deg = abs($deg);
-		$sec = round($deg * 3600, 4);
-		$m   = fmod(floor($sec / 60), 60);
+		$sec = round($deg*3600, 4);
+		$m   = fmod(floor($sec/60), 60);
 		$s   = round(fmod($sec, 60), 4);
-		return ($m * 60) + $s;
+		return ($m*60) + $s;
 	}
 
-	public function download($lat,$lon, $debug = false) {
+	public function download($lat, $lon, $debug = false) {
 		$N      = $this->getDeg($lat, 2);
 		$E      = $this->getDeg($lon, 3);
-		$fileName  = "N{$N}E{$E}.hgt";
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
+		$fileName = "N{$N}E{$E}.hgt";
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
 			$Common = new Common();
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
 				return false;
 			}
 			if ($debug) echo 'Done'."\n";
 			if ($debug) echo 'Decompress '.$fileName.' ....';
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
 			if ($debug) echo 'Done'."\n";
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
 		}
 		return true;
 	}
@@ -194,22 +194,22 @@ 
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
 		$query_values = array();
 		try {
 			$sth = $db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
-			$this->download($data['latitude'],$data['longitude'],true);
+			$this->download($data['latitude'], $data['longitude'], true);
 		}
 	}
 }

require/class.Marine.php

Spacing +191 added lines, -191 removed lines

@@ -2,7 +2,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_query = "SELECT marine_output.* FROM marine_output";
 
-class Marine{
+class Marine {
 	public $db;
 	
 	public function __construct($dbc = null) {
@@ -17,33 +17,33 @@ 
 	* @return Array the SQL part
 	*/
 	
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -72,7 +72,7 @@ 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -87,7 +87,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		date_default_timezone_set('UTC');
 		if (!is_string($query))
@@ -107,13 +107,13 @@ 
 			$sth = $this->db->prepare($query.$limitQuery);
 			$sth->execute($params);
 		} catch (PDOException $e) {
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
 			exit();
 		}
 		
 		$num_rows = 0;
 		$spotter_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -145,10 +145,10 @@ 
 			}
 			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 
-			if($temp_array['mmsi'] != "")
+			if ($temp_array['mmsi'] != "")
 			{
 				$Image = new Image($this->db);
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']);
 				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
 				unset($Image);
 				if (count($image_array) > 0) {
@@ -184,17 +184,17 @@ 
 				{
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
 				} else {
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
 				}
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
 					}
 				}
@@ -227,8 +227,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -242,8 +242,8 @@ 
 		} else {
 			$orderby_query = " ORDER BY marine_output.date DESC";
 		}
-		$query  = $global_query.$filter_query." ".$orderby_query;
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$query = $global_query.$filter_query." ".$orderby_query;
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
 		return $spotter_array;
 	}
     
@@ -261,8 +261,8 @@ 
 		if ($id == '') return array();
 		$additional_query = "marine_output.fammarine_id = :id";
 		$query_values = array(':id' => $id);
-		$query  = $global_query." WHERE ".$additional_query." ";
-		$spotter_array = $this->getDataFromDB($query,$query_values);
+		$query = $global_query." WHERE ".$additional_query." ";
+		$spotter_array = $this->getDataFromDB($query, $query_values);
 		return $spotter_array;
 	}
 
@@ -281,7 +281,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($ident != "")
 		{
 			if (!is_string($ident))
@@ -297,8 +297,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -322,7 +322,7 @@ 
 		return $spotter_array;
 	}
 	
-	public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
 		
@@ -330,7 +330,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -356,8 +356,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -388,11 +388,11 @@ 
 	* @return Array list of source name
 	*
 	*/
-	public function getAllSourceName($type = '',$filters = array())
+	public function getAllSourceName($type = '', $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$query_values = array();
-		$query  = "SELECT DISTINCT marine_output.source_name 
+		$query = "SELECT DISTINCT marine_output.source_name 
 				FROM marine_output".$filter_query." marine_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -407,7 +407,7 @@ 
 		$source_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['source_name'] = $row['source_name'];
 			$source_array[] = $temp_array;
@@ -424,8 +424,8 @@ 
 	*/
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT marine_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT marine_output.ident
 								FROM marine_output".$filter_query." marine_output.ident <> '' 
 								ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -435,7 +435,7 @@ 
 		$ident_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['ident'] = $row['ident'];
 			$ident_array[] = $temp_array;
@@ -452,7 +452,7 @@ 
 	*/
 	public function getIdentity($mmsi)
 	{
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
 		$query  = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':mmsi' => $mmsi));
@@ -477,12 +477,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 								FROM marine_output
 								WHERE marine_output.date <> '' 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
 		} else {
-			$query  = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM marine_output
 								WHERE marine_output.date <> '' 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
@@ -494,7 +494,7 @@ 
 		$date_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date'] = $row['date'];
 
@@ -513,11 +513,11 @@ 
 	* @return String success or false
 	*
 	*/	
-	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
+	public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL)
 	{
 
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -539,11 +539,11 @@ 
 	* @return String success or false
 	*
 	*/	
-	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
+	public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '')
 	{
 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -566,7 +566,7 @@ 
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
 	{
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -604,7 +604,7 @@ 
 	* @param String $verticalrate vertival rate of flight
 	* @return String success or false
 	*/
-	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
+	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
 		
@@ -671,31 +671,31 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
-		$status = filter_var($status,FILTER_SANITIZE_STRING);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
-		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
+		$status = filter_var($status, FILTER_SANITIZE_STRING);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
+		$arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING);
+		$arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING);
 	
 		if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) {
 			$Image = new Image($this->db);
-			$image_array = $Image->getMarineImage($mmsi,$imo,$ident);
+			$image_array = $Image->getMarineImage($mmsi, $imo, $ident);
 			if (!isset($image_array[0]['mmsi'])) {
-				$Image->addMarineImage($mmsi,$imo,$ident);
+				$Image->addMarineImage($mmsi, $imo, $ident);
 			}
 			unset($Image);
 		}
@@ -707,10 +707,10 @@ 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
                 if ($arrival_date == '') $arrival_date = NULL;
-		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) 
+		$query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
 		try {
 		        
 			$sth = $this->db->prepare($query);
@@ -735,13 +735,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT marine_output.ident FROM marine_output 
+			$query = "SELECT marine_output.ident FROM marine_output 
 								WHERE marine_output.ident = :ident 
 								AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND marine_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT marine_output.ident FROM marine_output 
+			$query = "SELECT marine_output.ident FROM marine_output 
 								WHERE marine_output.ident = :ident 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
@@ -750,8 +750,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+    		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -777,8 +777,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					$additional_query .= "(marine_output.ident like '%".$q_item."%')";
 					$additional_query .= ")";
@@ -786,11 +786,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT marine_output.* FROM marine_output 
+			$query = "SELECT marine_output.* FROM marine_output 
 				WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND marine_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT marine_output.* FROM marine_output 
+			$query = "SELECT marine_output.* FROM marine_output 
 				WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -809,16 +809,16 @@ 
 	*
 	*/
 
-	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		require_once('class.SpotterLive.php');
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			$MarineLive = new MarineLive($this->db);
-			$filter_query = $MarineLive->getFilter($filters,true,true);
+			$filter_query = $MarineLive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -838,7 +838,7 @@ 
 		} else {
 			require_once(dirname(__FILE__)."/class.MarineArchive.php");
 			$MarineArchive = new MarineArchive($this->db);
-			$filter_query = $MarineArchive->getFilter($filters,true,true);
+			$filter_query = $MarineArchive->getFilter($filters, true, true);
 			$filter_query .= " over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -866,7 +866,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['marine_count'] = $row['nb'];
 			$temp_array['marine_country'] = $row['name'];
@@ -885,11 +885,11 @@ 
 	* @return Array the callsign list
 	*
 	*/
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -903,28 +903,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
@@ -936,7 +936,7 @@ 
 		$callsign_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['callsign_icao'] = $row['ident'];
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -988,7 +988,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1014,7 +1014,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -1035,7 +1035,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1060,7 +1060,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -1081,7 +1081,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1128,7 +1128,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['month_name'] = $row['month_name'];
 			$temp_array['year_name'] = $row['year_name'];
@@ -1157,7 +1157,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -1178,7 +1178,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -1198,7 +1198,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -1246,7 +1246,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1268,8 +1268,8 @@ 
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -1277,12 +1277,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1294,7 +1294,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1316,8 +1316,8 @@ 
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1325,12 +1325,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." marine_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." marine_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1338,12 +1338,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
       
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1362,33 +1362,33 @@ 
 	* @return Integer the number of vessels
 	*
 	*/
-	public function countOverallMarine($filters = array(),$year = '',$month = '')
+	public function countOverallMarine($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
 		//$queryi  = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output";
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
+		$queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1401,32 +1401,32 @@ 
 	* @return Integer the number of vessels
 	*
 	*/
-	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
+	public function countOverallMarineTypes($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
+		$queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1443,7 +1443,7 @@ 
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1451,12 +1451,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1468,7 +1468,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1487,9 +1487,9 @@ 
 	*/
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT marine_output.marine_id
+		$query = "SELECT marine_output.marine_id
 				FROM marine_output 
 				WHERE marine_output.fammarine_id = '".$fammarine_id."'";
         
@@ -1497,7 +1497,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['marine_id'];
 		}
@@ -1522,23 +1522,23 @@ 
 		}
 		
 		$current_date = date("Y-m-d H:i:s");
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
 		
 		$diff = abs(strtotime($current_date) - strtotime($date));
 
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
 		$years = $time_array['years'];
 		
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
 		$months = $time_array['months'];
 		
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
 		$days = $time_array['days'];
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
 		$hours = $time_array['hours'];
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
 		$minutes = $time_array['minutes'];
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
 		
 		return $time_array;
 	}
@@ -1561,63 +1561,63 @@ 
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "N";
 			$temp_array['direction_fullname'] = "North";
-		} elseif ($direction >= 22.5 && $direction < 45){
+		} elseif ($direction >= 22.5 && $direction < 45) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNE";
 			$temp_array['direction_fullname'] = "North-Northeast";
-		} elseif ($direction >= 45 && $direction < 67.5){
+		} elseif ($direction >= 45 && $direction < 67.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NE";
 			$temp_array['direction_fullname'] = "Northeast";
-		} elseif ($direction >= 67.5 && $direction < 90){
+		} elseif ($direction >= 67.5 && $direction < 90) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ENE";
 			$temp_array['direction_fullname'] = "East-Northeast";
-		} elseif ($direction >= 90 && $direction < 112.5){
+		} elseif ($direction >= 90 && $direction < 112.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "E";
 			$temp_array['direction_fullname'] = "East";
-		} elseif ($direction >= 112.5 && $direction < 135){
+		} elseif ($direction >= 112.5 && $direction < 135) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ESE";
 			$temp_array['direction_fullname'] = "East-Southeast";
-		} elseif ($direction >= 135 && $direction < 157.5){
+		} elseif ($direction >= 135 && $direction < 157.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SE";
 			$temp_array['direction_fullname'] = "Southeast";
-		} elseif ($direction >= 157.5 && $direction < 180){
+		} elseif ($direction >= 157.5 && $direction < 180) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSE";
 			$temp_array['direction_fullname'] = "South-Southeast";
-		} elseif ($direction >= 180 && $direction < 202.5){
+		} elseif ($direction >= 180 && $direction < 202.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "S";
 			$temp_array['direction_fullname'] = "South";
-		} elseif ($direction >= 202.5 && $direction < 225){
+		} elseif ($direction >= 202.5 && $direction < 225) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSW";
 			$temp_array['direction_fullname'] = "South-Southwest";
-		} elseif ($direction >= 225 && $direction < 247.5){
+		} elseif ($direction >= 225 && $direction < 247.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SW";
 			$temp_array['direction_fullname'] = "Southwest";
-		} elseif ($direction >= 247.5 && $direction < 270){
+		} elseif ($direction >= 247.5 && $direction < 270) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WSW";
 			$temp_array['direction_fullname'] = "West-Southwest";
-		} elseif ($direction >= 270 && $direction < 292.5){
+		} elseif ($direction >= 270 && $direction < 292.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "W";
 			$temp_array['direction_fullname'] = "West";
-		} elseif ($direction >= 292.5 && $direction < 315){
+		} elseif ($direction >= 292.5 && $direction < 315) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WNW";
 			$temp_array['direction_fullname'] = "West-Northwest";
-		} elseif ($direction >= 315 && $direction < 337.5){
+		} elseif ($direction >= 315 && $direction < 337.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NW";
 			$temp_array['direction_fullname'] = "Northwest";
-		} elseif ($direction >= 337.5 && $direction < 360){
+		} elseif ($direction >= 337.5 && $direction < 360) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNW";
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -1634,11 +1634,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDBdriver, $globalDebug;
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1678,7 +1678,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1726,7 +1726,7 @@ 
 		
 		$bitly_data = json_decode($bitly_data);
 		$bitly_url = '';
-		if ($bitly_data->status_txt = "OK"){
+		if ($bitly_data->status_txt = "OK") {
 			$bitly_url = $bitly_data->data->url;
 		}
 
@@ -1740,11 +1740,11 @@ 
 	* @return Array the vessel type list
 	*
 	*/
-	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count 
 		    FROM marine_output ".$filter_query." marine_output.type  <> ''";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -1764,28 +1764,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC";
@@ -1794,7 +1794,7 @@ 
 		$sth->execute($query_values);
 		$marine_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['marine_type'] = $row['marine_type'];
 			$temp_array['marine_type_count'] = $row['marine_type_count'];
@@ -1809,13 +1809,13 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
+	public function searchMarineData($q = '', $callsign = '', $mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($q != "")
 		{
 			if (!is_string($q))
@@ -1823,8 +1823,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
 					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
@@ -1836,42 +1836,42 @@ 
 		}
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.ident = :callsign";
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
 			}
 		}
 		if ($mmsi != "")
 		{
-			$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
+			$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
 			if (!is_numeric($mmsi))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.mmsi = :mmsi";
-				$query_values = array_merge($query_values,array(':mmsi' => $mmsi));
+				$query_values = array_merge($query_values, array(':mmsi' => $mmsi));
 			}
 		}
 		if ($imo != "")
 		{
-			$imo = filter_var($imo,FILTER_SANITIZE_STRING);
+			$imo = filter_var($imo, FILTER_SANITIZE_STRING);
 			if (!is_numeric($imo))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.imo = :imo";
-				$query_values = array_merge($query_values,array(':imo' => $imo));
+				$query_values = array_merge($query_values, array(':imo' => $imo));
 			}
 		}
 		if ($date_posted != "")
 		{
 			$date_array = explode(",", $date_posted);
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 			if ($globalTimezone != '') {
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
@@ -1898,8 +1898,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1917,28 +1917,28 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 			if ($globalDBdriver == 'mysql') {
-				$query="SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance 
+				$query = "SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND marine_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and marine_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
 			} else {
-				$query="SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+				$query = "SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
 			}
 		} else {
-			$query  = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' 
+			$query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' 
 			    ".$additional_query."
 			    ".$orderby_query;
 		}
-		$marine_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$marine_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $marine_array;
 	}
 
 	public function getOrderBy()
 	{
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
 		
 		return $orderby;
 		

require/class.Tracker.php

Spacing +176 added lines, -176 removed lines

@@ -4,7 +4,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_query = "SELECT tracker_output.* FROM tracker_output";
 
-class Tracker{
+class Tracker {
 	public $db;
 	
 	public function __construct($dbc = null) {
@@ -19,33 +19,33 @@ 
 	* @return Array the SQL part
 	*/
 	
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -74,7 +74,7 @@ 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -89,7 +89,7 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		date_default_timezone_set('UTC');
 		if (!is_string($query))
@@ -109,13 +109,13 @@ 
 			$sth = $this->db->prepare($query.$limitQuery);
 			$sth->execute($params);
 		} catch (PDOException $e) {
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
 			exit();
 		}
 		
 		$num_rows = 0;
 		$tracker_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -171,17 +171,17 @@ 
 				{
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
 				} else {
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
 				}
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
 					}
 				}
@@ -218,8 +218,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -236,9 +236,9 @@ 
 			$orderby_query = " ORDER BY tracker_output.date DESC";
 		}
 
-		$query  = $global_query.$filter_query." ".$orderby_query;
+		$query = $global_query.$filter_query." ".$orderby_query;
 
-		$tracker_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$tracker_array = $this->getDataFromDB($query, array(), $limit_query, true);
 
 		return $tracker_array;
 	}
@@ -257,8 +257,8 @@ 
 		if ($id == '') return array();
 		$additional_query = "tracker_output.famtrackid = :id";
 		$query_values = array(':id' => $id);
-		$query  = $global_query." WHERE ".$additional_query." ";
-		$tracker_array = $this->getDataFromDB($query,$query_values);
+		$query = $global_query." WHERE ".$additional_query." ";
+		$tracker_array = $this->getDataFromDB($query, $query_values);
 		return $tracker_array;
 	}
 
@@ -277,7 +277,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($ident != "")
 		{
 			if (!is_string($ident))
@@ -293,8 +293,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -318,7 +318,7 @@ 
 		return $tracker_array;
 	}
 	
-	public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
 		
@@ -326,7 +326,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -352,8 +352,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -384,11 +384,11 @@ 
 	* @return Array list of source name
 	*
 	*/
-	public function getAllSourceName($type = '',$filters = array())
+	public function getAllSourceName($type = '', $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$query_values = array();
-		$query  = "SELECT DISTINCT tracker_output.source_name 
+		$query = "SELECT DISTINCT tracker_output.source_name 
 				FROM tracker_output".$filter_query." tracker_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -403,7 +403,7 @@ 
 		$source_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['source_name'] = $row['source_name'];
 			$source_array[] = $temp_array;
@@ -420,8 +420,8 @@ 
 	*/
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT tracker_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT tracker_output.ident
 								FROM tracker_output".$filter_query." tracker_output.ident <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -431,7 +431,7 @@ 
 		$ident_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['ident'] = $row['ident'];
 			$ident_array[] = $temp_array;
@@ -456,12 +456,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
 								FROM tracker_output
 								WHERE tracker_output.date <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
 		} else {
-			$query  = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM tracker_output
 								WHERE tracker_output.date <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
@@ -473,7 +473,7 @@ 
 		$date_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date'] = $row['date'];
 
@@ -492,11 +492,11 @@ 
 	* @return String success or false
 	*
 	*/	
-	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
+	public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL)
 	{
 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -520,7 +520,7 @@ 
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
 	{
 		$query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid';
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+                $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -560,7 +560,7 @@ 
 	* @param String $verticalrate vertival rate of flight
 	* @return String success or false
 	*/
-	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
+	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '')
 	{
 		global $globalURL;
 		
@@ -628,21 +628,21 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
 	
                 if ($latitude == '' && $longitude == '') {
             		$latitude = 0;
@@ -650,10 +650,10 @@ 
             	}
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
+                $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type);
 
 		try {
 		        
@@ -679,13 +679,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT tracker_output.ident FROM tracker_output 
+			$query = "SELECT tracker_output.ident FROM tracker_output 
 								WHERE tracker_output.ident = :ident 
 								AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND tracker_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT tracker_output.ident FROM tracker_output 
+			$query = "SELECT tracker_output.ident FROM tracker_output 
 								WHERE tracker_output.ident = :ident 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
@@ -694,8 +694,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+    		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -721,8 +721,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%')";
 					$additional_query .= ")";
@@ -730,11 +730,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT tracker_output.* FROM tracker_output 
+			$query = "SELECT tracker_output.* FROM tracker_output 
 				WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND tracker_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT tracker_output.* FROM tracker_output 
+			$query = "SELECT tracker_output.* FROM tracker_output 
 				WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -748,16 +748,16 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			require_once('class.TrackerLive.php');
 			$TrackerLive = new TrackerLive($this->db);
-			$filter_query = $TrackerLive->getFilter($filters,true,true);
+			$filter_query = $TrackerLive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -777,7 +777,7 @@ 
 		} else {
 			require_once('class.TrackerArchive.php');
 			$TrackerArchive = new TrackerArchive($this->db);
-			$filter_query = $TrackerArchive->getFilter($filters,true,true);
+			$filter_query = $TrackerArchive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -805,7 +805,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['tracker_count'] = $row['nb'];
 			$temp_array['tracker_country'] = $row['name'];
@@ -822,11 +822,11 @@ 
 	* @return Array the callsign list
 	*
 	*/
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -840,28 +840,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
@@ -873,7 +873,7 @@ 
 		$callsign_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['callsign_icao'] = $row['ident'];
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -925,7 +925,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -951,7 +951,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -972,7 +972,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -997,7 +997,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -1018,7 +1018,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1065,7 +1065,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['month_name'] = $row['month_name'];
 			$temp_array['year_name'] = $row['year_name'];
@@ -1094,7 +1094,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -1115,7 +1115,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -1135,7 +1135,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -1183,7 +1183,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1205,8 +1205,8 @@ 
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -1214,12 +1214,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1231,7 +1231,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1253,8 +1253,8 @@ 
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1262,12 +1262,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1275,12 +1275,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
       
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1299,33 +1299,33 @@ 
 	* @return Integer the number of trackers
 	*
 	*/
-	public function countOverallTracker($filters = array(),$year = '',$month = '')
+	public function countOverallTracker($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
 		//$queryi  = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output";
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1338,32 +1338,32 @@ 
 	* @return Integer the number of flights
 	*
 	*/
-	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
+	public function countOverallTrackerTypes($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1380,7 +1380,7 @@ 
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1388,12 +1388,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1405,7 +1405,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1424,9 +1424,9 @@ 
 	*/
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
 	{
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT tracker_output.tracker_id
+		$query = "SELECT tracker_output.tracker_id
 				FROM tracker_output 
 				WHERE tracker_output.famtrackid = '".$famtrackid."'";
         
@@ -1434,7 +1434,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['tracker_id'];
 		}
@@ -1459,23 +1459,23 @@ 
 		}
 		
 		$current_date = date("Y-m-d H:i:s");
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
 		
 		$diff = abs(strtotime($current_date) - strtotime($date));
 
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
 		$years = $time_array['years'];
 		
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
 		$months = $time_array['months'];
 		
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
 		$days = $time_array['days'];
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
 		$hours = $time_array['hours'];
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
 		$minutes = $time_array['minutes'];
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
 		
 		return $time_array;
 	}
@@ -1498,63 +1498,63 @@ 
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "N";
 			$temp_array['direction_fullname'] = "North";
-		} elseif ($direction >= 22.5 && $direction < 45){
+		} elseif ($direction >= 22.5 && $direction < 45) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNE";
 			$temp_array['direction_fullname'] = "North-Northeast";
-		} elseif ($direction >= 45 && $direction < 67.5){
+		} elseif ($direction >= 45 && $direction < 67.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NE";
 			$temp_array['direction_fullname'] = "Northeast";
-		} elseif ($direction >= 67.5 && $direction < 90){
+		} elseif ($direction >= 67.5 && $direction < 90) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ENE";
 			$temp_array['direction_fullname'] = "East-Northeast";
-		} elseif ($direction >= 90 && $direction < 112.5){
+		} elseif ($direction >= 90 && $direction < 112.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "E";
 			$temp_array['direction_fullname'] = "East";
-		} elseif ($direction >= 112.5 && $direction < 135){
+		} elseif ($direction >= 112.5 && $direction < 135) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ESE";
 			$temp_array['direction_fullname'] = "East-Southeast";
-		} elseif ($direction >= 135 && $direction < 157.5){
+		} elseif ($direction >= 135 && $direction < 157.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SE";
 			$temp_array['direction_fullname'] = "Southeast";
-		} elseif ($direction >= 157.5 && $direction < 180){
+		} elseif ($direction >= 157.5 && $direction < 180) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSE";
 			$temp_array['direction_fullname'] = "South-Southeast";
-		} elseif ($direction >= 180 && $direction < 202.5){
+		} elseif ($direction >= 180 && $direction < 202.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "S";
 			$temp_array['direction_fullname'] = "South";
-		} elseif ($direction >= 202.5 && $direction < 225){
+		} elseif ($direction >= 202.5 && $direction < 225) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSW";
 			$temp_array['direction_fullname'] = "South-Southwest";
-		} elseif ($direction >= 225 && $direction < 247.5){
+		} elseif ($direction >= 225 && $direction < 247.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SW";
 			$temp_array['direction_fullname'] = "Southwest";
-		} elseif ($direction >= 247.5 && $direction < 270){
+		} elseif ($direction >= 247.5 && $direction < 270) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WSW";
 			$temp_array['direction_fullname'] = "West-Southwest";
-		} elseif ($direction >= 270 && $direction < 292.5){
+		} elseif ($direction >= 270 && $direction < 292.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "W";
 			$temp_array['direction_fullname'] = "West";
-		} elseif ($direction >= 292.5 && $direction < 315){
+		} elseif ($direction >= 292.5 && $direction < 315) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WNW";
 			$temp_array['direction_fullname'] = "West-Northwest";
-		} elseif ($direction >= 315 && $direction < 337.5){
+		} elseif ($direction >= 315 && $direction < 337.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NW";
 			$temp_array['direction_fullname'] = "Northwest";
-		} elseif ($direction >= 337.5 && $direction < 360){
+		} elseif ($direction >= 337.5 && $direction < 360) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNW";
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -1571,11 +1571,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDBdriver, $globalDebug;
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1615,7 +1615,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1644,11 +1644,11 @@ 
 	* @return Array the vessel type list
 	*
 	*/
-	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count 
 		    FROM tracker_output ".$filter_query." tracker_output.type  <> ''";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -1668,28 +1668,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
@@ -1698,7 +1698,7 @@ 
 		$sth->execute($query_values);
 		$tracker_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['tracker_type'] = $row['tracker_type'];
 			$temp_array['tracker_type_count'] = $row['tracker_type_count'];
@@ -1713,13 +1713,13 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
+	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($q != "")
 		{
 			if (!is_string($q))
@@ -1727,8 +1727,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
@@ -1738,20 +1738,20 @@ 
 		}
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND tracker_output.ident = :callsign";
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
 			}
 		}
 		if ($date_posted != "")
 		{
 			$date_array = explode(",", $date_posted);
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 			if ($globalTimezone != '') {
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
@@ -1778,8 +1778,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1797,22 +1797,22 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 			if ($globalDBdriver == 'mysql') {
-				$query="SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance 
+				$query = "SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND tracker_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and tracker_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
 			} else {
-				$query="SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+				$query = "SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
 			}
 		} else {
-			$query  = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' 
+			$query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' 
 			    ".$additional_query."
 			    ".$orderby_query;
 		}
-		$tracker_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$tracker_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $tracker_array;
 	}
 
@@ -1837,7 +1837,7 @@ 
 		curl_close($ch);
 		$bitly_data = json_decode($bitly_data);
 		$bitly_url = '';
-		if ($bitly_data->status_txt = "OK"){
+		if ($bitly_data->status_txt = "OK") {
 			$bitly_url = $bitly_data->data->url;
 		}
 		return $bitly_url;
@@ -1845,7 +1845,7 @@ 
 
 	public function getOrderBy()
 	{
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
 		
 		return $orderby;