Inspection of "fix" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 39e860...0f5d36 )

by Yannick

created 2017-02-12 08:19 UTC

Status

Spacing +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -68,15 +68,15 @@  discard block
 block discarded – undo
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
 	$dbroot = $_SESSION['database_root'];
 	$dbrootpass = $_SESSION['database_rootpass'];
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
 	sleep(5);
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 	}
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	if (update_schema::check_version(false) == '0') {
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 		if ($error != '') {
                         $_SESSION['error'] = $error;
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		$_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';
@@ -96,84 +96,84 @@  discard block
 block discarded – undo
 		    $_SESSION['install'] = 'sources';
 		    $_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$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['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_waypoints();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
 
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_airspace_fam();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_countries();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	$_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']);
+	    $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']);
+	    $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']);
+	    $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.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_ModeS_fam();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
 
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$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_flarm') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		//$error .= update_db::update_ModeS_flarm();
 		$error .= update_db::update_ModeS_ogn();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
@@ -193,34 +193,34 @@  discard block
 block discarded – undo
 			$_SESSION['install'] = 'routes';
 			$_SESSION['next'] = 'Populate routes table with externals data';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_routes();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_translation();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
 
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
@@ -237,48 +237,48 @@  discard block
 block discarded – undo
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error = update_db::update_owner_fam();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		if (isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 			$error .= update_db::update_notam();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
 		} else {
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
 		}
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 			$_SESSION['install'] = 'owner';
 			$_SESSION['next'] = 'Populate owner table';
 			unset($_SESSION['owner']);
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$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']);
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		}
 	}
@@ -316,9 +316,9 @@  discard block
 block discarded – undo
 	    $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');
+		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'));
+	    $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
 	    unset($_SESSION['sources']);
 	}
 	/*
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
 		$_SESSION['install'] = 'finish';
 		$_SESSION['next'] = 'finish';
 	}
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
 	include_once('../install/class.create_db.php');
@@ -353,36 +353,36 @@  discard block
 block discarded – undo
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
 	}
 	//$_SESSION['install'] = 'routes';
 	//$_SESSION['next'] = 'Populate routes table with externals data';
 	$_SESSION['install'] = 'finish';
 	$_SESSION['next'] = 'finish';
 
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else {
 	//unset($_SESSION['install']);
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
 	print json_encode($result);
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -68,15 +68,15 @@ discard block
		block discarded – undo
68	68	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
69	69	$dbroot = $_SESSION['database_root'];
70	70	$dbrootpass = $_SESSION['database_rootpass'];
71		- $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
	71	+ $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
72	72	sleep(5);
73	73	if ($error != '') {
74	74	$_SESSION['error'] = $error;
75	75	}
76		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
	76	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
77	77	$_SESSION['install'] = 'database_import';
78	78	$_SESSION['next'] = 'Create and import tables';
79		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	79	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
80	80	print json_encode($result);
81	81	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
82	82	if (update_schema::check_version(false) == '0') {
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	if ($error != '') {
89	89	$_SESSION['error'] = $error;
90	90	}
91		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
	91	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
92	92	if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
93	93	$_SESSION['install'] = 'populate';
94	94	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
		@@ -96,84 +96,84 @@ discard block
		block discarded – undo
96	96	$_SESSION['install'] = 'sources';
97	97	$_SESSION['next'] = 'Insert data in source table';
98	98	}
99		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	99	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
100	100	print json_encode($result);
101	101	} else {
102	102	$error .= update_schema::check_version(true);
103	103	if ($error != '') {
104	104	$_SESSION['error'] = $error;
105	105	}
106		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
	106	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
107	107	$_SESSION['install'] = 'sources';
108	108	$_SESSION['next'] = 'Insert data in source table';
109		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	109	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
110	110	print json_encode($result);
111	111	}
112	112	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
113	113	include_once('class.update_db.php');
114	114	$error .= update_db::update_waypoints();
115		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
	115	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
116	116
117	117	$_SESSION['install'] = 'airspace';
118	118	$_SESSION['next'] = 'Populate airspace table';
119		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	119	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
120	120	print json_encode($result);
121	121	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
122	122	include_once('class.update_db.php');
123	123	$error .= update_db::update_airspace_fam();
124		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
	124	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
125	125	$_SESSION['install'] = 'countries';
126	126	$_SESSION['next'] = 'Populate countries table';
127		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	127	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
128	128	print json_encode($result);
129	129	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
130	130	include_once('class.update_db.php');
131	131	$error .= update_db::update_countries();
132		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
	132	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
133	133	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
134	134	$_SESSION['install'] = 'notam';
135	135	$_SESSION['next'] = 'Populate NOTAM table with externals data';
136		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	136	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
137	137	print json_encode($result);
138	138	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
139	139	$_SESSION['install'] = 'owner';
140	140	$_SESSION['next'] = 'Populate owner table with externals data';
141	141	unset($_SESSION['owner']);
142		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	142	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
143	143	print json_encode($result);
144	144	} else {
145	145	$_SESSION['install'] = 'sources';
146	146	$_SESSION['next'] = 'Insert data in source table';
147		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	147	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
148	148	print json_encode($result);
149	149	}
150	150	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
151	151	if (!is_writable('tmp')) {
152	152	$error = 'The directory <i>install/tmp</i> must be writable.';
153		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	153	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
154	154	print json_encode($result);
155	155	} else {
156	156	include_once('class.update_db.php');
157	157	$globalDebug = FALSE;
158	158	$error .= update_db::update_ModeS_fam();
159		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	159	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
160	160
161	161	$_SESSION['install'] = 'populate_flarm';
162	162	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
163		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	163	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
164	164	print json_encode($result);
165	165	}
166	166	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
167	167	if (!is_writable('tmp')) {
168	168	$error = 'The directory <i>install/tmp</i> must be writable.';
169		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	169	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
170	170	print json_encode($result);
171	171	} else {
172	172	include_once('class.update_db.php');
173	173	$globalDebug = FALSE;
174	174	//$error .= update_db::update_ModeS_flarm();
175	175	$error .= update_db::update_ModeS_ogn();
176		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	176	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
177	177
178	178	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
179	179	$_SESSION['install'] = 'vatsim';
		@@ -193,34 +193,34 @@ discard block
		block discarded – undo
193	193	$_SESSION['install'] = 'routes';
194	194	$_SESSION['next'] = 'Populate routes table with externals data';
195	195	}
196		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	196	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
197	197	print json_encode($result);
198	198	}
199	199	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
200	200	if (!is_writable('tmp')) {
201	201	$error = 'The directory <i>install/tmp</i> must be writable.';
202		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	202	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
203	203	print json_encode($result);
204	204	} else {
205	205	include_once('class.update_db.php');
206	206	$globalDebug = FALSE;
207	207	$error .= update_db::update_routes();
208		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	208	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
209	209	$_SESSION['install'] = 'translation';
210	210	$_SESSION['next'] = 'Populate translation table with externals data';
211		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	211	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
212	212	print json_encode($result);
213	213	}
214	214	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
215	215	if (!is_writable('tmp')) {
216	216	$error = 'The directory <i>install/tmp</i> must be writable.';
217		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	217	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
218	218	print json_encode($result);
219	219	} else {
220	220	include_once('class.update_db.php');
221	221	$globalDebug = FALSE;
222	222	$error .= update_db::update_translation();
223		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	223	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
224	224
225	225	if ($_SESSION['waypoints'] == 1) {
226	226	$_SESSION['install'] = 'waypoints';
		@@ -237,48 +237,48 @@ discard block
		block discarded – undo
237	237	$_SESSION['install'] = 'sources';
238	238	$_SESSION['next'] = 'Insert data in source table';
239	239	}
240		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	240	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
241	241	print json_encode($result);
242	242	}
243	243	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
244	244	if (!is_writable('tmp')) {
245	245	$error = 'The directory <i>install/tmp</i> must be writable.';
246		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	246	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
247	247	print json_encode($result);
248	248	} else {
249	249	include_once('class.update_db.php');
250	250	$globalDebug = FALSE;
251	251	$error = update_db::update_owner_fam();
252		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	252	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
253	253	$_SESSION['install'] = 'sources';
254	254	$_SESSION['next'] = 'Insert data in source table';
255		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	255	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
256	256	print json_encode($result);
257	257	}
258	258	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
259	259	if (!is_writable('tmp')) {
260	260	$error = 'The directory <i>install/tmp</i> must be writable.';
261		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	261	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
262	262	print json_encode($result);
263	263	} else {
264	264	include_once('class.update_db.php');
265	265	$globalDebug = FALSE;
266	266	if (isset($globalNOTAMSource) && $globalNOTAMSource != '') {
267	267	$error .= update_db::update_notam();
268		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	268	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
269	269	} else {
270		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	270	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
271	271	}
272	272	if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
273	273	$_SESSION['install'] = 'owner';
274	274	$_SESSION['next'] = 'Populate owner table';
275	275	unset($_SESSION['owner']);
276		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	276	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
277	277	print json_encode($result);
278	278	} else {
279	279	$_SESSION['install'] = 'sources';
280	280	$_SESSION['next'] = 'Insert data in source table';
281		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	281	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
282	282	print json_encode($result);
283	283	}
284	284	}
		@@ -316,9 +316,9 @@ discard block
		block discarded – undo
316	316	$Source = new Source();
317	317	$Source->deleteAllLocation();
318	318	foreach ($sources as $src) {
319		- if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	319	+ if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
320	320	}
321		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
	321	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
322	322	unset($_SESSION['sources']);
323	323	}
324	324	/*
		@@ -343,7 +343,7 @@ discard block
		block discarded – undo
343	343	$_SESSION['install'] = 'finish';
344	344	$_SESSION['next'] = 'finish';
345	345	}
346		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	346	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
347	347	print json_encode($result);
348	348	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
349	349	include_once('../install/class.create_db.php');
		@@ -353,36 +353,36 @@ discard block
		block discarded – undo
353	353	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
354	354	if (file_exists('tmp/ivae_feb2013.zip')) {
355	355	$error .= update_db::update_IVAO();
356		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	356	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
357	357	} else {
358	358	$error .= update_db::update_vatsim();
359		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	359	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
360	360	}
361	361	} elseif (isset($globalVATSIM) && $globalVATSIM) {
362	362	$error .= update_db::update_vatsim();
363		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	363	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
364	364	} elseif (isset($globalIVAO) && $globalIVAO) {
365	365	if (file_exists('tmp/ivae_feb2013.zip')) {
366	366	$error .= update_db::update_IVAO();
367		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	367	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
368	368	} else {
369	369	$error .= update_db::update_vatsim();
370		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	370	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
371	371	}
372	372	} elseif (isset($globalphpVMS) && $globalphpVMS) {
373		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
	373	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
374	374	}
375	375	//$_SESSION['install'] = 'routes';
376	376	//$_SESSION['next'] = 'Populate routes table with externals data';
377	377	$_SESSION['install'] = 'finish';
378	378	$_SESSION['next'] = 'finish';
379	379
380		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	380	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
381	381	print json_encode($result);
382	382	} else {
383	383	//unset($_SESSION['install']);
384	384	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
385		- $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
	385	+ $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
386	386	print json_encode($result);
387	387	}
388	388	?>
389	389	\ No newline at end of file

Ysurac / FlightAirMap

Push — master ( 39e860...0f5d36 )

Status

Category

Spacing +46 added lines, -46 removed lines patch added patch discarded remove patch