Ysurac / FlightAirMap

install/install_db.php

Indentation +25 added lines, -25 removed lines

@@ -1,30 +1,30 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        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';
+		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/populate_all.php

Indentation +25 added lines, -25 removed lines

@@ -1,37 +1,37 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    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 "Install countries...";
-    update_db::update_countries();
-    echo "Done !\n";
-    if (isset($globalOwner) && $globalOwner) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	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 "Install countries...";
+	update_db::update_countries();
+	echo "Done !\n";
+	if (isset($globalOwner) && $globalOwner) {
 	echo "Install private owners...";
 	update_db::update_owner();
-        echo "Done !\n";
-    }
-    /*
+		echo "Done !\n";
+	}
+	/*
     if (isset($globalIVAO) && $globalIVAO) {
         echo "Install IVAO airlines and logos...";
         update_db::update_IVAO();
 	echo "Done !\n";
     }
     */
-    if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
+	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	echo "Install NOTAM from notaminfo.com...";
-        update_db:update_notam();
-        echo "Done !\n";
-    }
+		update_db:update_notam();
+		echo "Done !\n";
+	}
 ?>
\ No newline at end of file

install/populate_ivao.php

Indentation +12 added lines, -12 removed lines

@@ -1,23 +1,23 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    if (isset($globalVATSIM) && $globalVATSIM) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	if (isset($globalVATSIM) && $globalVATSIM) {
 	echo "Install VATSIM airlines...";
 	update_db::update_vatsim();
 	echo "Done !\n";
-    }
-    if (isset($globalIVAO) && $globalIVAO) {
+	}
+	if (isset($globalIVAO) && $globalIVAO) {
 	if (!file_exists('tmp/ivae_feb2013.zip')) {
 		echo "You have to download the file ivae_feb2013.zip from https://www.ivao.aero/softdev/mirrors.asp?software=IvAeDataUp and put it in install/tmp directory";
 	} else {
-	        echo "Install IVAO airlines and logos...";
-	        update_db::update_IVAO();
+			echo "Install IVAO airlines and logos...";
+			update_db::update_IVAO();
 		echo "Done !\n";
 	}
-    }
+	}
 ?>
\ No newline at end of file

install/header.php

Indentation +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 <meta property="og:site_name" content="<?php print $globalName; ?>"/>
 
 <?php
-    if (!isset($_SESSION['install']) && !$globalInstalled) {
+	if (!isset($_SESSION['install']) && !$globalInstalled) {
 ?>
 <script language="JavaScript" type="text/javascript">
     function datasource_js() {
@@ -120,22 +120,22 @@ 
     }
 </script>
 <?php
-    }
+	}
 ?>
 
 </head>
 
 <?php
-    if (!isset($_SESSION['install']) && !$globalInstalled) {
+	if (!isset($_SESSION['install']) && !$globalInstalled) {
 ?>
 
 <body class="page-<?php print strtolower($current_page); ?>" onload="datasource_js(); metarcycle_js(); create_database_js(); daemon_js(); schedule_js()">
 <?php
-    } else {
+	} else {
 ?>
     <body class="page-<?php print strtolower($current_page); ?>">
 <?php
-    }
+	}
 ?>
 <div class="navbar navbar-fixed-top" role="navigation">
   <div class="container">
@@ -154,12 +154,12 @@ 
 
 <?php
 if (isset($top_header)) {
-    if ($top_header != "")
-    {
+	if ($top_header != "")
+	{
 	print '<div class="top-header container clear" role="main">';
 		print '<img src="../images/'.$top_header.'" alt="'.$title.'" title="'.$title.'" />';
 	print '</div>';
-    }
+	}
 }
 ?>
 

install/class.create_db.php

Indentation +20 added lines, -20 removed lines

