Ysurac / FlightAirMap

install/install_db.php

Indentation +26 added lines, -26 removed lines

@@ -1,31 +1,31 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        //echo '$globalInstalled must be set to FALSE in require/settings.php';
-        echo "Use install/index.php instead. You really don't want to use this.";
-        exit;
-    }
-    require('class.create_db.php');
-    echo "Create and import all tables...";
-    create_db::import_all_db('../db/');
-    echo "Done !\n";
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		//echo '$globalInstalled must be set to FALSE in require/settings.php';
+		echo "Use install/index.php instead. You really don't want to use this.";
+		exit;
+	}
+	require('class.create_db.php');
+	echo "Create and import all tables...";
+	create_db::import_all_db('../db/');
+	echo "Done !\n";
 
-    require('class.update_db.php');
-    echo "Populate all tables...\n";
-    update_db::update_all();
-    echo "\nInstall waypoints...(VERY slow!)";
-    update_db::update_waypoints();
-    echo "Done !\n";
-    echo "Install airspace...";
-    update_db::update_airspace();
-    echo "Done !\n";
-    echo 'All is now installed ! Thanks'."\n";
-    if ($globalSBS1) {
-            echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
-    }
-    if ($globalACARS) {
-            echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
-    }
+	require('class.update_db.php');
+	echo "Populate all tables...\n";
+	update_db::update_all();
+	echo "\nInstall waypoints...(VERY slow!)";
+	update_db::update_waypoints();
+	echo "Done !\n";
+	echo "Install airspace...";
+	update_db::update_airspace();
+	echo "Done !\n";
+	echo 'All is now installed ! Thanks'."\n";
+	if ($globalSBS1) {
+			echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
+	}
+	if ($globalACARS) {
+			echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
+	}
     
 ?>
\ No newline at end of file

install/class.update_schema.php

Indentation +447 added lines, -447 removed lines

@@ -8,18 +8,18 @@ 
 class update_schema {
 
 	public static function update_schedule() {
-	    $Connection = new Connection();
-	    $Schedule = new Schedule();
-	    $query = "SELECT * FROM schedule";
-            try {
-            	$sth = $Connection->db->prepare($query);
+		$Connection = new Connection();
+		$Schedule = new Schedule();
+		$query = "SELECT * FROM schedule";
+			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']);
-    	    }
+			}
+			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']);
+			}
 	
 	}
 /*
@@ -43,198 +43,198 @@ 
     	}
 */	
 	private static function update_from_1() {
-    		$Connection = new Connection();
-    		// Add new column to routes table
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
+			$Connection = new Connection();
+			// Add new column to routes table
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		// Copy schedules data to routes table
-    		self::update_schedule();
-    		// Delete schedule table
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			// Copy schedules data to routes table
+			self::update_schedule();
+			// Delete schedule table
 		$query = "DROP TABLE `schedule`";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
-    		}
-    		// Add source column
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
+			}
+			// Add source column
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Delete unused column
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
+			}
 		// Add ModeS column
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} 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) {
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		// Add auto_increment for aircraft_modes
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
-    		try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
+			}
+			// Add auto_increment for aircraft_modes
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		$error .= create_db::import_file('../db/acars_live.sql');
 		$error .= create_db::import_file('../db/config.sql');
 		// Update schema_version to 2
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-        }
+		}
 
 	private static function update_from_2() {
-    		$Connection = new Connection();
-    		// Add new column decode to acars_live table
+			$Connection = new Connection();
+			// Add new column decode to acars_live table
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Create table acars_archive
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Create table acars_archive
 		$error .= create_db::import_file('../db/acars_archive.sql');
 		// Update schema_version to 3
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_3() {
-    		$Connection = new Connection();
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
+			$Connection = new Connection();
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
-    		}
-    		// Add image_source_website column to spotter_image
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
+			}
+			// Add image_source_website column to spotter_image
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
+			}
+			$error = '';
 		// Update schema_version to 4
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	
 	private static function update_from_4() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 	
-    		$error = '';
-    		// Create table acars_label
+			$error = '';
+			// Create table acars_label
 		$error .= create_db::import_file('../db/acars_label.sql');
 		if ($error == '') {
-		    // Update schema_version to 5
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+			// Update schema_version to 5
+			$query = "UPDATE `config` SET `value` = '5' 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;
 	}
 
 	private static function update_from_5() {
-    		$Connection = new Connection();
-    		// Add columns to translation
+			$Connection = new Connection();
+			// Add columns to translation
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to aircraft
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
-    		}
-    		// Add aircraft_shadow column to spotter_live
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		$error = '';
-    		// Update table aircraft
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to aircraft
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
+			}
+			// Add aircraft_shadow column to spotter_live
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/aircraft.sql');
 		$error .= create_db::import_file('../db/spotter_archive.sql');
 
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_6() {
-    		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
+			$Connection = new Connection();
+			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);
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
@@ -247,147 +247,147 @@ 
 			ALTER TABLE aircraft ADD INDEX(icao);
 			ALTER TABLE airport ADD INDEX(icao);
 			ALTER TABLE translation ADD INDEX(Operator);";
-        	    try {
-            		$sth = $Connection->db->prepare($query);
+				try {
+					$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+				} catch(PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
-    		    }
-    		}
-    		$error = '';
-    		// Update table countries
-    		if ($Connection->tableExists('airspace')) {
-    		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+				}
+			}
+			$error = '';
+			// Update table countries
+			if ($Connection->tableExists('airspace')) {
+				$error .= update_db::update_countries();
+			if ($error != '') return $error;
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
-    	}
+		}
 
 	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;
+			$Connection = new Connection();
+			$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) {
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-			$sth->execute();
-    		    } catch(PDOException $e) {
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
 				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";
-            	    }
-                } else {
-    		    $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) {
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} else {
+				$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";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
-    		$error = '';
-    		// Update table aircraft
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
 		if ($error != '') return $error;
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_8() {
-    		$Connection = new Connection();
-    		$error = '';
-    		// Update table aircraft
+			$Connection = new Connection();
+			$error = '';
+			// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
 		if ($error != '') return $error;
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} 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) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_9() {
-    		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+			$Connection = new Connection();
+			$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) {
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Update table atc
+			// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	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";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
-    		}
+			$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";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
+			}
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/metar.sql');
@@ -398,76 +398,76 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	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)";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} 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";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
-    		}
-    		if ($globalDBdriver == 'mysql') {
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
-		    try {
-            		$sth = $Connection->db->prepare($query);
-			$sth->execute();
-    		    } catch(PDOException $e) {
+			$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)";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} 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";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
+			}
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+				} catch(PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
-    		    }
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
-    		    if ($row['engine'] == 'ARCHIVE') {
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['engine'] == 'ARCHIVE') {
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
 				ALTER TABLE copy ENGINE=ARCHIVE;
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
 				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";
-            	    }
-                } 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";
-                }
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
-    		}
+					} 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";
+					}
+				} 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";
+				}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
+			}
 
 		$error = '';
 		
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_12() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
+			// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
 		if ($error != '') return $error;
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
@@ -484,166 +484,166 @@ 
 		if ($error != '') return $error;
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	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)";
+			$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)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+				} catch(PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
-    			}
+				}
 		}
