Inspection of "Show failed when there is an error" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 91e743...79154b )

by Yannick

created 2017-07-09 15:25 UTC

Status

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -82,9 +82,9 @@  discard block
 block discarded – undo
 } 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;
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
 			$_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,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
@@ -143,21 +143,21 @@  discard block
 block discarded – undo
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
 	} else $_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,'errorlst' => $_SESSION['errorlst'],'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,'errorlst' => $_SESSION['errorlst'],'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,'errorlst' => $_SESSION['errorlst'],'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,'errorlst' => $_SESSION['errorlst'],'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,'errorlst' => $_SESSION['errorlst'],'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,'errorlst' => $_SESSION['errorlst'],'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')) {

Please login to merge, or discard this patch.

Braces +77 added lines, -27 removed lines patch added patch discarded remove patch

@@ -74,7 +74,9 @@  discard block
 block discarded – undo
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	} else {
+		$_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']);
@@ -89,7 +91,9 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		} else {
+			$_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';
@@ -104,7 +108,9 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		} else {
+			$_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,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -117,7 +123,9 @@  discard block
 block discarded – undo
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	}
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -129,7 +137,9 @@  discard block
 block discarded – undo
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
+	}
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -141,7 +151,9 @@  discard block
 block discarded – undo
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	} else {
+		$_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';
@@ -173,7 +185,9 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else {
+			$_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,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -194,18 +208,26 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		} else {
+			$_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';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -230,7 +252,9 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		} else {
+			$_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,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -250,7 +274,9 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		}
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -283,7 +309,9 @@  discard block
 block discarded – undo
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		} else {
+			$_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,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -304,12 +332,16 @@  discard block
 block discarded – undo
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_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'));
+			}
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			} else {
+				$_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';
@@ -357,7 +389,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'));
 		unset($_SESSION['sources']);
@@ -368,15 +402,21 @@  discard block
 block discarded – undo
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';
@@ -397,33 +437,43 @@  discard block
 block discarded – undo
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			}
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		} else {
+			$_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();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			} else {
+				$_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'));

Please login to merge, or discard this patch.

		@@ -82,9 +82,9 @@ discard block
		block discarded – undo
82	82	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
83	83	if (update_schema::check_version(false) == '0') {
84	84	if ($globalDBdriver == 'mysql') {
85		- $error .= create_db::import_all_db('../db/');
	85	+ $error .= create_db::import_all_db('../db/');
86	86	} elseif ($globalDBdriver == 'pgsql') {
87		- $error .= create_db::import_all_db('../db/pgsql/');
	87	+ $error .= create_db::import_all_db('../db/pgsql/');
88	88	}
89	89	if ($error != '') {
90	90	$_SESSION['error'] = $error;
		@@ -94,8 +94,8 @@ discard block
		block discarded – undo
94	94	$_SESSION['install'] = 'populate';
95	95	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
96	96	} else {
97		- $_SESSION['install'] = 'sources';
98		- $_SESSION['next'] = 'Insert data in source table';
	97	+ $_SESSION['install'] = 'sources';
	98	+ $_SESSION['next'] = 'Insert data in source table';
99	99	}
100	100	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
101	101	print json_encode($result);
		@@ -143,21 +143,21 @@ discard block
		block discarded – undo
143	143	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
144	144	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
145	145	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
146		- $_SESSION['install'] = 'notam';
147		- $_SESSION['next'] = 'Populate NOTAM table with externals data';
148		- $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
149		- print json_encode($result);
	146	+ $_SESSION['install'] = 'notam';
	147	+ $_SESSION['next'] = 'Populate NOTAM table with externals data';
	148	+ $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	149	+ print json_encode($result);
150	150	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
151		- $_SESSION['install'] = 'owner';
152		- $_SESSION['next'] = 'Populate owner table with externals data';
153		- unset($_SESSION['owner']);
154		- $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
155		- print json_encode($result);
	151	+ $_SESSION['install'] = 'owner';
	152	+ $_SESSION['next'] = 'Populate owner table with externals data';
	153	+ unset($_SESSION['owner']);
	154	+ $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	155	+ print json_encode($result);
156	156	} else {
157		- $_SESSION['install'] = 'sources';
158		- $_SESSION['next'] = 'Insert data in source table';
159		- $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
160		- print json_encode($result);
	157	+ $_SESSION['install'] = 'sources';
	158	+ $_SESSION['next'] = 'Insert data in source table';
	159	+ $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	160	+ print json_encode($result);
161	161	}
162	162	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
163	163	if (!is_writable('tmp')) {

		@@ -74,7 +74,9 @@ discard block
		block discarded – undo
74	74	if ($error != '') {
75	75	$_SESSION['error'] = $error;
76	76	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
77		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
	77	+ } else {
	78	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
	79	+ }
78	80	$_SESSION['install'] = 'database_import';
79	81	$_SESSION['next'] = 'Create and import tables';
80	82	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -89,7 +91,9 @@ discard block
		block discarded – undo
89	91	if ($error != '') {
90	92	$_SESSION['error'] = $error;
91	93	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
92		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
	94	+ } else {
	95	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
	96	+ }
93	97	if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
94	98	$_SESSION['install'] = 'populate';
95	99	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
		@@ -104,7 +108,9 @@ discard block
		block discarded – undo
104	108	if ($error != '') {
105	109	$_SESSION['error'] = $error;
106	110	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
107		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
	111	+ } else {
	112	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
	113	+ }
108	114	$_SESSION['install'] = 'sources';
109	115	$_SESSION['next'] = 'Insert data in source table';
110	116	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -117,7 +123,9 @@ discard block
		block discarded – undo
117	123	if ($error != '') {
118	124	$_SESSION['error'] = $error;
119	125	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
120		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
	126	+ } else {
	127	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
	128	+ }
121	129	$_SESSION['install'] = 'airspace';
122	130	$_SESSION['next'] = 'Populate airspace table';
123	131	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -129,7 +137,9 @@ discard block
		block discarded – undo
129	137	if ($error != '') {
130	138	$_SESSION['error'] = $error;
131	139	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database'));
132		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
	140	+ } else {
	141	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
	142	+ }
133	143	$_SESSION['install'] = 'countries';
134	144	$_SESSION['next'] = 'Populate countries table';
135	145	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -141,7 +151,9 @@ discard block
		block discarded – undo
141	151	if ($error != '') {
142	152	$_SESSION['error'] = $error;
143	153	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
144		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
	154	+ } else {
	155	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
	156	+ }
145	157	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
146	158	$_SESSION['install'] = 'notam';
147	159	$_SESSION['next'] = 'Populate NOTAM table with externals data';
		@@ -173,7 +185,9 @@ discard block
		block discarded – undo
173	185	if ($error != '') {
174	186	$_SESSION['error'] = $error;
175	187	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
176		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	188	+ } else {
	189	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	190	+ }
177	191	$_SESSION['install'] = 'populate_flarm';
178	192	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
179	193	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -194,18 +208,26 @@ discard block
		block discarded – undo
194	208	if ($error != '') {
195	209	$_SESSION['error'] = $error;
196	210	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
197		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	211	+ } else {
	212	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	213	+ }
198	214	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
199	215	$_SESSION['install'] = 'vatsim';
200		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
201		- else $_SESSION['next'] = 'Insert VATSIM data';
	216	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	217	+ $_SESSION['next'] = 'Insert IVAO data';
	218	+ } else {
	219	+ $_SESSION['next'] = 'Insert VATSIM data';
	220	+ }
202	221	} elseif (isset($globalVATSIM) && $globalVATSIM) {
203	222	$_SESSION['install'] = 'vatsim';
204	223	$_SESSION['next'] = 'Insert VATSIM data';
205	224	} elseif (isset($globalIVAO) && $globalIVAO) {
206	225	$_SESSION['install'] = 'vatsim';
207		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
208		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	226	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	227	+ $_SESSION['next'] = 'Insert IVAO data';
	228	+ } else {
	229	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	230	+ }