@@ -6,27 +6,27 @@ 
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
-                //Connection::$db->beginTransaction();
-                 $templine = '';
-                 $lines = file($filename);
-                 foreach ($lines as $line)
-                 {
-                	if (substr($line,0,2) == '--' || $line == '') continue;
-                	$templine .= $line;
-                	if (substr(trim($line), -1,1) == ';')
-                	{
-                		try {
-                			$sth = $Connection->db->prepare($templine);
+				//Connection::$db->beginTransaction();
+				 $templine = '';
+				 $lines = file($filename);
+				 foreach ($lines as $line)
+				 {
+					if (substr($line,0,2) == '--' || $line == '') continue;
+					$templine .= $line;
+					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 = '';
-                	}
+							}
+						$templine = '';
+					}
 		}
-                //Connection::$db->commit();
-                $Connection->db = null;
-                return '';
+				//Connection::$db->commit();
+				$Connection->db = null;
+				return '';
 	}
 
 	public static function import_all_db($directory) {
@@ -35,7 +35,7 @@ 
 		//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;
 	}
@@ -50,7 +50,7 @@ 
 		$host = filter_var($host,FILTER_SANITIZE_STRING);
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
-		    $grantright = $_SERVER['SERVER_ADDR'];
+			$grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
 			$dbh = new PDO($db_type.':host='.$host,$root,$root_pass);

install/index.php

Indentation +29 added lines, -29 removed lines

@@ -85,7 +85,7 @@ 
 	}
 	print '</ul>You <strong>must</strong> add these modules.</div>';
 	require('../footer.php');
-        exit;
+		exit;
 }
 
 if (!isset($_SESSION['install']) && !isset($_POST['dbtype']) && (count($error) == 0)) {
@@ -287,14 +287,14 @@ 
 					<th>Source name</th>
 				</tr>
 		<?php
-		    require_once(dirname(__FILE__).'/../require/class.Connection.php');
-		    $Connection = new Connection();
-		    if ($Connection->db != NULL) {
+			require_once(dirname(__FILE__).'/../require/class.Connection.php');
+			$Connection = new Connection();
+			if ($Connection->db != NULL) {
 			if ($Connection->tableExists('source_location')) {
-			    require_once(dirname(__FILE__).'/../require/class.Source.php');
-			    $Source = new Source();
-			    $alllocations = $Source->getAllLocationInfo();
-			    foreach ($alllocations as $location) {
+				require_once(dirname(__FILE__).'/../require/class.Source.php');
+				$Source = new Source();
+				$alllocations = $Source->getAllLocationInfo();
+				foreach ($alllocations as $location) {
 		?>
 				<tr>
 	    				<input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" />
@@ -308,9 +308,9 @@ 
 				</tr>
 		
 		<?php
-			    }
+				}
+			}
 			}
-		    }
 		?>
 
 				<tr>
@@ -495,12 +495,12 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+									if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
 								<?php
-								    } else {
+									} else {
 									$hostport = explode(':',$source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
@@ -513,7 +513,7 @@ 
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
 								<td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td>
 								<?php
-								    }
+									}
 								?>
 								<td>
 									<select name="format[]" id="format">
@@ -788,7 +788,7 @@ 
 			<br />
 			<p>
 			<?php 
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
+				if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
 				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
@@ -798,11 +798,11 @@ 
 				<b>The directory cache is not writable, aircraft icon will not be cached</b>
 			<?php
 				}
-			    } else {
+				} else {
 			?>
 				<b>PHP GD is not installed, you can t change color of aircraft icon on map</b>
 			<?php
-			    }
+				}
 			?>
 			</p>
 			<br />
@@ -821,7 +821,7 @@ 
 	</p>
 <?php
 	require('../footer.php');
-        exit;
+		exit;
 }
 	
 $settings = array();
@@ -904,8 +904,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+		if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+		else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1157,14 +1157,14 @@ 
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+		$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		$settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
-    	}
+		$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+			$settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+		}
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
@@ -1198,12 +1198,12 @@ 
 	print '<ul><div id="step">';
 	$pop = false;
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		if ($done == 'Create database') $pop = true;
 	}
 	if ($pop) {
-	    sleep(5);
-	    print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
 	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
 	print '</div></ul>';
 	print '<div id="error"></div>';
@@ -1265,7 +1265,7 @@ 
 	unset($_COOKIE['install']);
 	print '<div class="info column"><ul>';
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
 	}
 	print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>';
 	print '</ul></div>';