-    		$error = '';
+			$error = '';
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_14() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_flight')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 
 	private static function update_from_15() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		$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) {
-		    return "error (update stats) : ".$e->getMessage()."\n";
-    		}
+			// Add tables
+			$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) {
+			return "error (update stats) : ".$e->getMessage()."\n";
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_16() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_registration')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_registration')) {
 			$error .= create_db::import_file('../db/stats_registration.sql');
 		}
-    		if (!$Connection->tableExists('stats_callsign')) {
+			if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_17() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Add tables
-    		if (!$Connection->tableExists('stats_country')) {
+			// Add tables
+			if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 	private static function update_from_18() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Modify stats_airport table
-    		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) {
-			    return "error (update stats) : ".$e->getMessage()."\n";
-    			}
-    		}
+			// Modify stats_airport table
+			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) {
+				return "error (update stats) : ".$e->getMessage()."\n";
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_19() {
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airport table
+			// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
 		if ($error != '') return 'Import airport.sql : '.$error;
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} 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) {
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
+			}
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -651,9 +651,9 @@ 
 		}
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
 			// Add column over_country
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
-            			$sth = $Connection->db->prepare($query);
+						$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -661,74 +661,74 @@ 
 		}
 		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`";
+				$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) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		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`";
+				$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) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		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`";
+				$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) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		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`;";
+				$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) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_20() {
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
-    		// Update airline table
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
+			// Update airline table
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
 		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 {
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
+				try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		if ($error != '') return $error;
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
@@ -738,12 +738,12 @@ 
 		}
 		*/
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -762,35 +762,35 @@ 
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
 	private static function update_from_22() {
 		global $globalDBdriver;
-    		$Connection = new Connection();
+			$Connection = new Connection();
 		$error = '';
 		// Add table stats polar
-    		if (!$Connection->tableExists('stats_source')) {
+			if (!$Connection->tableExists('stats_source')) {
 			if ($globalDBdriver == 'mysql') {
-    				$error .= create_db::import_file('../db/stats_source.sql');
+					$error .= create_db::import_file('../db/stats_source.sql');
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
 			if ($error != '') return $error;
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
-        	try {
-            	    $sth = $Connection->db->prepare($query);
-		    $sth->execute();
-    		} catch(PDOException $e) {
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
-    		}
+			try {
+					$sth = $Connection->db->prepare($query);
+			$sth->execute();
+			} catch(PDOException $e) {
+			return "error (update schema_version) : ".$e->getMessage()."\n";
+			}
 		return $error;
 	}
 
@@ -820,14 +820,14 @@ 
 		}
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
 			} catch(PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
-    			}
-    		}
+				}
+			}
 		
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
 		try {
@@ -1175,7 +1175,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->checkColumnName('aircraft','mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
@@ -1249,7 +1249,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
@@ -1259,7 +1259,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		if (!$Connection->indexExists('accidents','rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
@@ -1269,7 +1269,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 
 		$query = "UPDATE config SET value = '31' WHERE name = 'schema_version'";
 		try {
@@ -1561,7 +1561,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		$query = "UPDATE config SET value = '36' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -1722,7 +1722,7 @@ 
 			} catch(PDOException $e) {
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
 			}
-                }
+				}
 		$query = "UPDATE config SET value = '38' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);

Spacing +280 added lines, -280 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 (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2239,7 +2239,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;
@@ -2260,7 +2260,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;
@@ -2285,7 +2285,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;
@@ -2295,39 +2295,39 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('marine_live','captain_name')) {
+		if (!$Connection->checkColumnName('marine_live', 'captain_name')) {
 			$query = "ALTER TABLE marine_live ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns captain and race in marine_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_output','captain_name')) {
+		if (!$Connection->checkColumnName('marine_output', 'captain_name')) {
 			$query = "ALTER TABLE marine_output ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns captain and race in marine_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive','captain_name')) {
+		if (!$Connection->checkColumnName('marine_archive', 'captain_name')) {
 			$query = "ALTER TABLE marine_archive ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns captain and race in marine_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive_output','captain_name')) {
+		if (!$Connection->checkColumnName('marine_archive_output', 'captain_name')) {
 			$query = "ALTER TABLE marine_archive_output ADD COLUMN captain_name varchar(255) DEFAULT NULL,ADD COLUMN captain_id varchar(255) DEFAULT NULL,ADD COLUMN race_name varchar(255) DEFAULT NULL,ADD COLUMN race_id varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns captain and race in marine_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2335,7 +2335,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;
@@ -2353,14 +2353,14 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (modify column ground_speede in marine_*) : ".$e->getMessage()."\n";
 		}
 		$query = "UPDATE config SET value = '53' 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;
@@ -2370,25 +2370,25 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('marine_live','distance')) {
+		if (!$Connection->checkColumnName('marine_live', 'distance')) {
 			$query = "ALTER TABLE marine_live ADD COLUMN distance float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns distance in marine_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_live','race_time')) {
+		if (!$Connection->checkColumnName('marine_live', 'race_time')) {
 			$query = "ALTER TABLE marine_live ADD COLUMN race_time float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_time in marine_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_live','race_rank')) {
+		if (!$Connection->checkColumnName('marine_live', 'race_rank')) {
 			if ($globalDBdriver == 'mysql') {
 				$query = "ALTER TABLE marine_live ADD COLUMN race_rank int(11) DEFAULT NULL";
 			} else {
@@ -2397,29 +2397,29 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_rank in marine_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_output','distance')) {
+		if (!$Connection->checkColumnName('marine_output', 'distance')) {
 			$query = "ALTER TABLE marine_output ADD COLUMN distance float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns distance in marine_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_output','race_time')) {
+		if (!$Connection->checkColumnName('marine_output', 'race_time')) {
 			$query = "ALTER TABLE marine_output ADD COLUMN race_time float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_time in marine_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_output','race_rank')) {
+		if (!$Connection->checkColumnName('marine_output', 'race_rank')) {
 			if ($globalDBdriver == 'mysql') {
 				$query = "ALTER TABLE marine_output ADD COLUMN race_rank int(11) DEFAULT NULL";
 			} else {
@@ -2428,29 +2428,29 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_rank in marine_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive','distance')) {
+		if (!$Connection->checkColumnName('marine_archive', 'distance')) {
 			$query = "ALTER TABLE marine_archive ADD COLUMN distance float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns distance in marine_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive','race_time')) {
+		if (!$Connection->checkColumnName('marine_archive', 'race_time')) {
 			$query = "ALTER TABLE marine_archive ADD COLUMN race_time float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_time in marine_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive','race_rank')) {
+		if (!$Connection->checkColumnName('marine_archive', 'race_rank')) {
 			if ($globalDBdriver == 'mysql') {
 				$query = "ALTER TABLE marine_archive ADD COLUMN race_rank int(11) DEFAULT NULL";
 			} else {
@@ -2459,29 +2459,29 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_rank in marine_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive_output','distance')) {
+		if (!$Connection->checkColumnName('marine_archive_output', 'distance')) {
 			$query = "ALTER TABLE marine_archive_output ADD COLUMN distance float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns distance in marine_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive_output','race_time')) {
+		if (!$Connection->checkColumnName('marine_archive_output', 'race_time')) {
 			$query = "ALTER TABLE marine_archive_output ADD COLUMN race_time float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_time in marine_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('marine_archive_output','race_rank')) {
+		if (!$Connection->checkColumnName('marine_archive_output', 'race_rank')) {
 			if ($globalDBdriver == 'mysql') {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN race_rank int(11) DEFAULT NULL";
 			} else {
@@ -2490,25 +2490,25 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add columns race_rank in marine_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if ($Connection->checkColumnName('marine_output','last_altitude')) {
+		if ($Connection->checkColumnName('marine_output', 'last_altitude')) {
 			$query = "ALTER TABLE marine_output DROP COLUMN last_altitude";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (drop columns last_altitude in marine_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if ($Connection->checkColumnName('marine_archive_output','last_altitude')) {
+		if ($Connection->checkColumnName('marine_archive_output', 'last_altitude')) {
 			$query = "ALTER TABLE marine_archive_output DROP COLUMN last_altitude";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (drop columns last_altitude in marine_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2516,7 +2516,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;
@@ -2541,7 +2541,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;
@@ -2565,7 +2565,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);

Braces +533 added lines, -196 removed lines

@@ -258,7 +258,9 @@ 
     		// Update table countries
     		if ($Connection->tableExists('airspace')) {
     		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+		    if ($error != '') {
+		    	return $error;
+		    }
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
@@ -314,7 +316,9 @@ 
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
         	try {
@@ -331,7 +335,9 @@ 
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
@@ -365,7 +371,9 @@ 
 		$error = '';
     		// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
         	try {
@@ -389,13 +397,21 @@ 
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/metar.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/taf.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
         	try {
@@ -469,19 +485,33 @@ 
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airline.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_pilot.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
         	try {
@@ -521,7 +551,9 @@ 
     		// Add tables
     		if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
         	try {
@@ -545,7 +577,9 @@ 
     		} catch(PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -566,7 +600,9 @@ 
     		if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -584,7 +620,9 @@ 
     		if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -607,7 +645,9 @@ 
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -623,7 +663,9 @@ 
 		$error = '';
     		// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return 'Import airport.sql : '.$error;
+		if ($error != '') {
+			return 'Import airport.sql : '.$error;
+		}
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
         	try {
@@ -699,7 +741,9 @@ 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -717,7 +761,9 @@ 
     		// Update airline table
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return 'Import airlines.sql : '.$error;
+			if ($error != '') {
+				return 'Import airlines.sql : '.$error;
+			}
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
@@ -729,7 +775,9 @@ 
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			// Force update ModeS (this will put type_flight data
@@ -759,7 +807,9 @@ 
 			} catch(PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
         	try {
@@ -782,7 +832,9 @@ 
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
         	try {
@@ -803,12 +855,16 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
 			try {
@@ -848,7 +904,9 @@ 
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
-		if ($error != '') return 'Import airlines.sql : '.$error;
+		if ($error != '') {
+			return 'Import airlines.sql : '.$error;
+		}
 		if (!$Connection->checkColumnName('airlines','forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
@@ -1331,20 +1389,28 @@ 
 		}
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
 			include_once(dirname(__FILE__).'/class.update_db.php');
 			if (isset($globalVATSIM) && $globalVATSIM) {
 				$error .= update_db::update_vatsim();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
 				$error .= update_db::update_IVAO();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 
@@ -1607,41 +1673,65 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tracker_output')) {
 				$error .= create_db::import_file('../db/tracker_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_live')) {
 				$error .= create_db::import_file('../db/tracker_live.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_output')) {
 				$error .= create_db::import_file('../db/marine_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_live')) {
 				$error .= create_db::import_file('../db/marine_live.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_identity')) {
 				$error .= create_db::import_file('../db/marine_identity.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_mid')) {
 				$error .= create_db::import_file('../db/marine_mid.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/tracker_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_identity.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_mid.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '37' WHERE name = 'schema_version'";
 		try {
@@ -1660,39 +1750,61 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('marine_image')) {
 				$error .= create_db::import_file('../db/marine_image.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive')) {
 				$error .= create_db::import_file('../db/marine_archive.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive_output')) {
 				$error .= create_db::import_file('../db/marine_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_archive')) {
 				$error .= create_db::import_file('../db/tracker_archive.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/marine_image.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_archive.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_archive_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_archive.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
@@ -2063,7 +2175,9 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tracker_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;";
 		} else {
@@ -2091,14 +2205,22 @@ 
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			if (file_exists('tmp/ivae_feb2013.zip')) {
@@ -2115,7 +2237,9 @@ 
 				$error .= update_db::update_vatsim();
 			}
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE config SET value = '45' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -2133,10 +2257,14 @@ 
 		if (!$Connection->tableExists('satellite')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/satellite.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/satellite.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '46' WHERE name = 'schema_version'";
@@ -2156,37 +2284,53 @@ 
 		if (!$Connection->tableExists('stats_marine')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_marine.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_marine.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		if (!$Connection->tableExists('stats_marine_country')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_marine_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_marine_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		if (!$Connection->tableExists('stats_tracker')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_tracker.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_tracker.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		if (!$Connection->tableExists('stats_tracker_country')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_tracker_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_tracker_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '47' WHERE name = 'schema_version'";
@@ -2206,10 +2350,14 @@ 
 		if (!$Connection->tableExists('stats_marine_type')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_marine_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_marine_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '48' WHERE name = 'schema_version'";
@@ -2229,10 +2377,14 @@ 
 		if (!$Connection->tableExists('stats_tracker_type')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_tracker_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_tracker_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '49' WHERE name = 'schema_version'";
@@ -2251,10 +2403,14 @@ 
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '50' WHERE name = 'schema_version'";
 		try {
@@ -2272,14 +2428,22 @@ 
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/aircraft.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/aircraft_block.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/aircraft.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/aircraft_block.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '51' WHERE name = 'schema_version'";
 		try {
@@ -2528,10 +2692,14 @@ 
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/marine_race.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/marine_race.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '55' WHERE name = 'schema_version'";
 		try {
@@ -2554,8 +2722,11 @@ 
 			if ($Connection->tableExists('aircraft')) {
 				if (!$Connection->tableExists('config')) {
 					$version = '1';
-					if ($update) return self::update_from_1();
-					else return $version;
+					if ($update) {
+						return self::update_from_1();
+					} else {
+						return $version;
+					}
 				} else {
 					$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 					try {
@@ -2568,223 +2739,389 @@ 
 					if ($update) {
 						if ($result['value'] == '2') {
 							$error = self::update_from_2();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '3') {
 							$error = self::update_from_3();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '4') {
 							$error = self::update_from_4();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '5') {
 							$error = self::update_from_5();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '6') {
 							$error = self::update_from_6();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '7') {
 							$error = self::update_from_7();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '8') {
 							$error = self::update_from_8();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '9') {
 							$error = self::update_from_9();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '10') {
 							$error = self::update_from_10();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '11') {
 							$error = self::update_from_11();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '12') {
 							$error = self::update_from_12();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '13') {
 							$error = self::update_from_13();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '14') {
 							$error = self::update_from_14();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '15') {
 							$error = self::update_from_15();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '16') {
 							$error = self::update_from_16();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '17') {
 							$error = self::update_from_17();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '18') {
 							$error = self::update_from_18();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '19') {
 							$error = self::update_from_19();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '20') {
 							$error = self::update_from_20();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '21') {
 							$error = self::update_from_21();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '22') {
 							$error = self::update_from_22();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '23') {
 							$error = self::update_from_23();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '24') {
 							$error = self::update_from_24();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '25') {
 							$error = self::update_from_25();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '26') {
 							$error = self::update_from_26();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '27') {
 							$error = self::update_from_27();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '28') {
 							$error = self::update_from_28();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '29') {
 							$error = self::update_from_29();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '30') {
 							$error = self::update_from_30();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '31') {
 							$error = self::update_from_31();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '32') {
 							$error = self::update_from_32();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '33') {
 							$error = self::update_from_33();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '34') {
 							$error = self::update_from_34();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '35') {
 							$error = self::update_from_35();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '36') {
 							$error = self::update_from_36();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '37') {
 							$error = self::update_from_37();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '38') {
 							$error = self::update_from_38();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '39') {
 							$error = self::update_from_39();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '40') {
 							$error = self::update_from_40();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '41') {
 							$error = self::update_from_41();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '42') {
 							$error = self::update_from_42();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '43') {
 							$error = self::update_from_43();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '44') {
 							$error = self::update_from_44();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '45') {
 							$error = self::update_from_45();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '46') {
 							$error = self::update_from_46();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '47') {
 							$error = self::update_from_47();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '48') {
 							$error = self::update_from_48();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '49') {
 							$error = self::update_from_49();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '50') {
 							$error = self::update_from_50();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '51') {
 							$error = self::update_from_51();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '52') {
 							$error = self::update_from_52();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '53') {
 							$error = self::update_from_53();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '54') {
 							$error = self::update_from_54();
-							if ($error != '') return $error;
-							else return self::check_version(true);
-						} else return '';
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
+						} else {
+							return '';
+						}
 					} else {
-						if (isset($result['value']) && $result['value'] != '') return $result['value'];
-						else return 0;
+						if (isset($result['value']) && $result['value'] != '') {
+							return $result['value'];
+						} else {
+							return 0;
+						}
 					}
 				}
-			} else return $version;
+			} else {
+				return $version;
+			}
 		}
 	}
 }

airline.php

Braces +27 added lines, -9 removed lines

@@ -33,7 +33,9 @@ 
 			if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
-			} else print $alliance['alliance'];
+			} else {
+				print $alliance['alliance'];
+			}
 			print '</a>';
 			print '</div>';
 		}
@@ -42,13 +44,21 @@ 
 	}
 	print '<div class="select-item"><form action="'.$globalURL.'/airline" method="post"><select name="airline_type" class="selectpicker" data-live-search="true">';
 	print '<option value="all"';
-	if ($airline_type == 'all') print 'selected="selected" ';
+	if ($airline_type == 'all') {
+		print 'selected="selected" ';
+	}
 	print '>'._("All").'</option><option value="passenger"';
-	if ($airline_type == 'passenger') print 'selected="selected" ';
+	if ($airline_type == 'passenger') {
+		print 'selected="selected" ';
+	}
 	print '>'._("Passenger").'</option><option value="cargo"';
-	if ($airline_type == 'cargo') print 'selected="selected" ';
+	if ($airline_type == 'cargo') {
+		print 'selected="selected" ';
+	}
 	print '>'._("Cargo").'</option><option value="military"';
-	if ($airline_type == 'military') print 'selected="selected" ';
+	if ($airline_type == 'military') {
+		print 'selected="selected" ';
+	}
 	print '>'._("Military").'</option></select>';
 	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button></form></div>';
 
@@ -75,7 +85,9 @@ 
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
 		if($previous !== $firstLetter)
 		{
-			if ($previous !== null) print ' | ';
+			if ($previous !== null) {
+				print ' | ';
+			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
 		$previous = $firstLetter;
@@ -88,7 +100,9 @@ 
 		{
 			if($previous !== $firstLetter)
 			{
-				if ($previous !== null) print '</div>';
+				if ($previous !== null) {
+					print '</div>';
+				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
 			$previous = $firstLetter;
@@ -102,10 +116,14 @@ 
 			} elseif (file_exists('images/airlines/'.$value['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$value['airline_icao'].'.png" alt="'._("Click to see airline activity").'" title="'._("Click to see airline activity").'" /> ';
-				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) {
+					print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				}
 			} else {
 				print $value['airline_name'];
-				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				if (isset($value['ban_eu']) && $value['ban_eu'] == 1) {
+					print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> ';
+				}
 			}
 			print '</a>';
 			print '</div>';

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 
 if (isset($_POST['airline']))
 {
-	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST,'airline',FILTER_SANITIZE_STRING));
+	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST, 'airline', FILTER_SANITIZE_STRING));
 } else {
 	$title = "Airlines";
 	require_once('header.php');
@@ -17,7 +17,7 @@ 
 	print '<div class="column">';
 	print '<h1>'._("Airlines").'</h1>';
 	if (isset($_POST['airline_type'])) {
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
 		//$airline_names = $Spotter->getAllAirlineNames($airline_type);
 	} else {
 		//$airline_names = $Spotter->getAllAirlineNames();
@@ -29,10 +29,10 @@ 
 		print '<div class="alphabet">';
 		foreach ($alliances as $alliance) {
 			print '<div class="alphabet-airline alphabet-item">';
-			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ','_',$alliance['alliance']).'">';
-			if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png'))
+			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ', '_', $alliance['alliance']).'">';
+			if (file_exists('images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
 			} else print $alliance['alliance'];
 			print '</a>';
 			print '</div>';
@@ -55,7 +55,7 @@ 
 	$Stats = new Stats();
 	if (isset($_POST['airline_type'])) 
 	{
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
 		//$airline_names = $Stats->getAllAirlineNames($airline_type);
 		$airline_names = $Spotter->getAllAirlineNames($airline_type);
 	} else {
@@ -68,12 +68,12 @@ 
 	}
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($airline_names as $value) 
+	foreach ($airline_names as $value) 
 	{
 		//echo $value['airline_name']."\n";
 		//echo mb_substr($value['airline_name'],0,1).' - '.$value['airline_name']."\n";
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
-		if($previous !== $firstLetter)
+		if ($previous !== $firstLetter)
 		{
 			if ($previous !== null) print ' | ';
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -82,11 +82,11 @@ 
 	}
 	print '</div>';
 	$previous = null;
-	foreach($airline_names as $value) {
+	foreach ($airline_names as $value) {
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter)
+			if ($previous !== $firstLetter)
 			{
 				if ($previous !== null) print '</div>';
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

js/map-satellite.2d.js.php

Indentation +3 added lines, -3 removed lines

@@ -553,8 +553,8 @@ 
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
                     	    "color": "#1a3151",
@@ -573,7 +573,7 @@ 
                 	layer_satellite_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 ?>
 /**
  * This javascript is part of FlightAirmap.
@@ -26,10 +26,10 @@ 
 
 <?php
 	if (isset($_GET['famsatid'])) {
-		$famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING);
+		$famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (!isset($ident) && !isset($famsatid)) {
 ?>
@@ -174,7 +174,7 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -190,7 +190,7 @@ 
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -231,7 +231,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -287,7 +287,7 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}

Braces +42 added lines, -10 removed lines

@@ -13,8 +13,11 @@ 
 <?php
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 $compress = false;
 ?>
 
@@ -145,9 +148,13 @@ 
 		    if (callsign != ""){ markerSatelliteLabel += callsign; }
 		    if (type != ""){ markerSatelliteLabel += ' - '+type; }
 <?php
-	if (isset($_COOKIE['SatelliteIconColor'])) $IconColor = $_COOKIE['SatelliteIconColor'];
-	elseif (isset($globalSatelliteIconColor)) $IconColor = $globalSatelliteIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['SatelliteIconColor'])) {
+		$IconColor = $_COOKIE['SatelliteIconColor'];
+	} elseif (isset($globalSatelliteIconColor)) {
+		$IconColor = $globalSatelliteIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($famsatid)) {
 ?>
 		    info_satellite_update(feature.properties.fc);
@@ -174,7 +181,12 @@ 
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -231,7 +243,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -287,7 +304,12 @@ 
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -456,14 +478,24 @@ 
 	if (isset($archive) && $archive) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 var reloadSatellitePage = setInterval(function(){if (noTimeout) updateSat(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 var reloadSatellitePage = setInterval(
-    function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 <?php
 	}
 ?>

install/class.create_db.php

Spacing +19 added lines, -19 removed lines

@@ -8,25 +8,25 @@ 
 	 * @param string $filename
 	 */
 	public static function import_file($filename) {
-		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
+		$filename = filter_var($filename, FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
 		if (!$Connection->connectionExists()) return 'error: DB connection failed';
 		//Connection::$db->beginTransaction();
 		$templine = '';
-		$handle = @fopen($filename,"r");
+		$handle = @fopen($filename, "r");
 		if ($handle) {
 			//$lines = file($filename);
 			//foreach ($lines as $line)
-			while (($line = fgets($handle,4096)) !== false)
+			while (($line = fgets($handle, 4096)) !== false)
 			{
-				if (substr($line,0,2) == '--' || $line == '') continue;
+				if (substr($line, 0, 2) == '--' || $line == '') continue;
 				$templine .= $line;
-				if (substr(trim($line), -1,1) == ';')
+				if (substr(trim($line), -1, 1) == ';')
 				{
 					try {
 						$sth = $Connection->db->prepare($templine);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error (import ".$filename.") : ".$e->getMessage()."\n";
 					}
 					$templine = '';
@@ -43,21 +43,21 @@ 
 		$error = '';
 		$dh = opendir($directory);
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
-		while(false !== ($filename = readdir($dh)))
+		while (false !== ($filename = readdir($dh)))
 		{
-			if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
+			if (preg_match('/\.sql$/', $filename)) $error .= create_db::import_file($directory.$filename);
 		}
 		return $error;
 	}
 
-	public static function create_database($root,$root_pass,$user,$pass,$db,$db_type,$host,$port = '') {
-		$root = filter_var($root,FILTER_SANITIZE_STRING);
-		$root_pass = filter_var($root_pass,FILTER_SANITIZE_STRING);
-		$user = filter_var($user,FILTER_SANITIZE_STRING);
-		$password = filter_var($pass,FILTER_SANITIZE_STRING);
-		$db = filter_var($db,FILTER_SANITIZE_STRING);
-		$db_type = filter_var($db_type,FILTER_SANITIZE_STRING);
-		$host = filter_var($host,FILTER_SANITIZE_STRING);
+	public static function create_database($root, $root_pass, $user, $pass, $db, $db_type, $host, $port = '') {
+		$root = filter_var($root, FILTER_SANITIZE_STRING);
+		$root_pass = filter_var($root_pass, FILTER_SANITIZE_STRING);
+		$user = filter_var($user, FILTER_SANITIZE_STRING);
+		$password = filter_var($pass, FILTER_SANITIZE_STRING);
+		$db = filter_var($db, FILTER_SANITIZE_STRING);
+		$db_type = filter_var($db_type, FILTER_SANITIZE_STRING);
+		$host = filter_var($host, FILTER_SANITIZE_STRING);
 		if ($db_type == 'mysql' && $port == '') $port = 3306;
 		elseif ($port == '') $port = 5432;
 		// Dirty hack
@@ -65,8 +65,8 @@ 
 			$grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
-			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass);
-			else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass);
+			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1', $root, $root_pass);
+			else $dbh = new PDO($db_type.':host='.$host.';port='.$port, $root, $root_pass);
 			$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 			if ($db_type == 'mysql') {
 				$dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
@@ -76,7 +76,7 @@ 
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';
 					GRANT ALL PRIVILEGES ON DATABASE ".$db." TO ".$user.";");
 			}
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			$dbh = null;
 			return "error : ".$e->getMessage();
 		}

Braces +25 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
-		if (!$Connection->connectionExists()) return 'error: DB connection failed';
+		if (!$Connection->connectionExists()) {
+			return 'error: DB connection failed';
+		}
 		//Connection::$db->beginTransaction();
 		$templine = '';
 		$handle = @fopen($filename,"r");
@@ -19,7 +21,9 @@ 
 			//foreach ($lines as $line)
 			while (($line = fgets($handle,4096)) !== false)
 			{
-				if (substr($line,0,2) == '--' || $line == '') continue;
+				if (substr($line,0,2) == '--' || $line == '') {
+					continue;
+				}
 				$templine .= $line;
 				if (substr(trim($line), -1,1) == ';')
 				{
@@ -45,7 +49,9 @@ 
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
 		while(false !== ($filename = readdir($dh)))
 		{
-			if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
+			if (preg_match('/\.sql$/',$filename)) {
+				$error .= create_db::import_file($directory.$filename);
+			}
 		}
 		return $error;
 	}
@@ -58,19 +64,29 @@ 
 		$db = filter_var($db,FILTER_SANITIZE_STRING);
 		$db_type = filter_var($db_type,FILTER_SANITIZE_STRING);
 		$host = filter_var($host,FILTER_SANITIZE_STRING);
-		if ($db_type == 'mysql' && $port == '') $port = 3306;
-		elseif ($port == '') $port = 5432;
+		if ($db_type == 'mysql' && $port == '') {
+			$port = 3306;
+		} elseif ($port == '') {
+			$port = 5432;
+		}
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
 			$grantright = $_SERVER['SERVER_ADDR'];
-		} else $grantright = 'localhost';
+		} else {
+			$grantright = 'localhost';
+		}
 		try {
-			if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass);
-			else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass);
+			if ($host == 'localhost') {
+				$dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass);
+			} else {
+				$dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass);
+			}
 			$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 			if ($db_type == 'mysql') {
 				$dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
-				if ($grantright == 'localhost') $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
+				if ($grantright == 'localhost') {
+					$dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
+				}
 			} else if ($db_type == 'pgsql') {
 				$dbh->exec("CREATE DATABASE ".$db.";");
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';

require/class.Satellite.php

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -32,7 +32,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -44,7 +44,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -56,7 +56,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -64,49 +64,49 @@ 
 		else return array();
 	}
 	
-	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names();
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 
-	public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names_type($type);
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			if (isset($position[0])) $result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			if (isset($position[0])) $result = array_merge($position, $result);
 			else $result[] = $position;
 		}
 		return $result;
 	}
 
-	public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$qth = new Predict_QTH();
 		$qth->lat = floatval(37.790252);
 		$qth->lon = floatval(-122.419968);
 	
 		$tle_file = $this->get_tle($name);
 		$type = $tle_file['tle_type'];
-		$tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
+		$tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
 		if ($timestamp_begin == '') $timestamp_begin = time();
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
-			$predict->predict_calc($sat,$qth,$now);
-			return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type);
+			$predict->predict_calc($sat, $qth, $now);
+			return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type);
 		} else {
 			$result = array();
-			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
+			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
 				$now = Predict_Time::unix2daynum($timestamp);
-				$predict->predict_calc($sat,$qth,$now);
-				$result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type);
+				$predict->predict_calc($sat, $qth, $now);
+				$result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type);
 			}
 			return $result;
 		}
@@ -117,7 +117,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name.'%'));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -145,7 +145,7 @@ 
 		$sth->execute($query_values);
 		$launch_site_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['launch_site'] = $row['launch_site'];
 			$temp_array['launch_site_count'] = $row['launch_site_count'];
@@ -174,7 +174,7 @@ 
 		$sth->execute($query_values);
 		$owner_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['owner_name'] = $row['owner_name'];
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -203,7 +203,7 @@ 
 		$sth->execute($query_values);
 		$owner_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['country_name'] = $row['country_name'];
 			$temp_array['country_count'] = $row['country_count'];
@@ -247,7 +247,7 @@ 
 		$sth->execute($query_data);
 		$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'];
@@ -292,7 +292,7 @@ 
 		$sth->execute($query_data);
 		$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['date_count'] = $row['date_count'];

Indentation +34 added lines, -34 removed lines

@@ -14,7 +14,7 @@ 
 require_once(dirname(__FILE__).'/libs/Predict/Predict/TLE.php');
 
 class Satellite {
-    /** @var $db PDOStatement  */
+	/** @var $db PDOStatement  */
 	public $db;
 
 	public function __construct($dbc = null) {
@@ -133,13 +133,13 @@ 
 		else return array();
 	}
 
-    /**
-     * Gets all launch site
-     *
-     * @param bool $limit
-     * @param array $filters
-     * @return array the launch site list
-     */
+	/**
+	 * Gets all launch site
+	 *
+	 * @param bool $limit
+	 * @param array $filters
+	 * @return array the launch site list
+	 */
 	public function countAllLaunchSite($limit = true, $filters = array())
 	{
 		//$filter_query = $this->getFilter($filters,true,true);
@@ -163,11 +163,11 @@ 
 	}
 
 	/**
-	* Gets all owners
-	*
-	* @return array the owners list
-	*
-	*/
+	 * Gets all owners
+	 *
+	 * @return array the owners list
+	 *
+	 */
 	public function countAllOwners($limit = true, $filters = array())
 	{
 		//$filter_query = $this->getFilter($filters,true,true);
@@ -190,13 +190,13 @@ 
 		return $owner_array;
 	}
 
-    /**
-     * Gets all countries owners
-     *
-     * @param bool $limit
-     * @param array $filters
-     * @return array the countries list
-     */
+	/**
+	 * Gets all countries owners
+	 *
+	 * @param bool $limit
+	 * @param array $filters
+	 * @return array the countries list
+	 */
 	public function countAllCountriesOwners($limit = true, $filters = array())
 	{
 		global $globalDBdriver;
@@ -220,13 +220,13 @@ 
 		return $owner_array;
 	}
 
-    /**
-     * Counts all launch dates during the last year
-     *
-     * @param array $filters
-     * @param string $sincedate
-     * @return array the launch date list
-     */
+	/**
+	 * Counts all launch dates during the last year
+	 *
+	 * @param array $filters
+	 * @param string $sincedate
+	 * @return array the launch date list
+	 */
 	public function countAllMonthsLastYear($filters = array(), $sincedate = '')
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -266,13 +266,13 @@ 
 		return $date_array;
 	}
 
-    /**
-     * Counts all dates during the last 10 years
-     *
-     * @param array $filters
-     * @param string $sincedate
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last 10 years
+	 *
+	 * @param array $filters
+	 * @param string $sincedate
+	 * @return array the date list
+	 */
 	public function countAllYears($filters = array(), $sincedate = '')
 	{
 		global $globalTimezone, $globalDBdriver;

Braces +63 added lines, -23 removed lines

@@ -20,7 +20,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	public function get_tle($name) {
@@ -32,8 +34,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_types() {
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
@@ -44,8 +49,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names() {
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
@@ -56,8 +64,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names_type($type) {
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
@@ -68,8 +79,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
@@ -87,8 +101,11 @@ 
 		$result = array();
 		foreach ($all_sat as $sat) {
 			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			if (isset($position[0])) $result = array_merge($position,$result);
-			else $result[] = $position;
+			if (isset($position[0])) {
+				$result = array_merge($position,$result);
+			} else {
+				$result[] = $position;
+			}
 		}
 		return $result;
 	}
@@ -104,7 +121,9 @@ 
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
-		if ($timestamp_begin == '') $timestamp_begin = time();
+		if ($timestamp_begin == '') {
+			$timestamp_begin = time();
+		}
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			$predict->predict_calc($sat,$qth,$now);
@@ -129,8 +148,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 
     /**
@@ -148,7 +170,9 @@ 
 		    FROM satellite".$filter_query." satellite.launch_site <> '' AND satellite.launch_site IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.launch_site ORDER BY launch_site_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$launch_site_array = array();
@@ -176,7 +200,9 @@ 
 		    FROM satellite".$filter_query." satellite.owner <> '' AND satellite.owner IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.owner ORDER BY owner_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$owner_array = array();
@@ -206,7 +232,9 @@ 
 		    FROM satellite".$filter_query." satellite.country_owner <> '' AND satellite.country_owner IS NOT NULL";
 		$query_values = array();
 		$query .= " GROUP BY satellite.country_owner ORDER BY country_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$owner_array = array();
@@ -234,20 +262,26 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		//$filter_query = $this->getFilter($filters,true,true);
 		$filter_query = ' WHERE';
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name, month_name
 				ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
 			$query  = "SELECT EXTRACT(MONTH FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS'";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name, month_name
 				ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
@@ -280,20 +314,26 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		//$filter_query = $this->getFilter($filters,true,true);
 		$filter_query = ' WHERE';
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(satellite.launch_date,'+00:00', :offset)) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 YEAR)";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name
 				ORDER BY year_name ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
 			$query  = "SELECT EXTRACT(YEAR FROM satellite.launch_date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count
 				FROM satellite".$filter_query." satellite.launch_date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '10 YEARS'";
-			if ($sincedate != '') $query .= " AND satellite.launch_date > '".$sincedate."'";
+			if ($sincedate != '') {
+				$query .= " AND satellite.launch_date > '".$sincedate."'";
+			}
 			$query .= " GROUP BY year_name
 				ORDER BY year_name ASC";
 			$query_data = array(':offset' => $offset);

live-sat-geojson.php

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 		header('Content-disposition: attachment; filename="flightairmap-sat.json"');
 	}
 }
-$history = urldecode(filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING));
+$history = urldecode(filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING));
 header('Content-Type: text/javascript');
 
 $begintime = microtime(true);
@@ -21,10 +21,10 @@ 
 
 $spotter_array = array();
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
-	$sattypes = explode(',',$_COOKIE['sattypes']);
+	$sattypes = explode(',', $_COOKIE['sattypes']);
 	foreach ($sattypes as $sattype) {
 		//$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
-		$spotter_array = array_merge($Satellite->position_all_type($sattype),$spotter_array);
+		$spotter_array = array_merge($Satellite->position_all_type($sattype), $spotter_array);
 	}
 }
 
@@ -36,7 +36,7 @@ 
 
 //$spotter_array = array_unique($spotter_array,SORT_REGULAR);
 //print_r($spotter_array);
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 
 $output = '{"type":"FeatureCollection","features":[';
 if (!empty($spotter_array) && is_array($spotter_array))
@@ -44,7 +44,7 @@ 
 	$last_name = '';
 	$coordinatearray = '';
 	$timearray = array();
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$output_data = '';
 		$output_data .= '{"type":"Feature","properties":{';
@@ -61,14 +61,14 @@ 
 		}
 		$output_data .= '"altitude":0,';
 		$output_data .= '"sqt":'.$sqltime.',';
-		$nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20);
+		$nextlatlon = $Satellite->position($spotter_item['name'], time() + $globalMapRefresh + 20);
 		$nextlat = $nextlatlon['latitude'];
-		if (abs($nextlat-$spotter_item['latitude']) > 90) {
+		if (abs($nextlat - $spotter_item['latitude']) > 90) {
 			if ($spotter_item['latitude'] < 0) $nexlat = -90;
 			else $nexlat = 90;
 		}
 		$nextlon = $nextlatlon['longitude'];
-		if (abs($nextlon-$spotter_item['longitude']) > 180) {
+		if (abs($nextlon - $spotter_item['longitude']) > 180) {
 			if ($spotter_item['longitude'] < 0) $nextlon = -180;
 			else $nextlon = 180;
 		}
@@ -79,27 +79,27 @@ 
 		$output_data .= ']}},';
 		$output .= $output_data;
 		if ($history == $spotter_item['name']) {
-			$spotter_history_array = $Satellite->position($spotter_item['name'],time()-6000,time());
+			$spotter_history_array = $Satellite->position($spotter_item['name'], time() - 6000, time());
 			$spotter_history_array = array_reverse($spotter_history_array);
 			$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['name'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
 			foreach ($spotter_history_array as $key => $spotter_history) {
-				if ((isset($previous_lon) && abs($previous_lon-$spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat-$spotter_history['latitude']) > 90)) {
+				if ((isset($previous_lon) && abs($previous_lon - $spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat - $spotter_history['latitude']) > 90)) {
 					break;
 				}
 				$output_history .= '[';
-				$output_history .=  $spotter_history['longitude'].', ';
-				$output_history .=  $spotter_history['latitude'];
+				$output_history .= $spotter_history['longitude'].', ';
+				$output_history .= $spotter_history['latitude'];
 				$output_history .= '],';
 				$previous_lon = $spotter_history['longitude'];
 				$previous_lat = $spotter_history['latitude'];
 			}
-			$output_history = substr($output_history,0,-1);
+			$output_history = substr($output_history, 0, -1);
 			$output_history .= ']}},';
 			$output .= $output_history;
 		}
 	}
 }
-if (isset($output_data)) $output = substr($output,0,-1);
+if (isset($output_data)) $output = substr($output, 0, -1);
 $output .= ']}';
 print $output;
 ?>

Braces +13 added lines, -5 removed lines

@@ -64,13 +64,19 @@ 
 		$nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20);
 		$nextlat = $nextlatlon['latitude'];
 		if (abs($nextlat-$spotter_item['latitude']) > 90) {
-			if ($spotter_item['latitude'] < 0) $nexlat = -90;
-			else $nexlat = 90;
+			if ($spotter_item['latitude'] < 0) {
+				$nexlat = -90;
+			} else {
+				$nexlat = 90;
+			}
 		}
 		$nextlon = $nextlatlon['longitude'];
 		if (abs($nextlon-$spotter_item['longitude']) > 180) {
-			if ($spotter_item['longitude'] < 0) $nextlon = -180;
-			else $nextlon = 180;
+			if ($spotter_item['longitude'] < 0) {
+				$nextlon = -180;
+			} else {
+				$nextlon = 180;
+			}
 		}
 		$output_data .= '"nextlatlon":['.$nextlat.','.$nextlon.']},';
 		//$output_data .= '"heading":"'.$Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$nextlatlon['latitude'],$nextlatlon['longitude']).'",';
@@ -99,7 +105,9 @@ 
 		}
 	}
 }
-if (isset($output_data)) $output = substr($output,0,-1);
+if (isset($output_data)) {
+	$output = substr($output,0,-1);
+}
 $output .= ']}';
 print $output;
 ?>

live-sat-czml.php

Spacing +19 added lines, -19 removed lines

@@ -20,17 +20,17 @@ 
 
 $spotter_array = array();
 if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') {
-	$sattypes = explode(',',$_COOKIE['sattypes']);
+	$sattypes = explode(',', $_COOKIE['sattypes']);
 	foreach ($sattypes as $sattype) {
-		$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array);
+		$spotter_array = array_merge($Satellite->position_all_type($sattype, $timeb - $globalLiveInterval, $timeb), $spotter_array);
 	}
 }
 if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) {
-	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG 1',time()-$globalLiveInterval,time()),$spotter_array);
-	$spotter_array = array_merge($Satellite->position('TIANGONG-2',time()-$globalLiveInterval,time()),$spotter_array);
+	$spotter_array = array_merge($Satellite->position('ISS (ZARYA)', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG 1', time() - $globalLiveInterval, time()), $spotter_array);
+	$spotter_array = array_merge($Satellite->position('TIANGONG-2', time() - $globalLiveInterval, time()), $spotter_array);
 }
-$spotter_array = array_unique($spotter_array,SORT_REGULAR);
+$spotter_array = array_unique($spotter_array, SORT_REGULAR);
 /*
 $modelsdb = array();
 if (file_exists('models/space/space_modelsdb')) {
@@ -54,14 +54,14 @@ 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
-$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
+$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"step": "SYSTEM_CLOCK_MULTIPLIER"}';
 $output .= '},';
 if (!empty($spotter_array) && is_array($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		date_default_timezone_set('UTC');
@@ -115,23 +115,23 @@ 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubiesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['name'] == 'TERRA') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/terra.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'O3B') !== false) {
+				} elseif (strpos($spotter_item['name'], 'O3B') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/o3b.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GLOBALSTAR') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GLOBALSTAR') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/globalstar.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GPS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GPS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/gps.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'GENESIS') !== false) {
+				} elseif (strpos($spotter_item['name'], 'GENESIS') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/genesis.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'OSCAR 7') !== false) {
+				} elseif (strpos($spotter_item['name'], 'OSCAR 7') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/oscar7.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FLOCK') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FLOCK') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'PLEIADES') !== false) {
+				} elseif (strpos($spotter_item['name'], 'PLEIADES') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/pleiades.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'DUCHIFAT') !== false) {
+				} elseif (strpos($spotter_item['name'], 'DUCHIFAT') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/duchifat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
-				} elseif (strpos($spotter_item['name'],'FORMOSAT-2') !== false) {
+				} elseif (strpos($spotter_item['name'], 'FORMOSAT-2') !== false) {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/formosat2.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
 				} elseif ($spotter_item['type'] == 'iridium') {
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/space/iridium.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },';
@@ -153,14 +153,14 @@ 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
 			$output .= '"interpolationAlgorithm":"HERMITE","interpolationDegree":3,';
 			$output .= '"cartographicDegrees": [';
-			$output .= '"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= '"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;
 			$orientation = '"orientation" : { ';
 			$orientation .= '"unitQuaternion": [';
 		} else {
-			$output .= ',"'.date("c",$spotter_item['timestamp']).'", ';
+			$output .= ',"'.date("c", $spotter_item['timestamp']).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'].', ';
 			$output .= $spotter_item['altitude']*1000;

location-data.php

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 $Source = new Source();
 
 if (isset($_GET['sourceid'])) {
-	$sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT);
+	$sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT);
 	$source_data = $Source->getLocationInfoById($sourceid);
 	if (isset($source_data[0])) {
  ?>
@@ -37,8 +37,8 @@ 
 print '</div>';
 
 if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
+if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 4).', '.round($spotter_item['longitude'], 4).'</div>';
 /*
 if ($spotter_item['atc_range'] > 0) {
     print '<div><span>'._("Range").'</span>';
@@ -47,7 +47,7 @@ 
 }
 */
 if ($spotter_item['type'] == 'wx') {
-	$weather = json_decode($spotter_item['description'],true);
+	$weather = json_decode($spotter_item['description'], true);
 	//print_r($weather);
 	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
 	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';

Braces +40 added lines, -15 removed lines

@@ -17,12 +17,19 @@ 
 date_default_timezone_set('UTC');
 
 print '<div class="top">';
-if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
-elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
-elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
-elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
-elseif ($spotter_item['type'] == 'fires') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
-else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
+if ($spotter_item['name'] != '') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
+} elseif ($spotter_item['location_id'] != 0) {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
+} elseif ($spotter_item['type'] == 'lightning') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
+} elseif ($spotter_item['type'] == 'wx') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
+} elseif ($spotter_item['type'] == 'fires') {
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
+} else {
+	print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
+}
 print '</div>';
 
 print '</div></div>';
@@ -40,8 +47,12 @@ 
 print $spotter_item['last_seen'].' UTC';
 print '</div>';
 
-if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
+if ($spotter_item['city'] != '') {
+	print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
+}
+if ($spotter_item['country'] !='') {
+	print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
+}
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
 /*
 if ($spotter_item['atc_range'] > 0) {
@@ -53,13 +64,27 @@ 
 if ($spotter_item['type'] == 'wx') {
 	$weather = json_decode($spotter_item['description'],true);
 	//print_r($weather);
-	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
-	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
-	if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
-	if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
-	if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
-	if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
-	if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
+	if (isset($weather['temp'])) {
+		print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
+	}
+	if (isset($weather['pressure'])) {
+		print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
+	}
+	if (isset($weather['wind_gust'])) {
+		print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
+	}
+	if (isset($weather['humidity'])) {
+		print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
+	}
+	if (isset($weather['rain'])) {
+		print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
+	}
+	if (isset($weather['precipitation'])) {
+		print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
+	}
+	if (isset($weather['precipitation24h'])) {
+		print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
+	}
 	$spotter_item['description'] = $weather['comment'];
 } elseif ($spotter_item['type'] == 'fires') {
 	//print_r(json_decode($spotter_item['description'],true));