209	231	} elseif (isset($globalphpVMS) && $globalphpVMS) {
210	232	$_SESSION['install'] = 'vatsim';
211	233	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -230,7 +252,9 @@ discard block
		block discarded – undo
230	252	if ($error != '') {
231	253	$_SESSION['error'] = $error;
232	254	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
233		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	255	+ } else {
	256	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	257	+ }
234	258	$_SESSION['install'] = 'translation';
235	259	$_SESSION['next'] = 'Populate translation table with externals data';
236	260	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -250,7 +274,9 @@ discard block
		block discarded – undo
250	274	if ($error != '') {
251	275	$_SESSION['error'] = $error;
252	276	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
253		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	277	+ } else {
	278	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	279	+ }
254	280	if ($_SESSION['waypoints'] == 1) {
255	281	$_SESSION['install'] = 'waypoints';
256	282	$_SESSION['next'] = 'Populate waypoints table';
		@@ -283,7 +309,9 @@ discard block
		block discarded – undo
283	309	if ($error != '') {
284	310	$_SESSION['error'] = $error;
285	311	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
286		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	312	+ } else {
	313	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	314	+ }
287	315	$_SESSION['install'] = 'sources';
288	316	$_SESSION['next'] = 'Insert data in source table';
289	317	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -304,12 +332,16 @@ discard block
		block discarded – undo
304	332	if ($error != '') {
305	333	$_SESSION['error'] = $error;
306	334	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
307		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	335	+ } else {
	336	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	337	+ }
308	338	} else {
309	339	if ($error != '') {
310	340	$_SESSION['error'] = $error;
311	341	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
312		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	342	+ } else {
	343	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	344	+ }
313	345	}
314	346	if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
315	347	$_SESSION['install'] = 'owner';
		@@ -357,7 +389,9 @@ discard block
		block discarded – undo
357	389	$Source = new Source();
358	390	$Source->deleteAllLocation();
359	391	foreach ($sources as $src) {
360		- if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	392	+ if (isset($src['latitude']) && $src['latitude'] != '') {
	393	+ $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	394	+ }
361	395	}
362	396	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
363	397	unset($_SESSION['sources']);
		@@ -368,15 +402,21 @@ discard block
		block discarded – undo
368	402	*/
369	403	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
370	404	$_SESSION['install'] = 'vatsim';
371		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
372		- else $_SESSION['next'] = 'Insert VATSIM data';
	405	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	406	+ $_SESSION['next'] = 'Insert IVAO data';
	407	+ } else {
	408	+ $_SESSION['next'] = 'Insert VATSIM data';
	409	+ }