install/install-action.php

Indentation +34 added lines, -34 removed lines

@@ -68,27 +68,27 @@ 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	if (update_schema::check_version(false) == '0') {
 		if ($globalDBdriver == 'mysql') {
-		    $error .= create_db::import_all_db('../db/');
+			$error .= create_db::import_all_db('../db/');
 		} elseif ($globalDBdriver == 'pgsql') {
-		    $error .= create_db::import_all_db('../db/pgsql/');
+			$error .= create_db::import_all_db('../db/pgsql/');
 		}
 		if ($error != '') {
-                        $_SESSION['error'] = $error;
+						$_SESSION['error'] = $error;
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 		} else {
-		    $_SESSION['install'] = 'sources';
-		    $_SESSION['next'] = 'Insert data in source table';
+			$_SESSION['install'] = 'sources';
+			$_SESSION['next'] = 'Insert data in source table';
 		}
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
-                        $_SESSION['error'] = $error;
+						$_SESSION['error'] = $error;
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
@@ -118,25 +118,25 @@ 
 	$error .= update_db::update_countries();
 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
-	    $_SESSION['install'] = 'notam';
-	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'notam';
+		$_SESSION['next'] = 'Populate NOTAM table with externals data';
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
-	    $_SESSION['install'] = 'owner';
-	    $_SESSION['next'] = 'Populate owner table with externals data';
-	    unset($_SESSION['owner']);
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'owner';
+		$_SESSION['next'] = 'Populate owner table with externals data';
+		unset($_SESSION['owner']);
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	} else {
-	    $_SESSION['install'] = 'sources';
-	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'sources';
+		$_SESSION['next'] = 'Insert data in source table';
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -152,7 +152,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -185,7 +185,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -200,7 +200,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -229,7 +229,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -244,7 +244,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -296,17 +296,17 @@ 
 */
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'sources') {
 	if (isset($_SESSION['sources']) && count($_SESSION['sources']) > 0) {
-	    $sources = $_SESSION['sources'];
+		$sources = $_SESSION['sources'];
 
-	    include_once('../require/class.Source.php');
-	    $globalDebug = FALSE;
-	    $Source = new Source();
-	    $Source->deleteAllLocation();
-	    foreach ($sources as $src) {
+		include_once('../require/class.Source.php');
+		$globalDebug = FALSE;
+		$Source = new Source();
+		$Source->deleteAllLocation();
+		foreach ($sources as $src) {
 		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
-	    }
-	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
-	    unset($_SESSION['sources']);
+		}
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+		unset($_SESSION['sources']);
 	}
 	/*
 	if (isset($globalIVAO) && $globalIVAO) $_SESSION['install'] = 'ivao';

install/update_arrival_airport.php

Indentation +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@
  *    This Script will try to find all real arrival airports for all flights in DB
  *
 */
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('../require/class.Spotter.php');
-    $Spotter = new Spotter();
-    $Spotter->updateArrivalAirports();
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('../require/class.Spotter.php');
+	$Spotter = new Spotter();
+	$Spotter->updateArrivalAirports();
 
 ?>
\ No newline at end of file

install/class.update_db.php

Indentation +305 added lines, -305 removed lines

@@ -70,38 +70,38 @@ 
 		try {
 			//$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		if ($globalDebug) echo " - Add routes to DB -";
-    		update_db::connect_sqlite($database_file);
+			if ($globalDebug) echo " - Add routes to DB -";
+			update_db::connect_sqlite($database_file);
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
 				$sth_dest->execute($query_dest_values);
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack(); 
 			return "error : ".$e->getMessage();
 		}
-                return '';
+				return '';
 	}
 	public static function retrieve_modes_sqlite_to_dest($database_file) {
 		global $globalTransaction;
@@ -110,27 +110,27 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
-    		update_db::connect_sqlite($database_file);
+			update_db::connect_sqlite($database_file);
 		$query = 'select * from Aircraft';
 		try {
-                        $sth = update_db::$db_sqlite->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth = update_db::$db_sqlite->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
 		$query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)';
 		
@@ -141,17 +141,17 @@ 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
 			if ($globalTransaction) $Connection->db->beginTransaction();
-            		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
+					while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 				if ($values['UserString4'] == 'M') $type = 'military';
 				else $type = null;
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
-				    $sth_dest_owner->execute($query_dest_owner_values);
+					$query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
+					$sth_dest_owner->execute($query_dest_owner_values);
 				}