373	410	} elseif (isset($globalVATSIM) && $globalVATSIM) {
374	411	$_SESSION['install'] = 'vatsim';
375	412	$_SESSION['next'] = 'Insert VATSIM data';
376	413	} elseif (isset($globalIVAO) && $globalIVAO) {
377	414	$_SESSION['install'] = 'vatsim';
378		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
379		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	415	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	416	+ $_SESSION['next'] = 'Insert IVAO data';
	417	+ } else {
	418	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	419	+ }
380	420	} elseif (isset($globalphpVMS) && $globalphpVMS) {
381	421	$_SESSION['install'] = 'vatsim';
382	422	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -397,33 +437,43 @@ discard block
		block discarded – undo
397	437	if ($error != '') {
398	438	$_SESSION['error'] = $error;
399	439	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
400		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	440	+ } else {
	441	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	442	+ }
401	443	} else {
402	444	$error .= update_db::update_vatsim();
403	445	if ($error != '') {
404	446	$_SESSION['error'] = $error;
405	447	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
406		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	448	+ } else {
	449	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	450	+ }
407	451	}
408	452	} elseif (isset($globalVATSIM) && $globalVATSIM) {
409	453	$error .= update_db::update_vatsim();
410	454	if ($error != '') {
411	455	$_SESSION['error'] = $error;
412	456	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
413		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	457	+ } else {
	458	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	459	+ }
414	460	} elseif (isset($globalIVAO) && $globalIVAO) {
415	461	if (file_exists('tmp/ivae_feb2013.zip')) {
416	462	$error .= update_db::update_IVAO();
417	463	if ($error != '') {
418	464	$_SESSION['error'] = $error;
419	465	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
420		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	466	+ } else {
	467	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	468	+ }
421	469	} else {
422	470	$error .= update_db::update_vatsim();
423	471	if ($error != '') {
424	472	$_SESSION['error'] = $error;
425	473	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
426		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	474	+ } else {
	475	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	476	+ }
427	477	}
428	478	} elseif (isset($globalphpVMS) && $globalphpVMS) {
429	479	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

Ysurac / FlightAirMap

Push — master ( 91e743...79154b )

Status

Category

Indentation +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +77 added lines, -27 removed lines patch added patch discarded remove patch