-            		}
+					}
 			if ($globalTransaction) $Connection->db->commit();
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
@@ -161,10 +161,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -176,10 +176,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -189,25 +189,25 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
-            			while (!feof($fh)) {
-            				$line = $Common->hex2str(fgets($fh,9999));
+						while (!feof($fh)) {
+							$line = $Common->hex2str(fgets($fh,9999));
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
-            				$values['ModeS'] = substr($line,0,6);
-            				$values['Registration'] = trim(substr($line,69,6));
-            				$aircraft_name = trim(substr($line,48,6));
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = substr($line,0,6);
+							$values['Registration'] = trim(substr($line,69,6));
+							$aircraft_name = trim(substr($line,48,6));
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				//if (count($result) > 0) {
-	            				if (isset($result['icao']) && $result['icao'] != '') {
-	            				    $values['ICAOTypeCode'] = $result['icao'];
-	            				} 
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								//if (count($result) > 0) {
+								if (isset($result['icao']) && $result['icao'] != '') {
+									$values['ICAOTypeCode'] = $result['icao'];
+								} 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -230,10 +230,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -244,10 +244,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -258,24 +258,24 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',',"'");
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',',"'");
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',',"'");
             				
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
 					//print_r($line);
-            				$values['ModeS'] = $line[1];
-            				$values['Registration'] = $line[3];
-            				$aircraft_name = $line[2];
-            				// Check if we can find ICAO, else set it to GLID
-            				$aircraft_name_split = explode(' ',$aircraft_name);
-            				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
-            				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
-            				$sth_search = $Connection->db->prepare($query_search);
+							$values['ModeS'] = $line[1];
+							$values['Registration'] = $line[3];
+							$aircraft_name = $line[2];
+							// Check if we can find ICAO, else set it to GLID
+							$aircraft_name_split = explode(' ',$aircraft_name);
+							$search_more = '';
+							if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+							$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
+							$sth_search = $Connection->db->prepare($query_search);
 					try {
-                                    		$sth_search->execute();
-	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+											$sth_search->execute();
+								$result = $sth_search->fetch(PDO::FETCH_ASSOC);
+								if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -298,10 +298,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		return '';
 	}
 
@@ -312,10 +312,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => $database_file));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => $database_file));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		
 		if ($fh = fopen($database_file,"r")) {
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -326,94 +326,94 @@ 
 			try {
 				if ($globalTransaction) $Connection->db->beginTransaction();
 				$tmp = fgetcsv($fh,9999,',','"');
-            			while (!feof($fh)) {
-            				$line = fgetcsv($fh,9999,',','"');
-            				//print_r($line);
-            				if ($country == 'F') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[4];
-            				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+						while (!feof($fh)) {
+							$line = fgetcsv($fh,9999,',','"');
+							//print_r($line);
+							if ($country == 'F') {
+								$values['registration'] = $line[0];
+								$values['base'] = $line[4];
+								$values['owner'] = $line[5];
+								if ($line[6] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = $line[3];
-            				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = $line[3];
+								$values['owner'] = $line[2];
+								if ($line[1] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+						$values['cancel'] = '';
 					} elseif ($country == 'HB') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    $values['date_first_reg'] = '';
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								$values['date_first_reg'] = '';
+						$values['cancel'] = '';
 					} elseif ($country == 'OK') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[3];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
-					    $values['cancel'] = '';
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[3];
+								$values['base'] = null;
+								$values['owner'] = $line[5];
+								if ($line[18] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+						$values['cancel'] = '';
 					} elseif ($country == 'VH') {
-					    // TODO : add modeS & reg to aircraft_modes
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
-
-					    $values['cancel'] = $line[39];
+						// TODO : add modeS & reg to aircraft_modes
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[12];
+								if ($line[28] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+
+						$values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'CC') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[6];
-            				    $values['date_first_reg'] = null;
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[6];
+								$values['date_first_reg'] = null;
+						$values['cancel'] = '';
 					} elseif ($country == 'HJ') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[8];
+								if ($line[7] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'PP') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
-					    $values['cancel'] = $line[7];
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[6] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+						$values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[4];
+								if ($line[5] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+						$values['cancel'] = '';
 					} elseif ($country == '8Q') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = '';
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								if ($line[7] == '') $values['date_first_reg'] = '';
+						else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+						$values['cancel'] = '';
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
-            				    $values['registration'] = $line[0];
-            				    $values['base'] = null;
-            				    $values['owner'] = $line[3];
-            				    $values['date_first_reg'] = '';
-					    $values['cancel'] = '';
+								$values['registration'] = $line[0];
+								$values['base'] = null;
+								$values['owner'] = $line[3];
+								$values['date_first_reg'] = '';
+						$values['cancel'] = '';
 					}
 					if ($values['cancel'] == '' && $values['registration'] != null) {
 						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
@@ -535,20 +535,20 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		$query = 'ALTER TABLE airport DROP INDEX icaoidx';
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$query_dest = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image_thumb`,`image`)
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
@@ -614,10 +614,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 
 		if ($globalDebug) echo "Insert Not available Airport...\n";
@@ -627,10 +627,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 		$i++;
 /*
 		$query = 'DELETE FROM airport WHERE airport_id IN (SELECT * FROM (SELECT min(a.airport_id) FROM airport a GROUP BY a.icao) x)';
@@ -744,7 +744,7 @@ 
 
 
 
-                return "success";
+				return "success";
 	}
 	
 	public static function translation() {
@@ -760,10 +760,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'translation.csv'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'translation.csv'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -782,21 +782,21 @@ 
 					$data = $row;
 					$operator = $data[2];
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
-                                                //echo substr($operator, 0, 2)."\n";;
-                                                if (count($airline_array) > 0) {
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2));
+												//echo substr($operator, 0, 2)."\n";;
+												if (count($airline_array) > 0) {
 							//print_r($airline_array);
 							$operator = $airline_array[0]['icao'].substr($operator,2);
-                                                }
-                                        }
+												}
+										}
 					
 					$operator_correct = $data[3];
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
-                                                $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
-                                                if (count($airline_array) > 0) {
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
-                                            	}
-                                        }
+												$airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
+												if (count($airline_array) > 0) {
+													$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
+												}
+										}
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -810,7 +810,7 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function translation_fam() {
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -820,10 +820,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute(array(':source' => 'website_fam'));
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute(array(':source' => 'website_fam'));
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -852,54 +852,54 @@ 
 			//$Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	/**
-        * Convert a HTML table to an array
-        * @param String $data HTML page
-        * @return Array array of the tables in HTML page
-        */
-        private static function table2array($data) {
-                $html = str_get_html($data);
-                $tabledata=array();
-                foreach($html->find('tr') as $element)
-                {
-                        $td = array();
-                        foreach( $element->find('th') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                        }
-                        $td=array_filter($td);
-                        $tabledata[] = $td;
-
-                        $td = array();
-                        $tdi = array();
-                        foreach( $element->find('td') as $row)
-                        {
-                                $td [] = trim($row->plaintext);
-                                $tdi [] = trim($row->innertext);
-                        }
-                        $td=array_filter($td);
-                        $tdi=array_filter($tdi);
-                    //    $tabledata[]=array_merge($td,$tdi);
-                        $tabledata[]=$td;
-                }
-                return(array_filter($tabledata));
-        }
-
-       /**
-        * Get data from form result
-        * @param String $url form URL
-        * @return String the result
-        */
-        private static function getData($url) {
-                $ch = curl_init();
-                curl_setopt($ch, CURLOPT_URL, $url);
-                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-                curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
-                return curl_exec($ch);
-        }
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
+		private static function table2array($data) {
+				$html = str_get_html($data);
+				$tabledata=array();
+				foreach($html->find('tr') as $element)
+				{
+						$td = array();
+						foreach( $element->find('th') as $row)
+						{
+								$td [] = trim($row->plaintext);
+						}
+						$td=array_filter($td);
+						$tabledata[] = $td;
+
+						$td = array();
+						$tdi = array();
+						foreach( $element->find('td') as $row)
+						{
+								$td [] = trim($row->plaintext);
+								$tdi [] = trim($row->innertext);
+						}
+						$td=array_filter($td);
+						$tdi=array_filter($tdi);
+					//    $tabledata[]=array_merge($td,$tdi);
+						$tabledata[]=$td;
+				}
+				return(array_filter($tabledata));
+		}
+
+	   /**
+	    * Get data from form result
+	    * @param String $url form URL
+	    * @return String the result
+	    */
+		private static function getData($url) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+				curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
+				return curl_exec($ch);
+		}
 /*
 	public static function waypoints() {
 		$data = update_db::getData('http://www.fallingrain.com/world/FR/waypoints.html');
@@ -949,10 +949,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		
 		//update_db::unzip($out_file);
@@ -991,7 +991,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 
 	public static function ivao_airlines($filename) {
 		//require_once(dirname(__FILE__).'/../require/class.Spotter.php');
@@ -1000,10 +1000,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$header = NULL;
 		$delimiter = ':';
@@ -1027,7 +1027,7 @@ 
 			if ($globalTransaction) $Connection->db->commit();
 		}
 		return '';
-        }
+		}
 	
 	public static function update_airspace() {
 		global $tmp_dir, $globalDBdriver;
@@ -1053,10 +1053,10 @@ 
 			$query = 'DROP TABLE countries';
 			try {
 				$sth = $Connection->db->prepare($query);
-            	        	$sth->execute();
-	                } catch(PDOException $e) {
-    	                	echo "error : ".$e->getMessage();
-	                }
+							$sth->execute();
+					} catch(PDOException $e) {
+							echo "error : ".$e->getMessage();
+					}
 		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
@@ -1401,12 +1401,12 @@ 
 		echo $data;
 		*/
 		if (file_exists($tmp_dir.'aircrafts.html')) {
-		    var_dump(file_get_html($tmp_dir.'aircrafts.html'));
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
-		    $result = fread($fh,100000000);
-		    //echo $result;
-		    var_dump(str_get_html($result));
-		    //print_r(self::table2array($result));
+			var_dump(file_get_html($tmp_dir.'aircrafts.html'));
+			$fh = fopen($tmp_dir.'aircrafts.html',"r");
+			$result = fread($fh,100000000);
+			//echo $result;
+			var_dump(str_get_html($result));
+			//print_r(self::table2array($result));
 		}
 
 	}
@@ -1420,10 +1420,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 
 		$error = '';
 		if ($globalDebug) echo "Notam : Download...";
@@ -1479,8 +1479,8 @@ 
 					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
 					$data['permanent'] = 0;
 				} else {
-				    $data['date_end'] = NULL;
-				    $data['permanent'] = 1;
+					$data['date_end'] = NULL;
+					$data['permanent'] = 1;
 				}
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
 				$NOTAM = new NOTAM();
@@ -1504,13 +1504,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_update() {
@@ -1519,10 +1519,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_notam_update() {
@@ -1535,13 +1535,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_notam_update() {
@@ -1550,10 +1550,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 
 	public static function check_last_owner_update() {
@@ -1566,13 +1566,13 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
 	}
 
 	public static function insert_last_owner_update() {
@@ -1581,10 +1581,10 @@ 
 		try {
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
 	}
 	
 	public static function update_all() {