Inspection of "Airspace is only installed via update_db.php" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3d0574...048ff1 )

by Yannick

created 2017-09-22 19:02 UTC

Status

Braces +78 added lines, -28 removed lines patch added patch discarded remove patch

@@ -75,7 +75,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']);
@@ -93,7 +95,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';
@@ -107,7 +111,9 @@  discard block
 block discarded – undo
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
+		if (!isset($_SESSION['next'])) {
+			$_SESSION['next'] = '';
+		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -115,7 +121,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']);
@@ -128,8 +136,10 @@  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']);
@@ -154,7 +164,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';
@@ -186,7 +198,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']);
@@ -207,18 +221,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';
@@ -243,7 +265,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']);
@@ -263,7 +287,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';
@@ -296,7 +322,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']);
@@ -317,12 +345,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';
@@ -370,7 +402,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']);
@@ -381,15 +415,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';
@@ -410,33 +450,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.

		@@ -75,7 +75,9 @@ discard block
		block discarded – undo
75	75	if ($error != '') {
76	76	$_SESSION['error'] = $error;
77	77	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
78		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
	78	+ } else {
	79	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
	80	+ }
79	81	$_SESSION['install'] = 'database_import';
80	82	$_SESSION['next'] = 'Create and import tables';
81	83	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -93,7 +95,9 @@ discard block
		block discarded – undo
93	95	if ($error != '') {
94	96	$_SESSION['error'] = $error;
95	97	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
96		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
	98	+ } else {
	99	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
	100	+ }
97	101	if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
98	102	$_SESSION['install'] = 'populate';
99	103	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
		@@ -107,7 +111,9 @@ discard block
		block discarded – undo
107	111	$error .= $check_version;
108	112	$_SESSION['error'] = $error;
109	113	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
110		- if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
	114	+ if (!isset($_SESSION['next'])) {
	115	+ $_SESSION['next'] = '';
	116	+ }
111	117	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
112	118	print json_encode($result);
113	119	} else {
		@@ -115,7 +121,9 @@ discard block
		block discarded – undo
115	121	if ($error != '') {
116	122	$_SESSION['error'] = $error;
117	123	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
118		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
	124	+ } else {
	125	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
	126	+ }
119	127	$_SESSION['install'] = 'sources';
120	128	$_SESSION['next'] = 'Insert data in source table';
121	129	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -128,8 +136,10 @@ discard block
		block discarded – undo
128	136	if ($error != '') {
129	137	$_SESSION['error'] = $error;
130	138	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
131		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
132		-/*
	139	+ } else {
	140	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
	141	+ }
	142	+ /*
133	143	$_SESSION['install'] = 'airspace';
134	144	$_SESSION['next'] = 'Populate airspace table';
135	145	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -154,7 +164,9 @@ discard block
		block discarded – undo
154	164	if ($error != '') {
155	165	$_SESSION['error'] = $error;
156	166	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
157		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
	167	+ } else {
	168	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
	169	+ }
158	170	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
159	171	$_SESSION['install'] = 'notam';
160	172	$_SESSION['next'] = 'Populate NOTAM table with externals data';
		@@ -186,7 +198,9 @@ discard block
		block discarded – undo
186	198	if ($error != '') {
187	199	$_SESSION['error'] = $error;
188	200	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
189		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	201	+ } else {
	202	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	203	+ }
190	204	$_SESSION['install'] = 'populate_flarm';
191	205	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
192	206	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -207,18 +221,26 @@ discard block
		block discarded – undo
207	221	if ($error != '') {
208	222	$_SESSION['error'] = $error;
209	223	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
210		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	224	+ } else {
	225	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	226	+ }
211	227	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
212	228	$_SESSION['install'] = 'vatsim';
213		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
214		- else $_SESSION['next'] = 'Insert VATSIM data';
	229	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	230	+ $_SESSION['next'] = 'Insert IVAO data';
	231	+ } else {
	232	+ $_SESSION['next'] = 'Insert VATSIM data';
	233	+ }
215	234	} elseif (isset($globalVATSIM) && $globalVATSIM) {
216	235	$_SESSION['install'] = 'vatsim';
217	236	$_SESSION['next'] = 'Insert VATSIM data';
218	237	} elseif (isset($globalIVAO) && $globalIVAO) {
219	238	$_SESSION['install'] = 'vatsim';
220		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
221		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	239	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	240	+ $_SESSION['next'] = 'Insert IVAO data';
	241	+ } else {
	242	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	243	+ }
222	244	} elseif (isset($globalphpVMS) && $globalphpVMS) {
223	245	$_SESSION['install'] = 'vatsim';
224	246	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -243,7 +265,9 @@ discard block
		block discarded – undo
243	265	if ($error != '') {
244	266	$_SESSION['error'] = $error;
245	267	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
246		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	268	+ } else {
	269	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	270	+ }
247	271	$_SESSION['install'] = 'translation';
248	272	$_SESSION['next'] = 'Populate translation table with externals data';
249	273	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -263,7 +287,9 @@ discard block
		block discarded – undo
263	287	if ($error != '') {
264	288	$_SESSION['error'] = $error;
265	289	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
266		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	290	+ } else {
	291	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	292	+ }
267	293	if ($_SESSION['waypoints'] == 1) {
268	294	$_SESSION['install'] = 'waypoints';
269	295	$_SESSION['next'] = 'Populate waypoints table';
		@@ -296,7 +322,9 @@ discard block
		block discarded – undo
296	322	if ($error != '') {
297	323	$_SESSION['error'] = $error;
298	324	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
299		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	325	+ } else {
	326	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	327	+ }
300	328	$_SESSION['install'] = 'sources';
301	329	$_SESSION['next'] = 'Insert data in source table';
302	330	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -317,12 +345,16 @@ discard block
		block discarded – undo
317	345	if ($error != '') {
318	346	$_SESSION['error'] = $error;
319	347	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
320		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	348	+ } else {
	349	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	350	+ }
321	351	} else {
322	352	if ($error != '') {
323	353	$_SESSION['error'] = $error;
324	354	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
325		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	355	+ } else {
	356	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	357	+ }
326	358	}
327	359	if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
328	360	$_SESSION['install'] = 'owner';
		@@ -370,7 +402,9 @@ discard block
		block discarded – undo
370	402	$Source = new Source();
371	403	$Source->deleteAllLocation();
372	404	foreach ($sources as $src) {
373		- if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	405	+ if (isset($src['latitude']) && $src['latitude'] != '') {
	406	+ $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	407	+ }
374	408	}
375	409	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
376	410	unset($_SESSION['sources']);
		@@ -381,15 +415,21 @@ discard block
		block discarded – undo
381	415	*/
382	416	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
383	417	$_SESSION['install'] = 'vatsim';
384		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
385		- else $_SESSION['next'] = 'Insert VATSIM data';
	418	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	419	+ $_SESSION['next'] = 'Insert IVAO data';
	420	+ } else {
	421	+ $_SESSION['next'] = 'Insert VATSIM data';
	422	+ }
386	423	} elseif (isset($globalVATSIM) && $globalVATSIM) {
387	424	$_SESSION['install'] = 'vatsim';
388	425	$_SESSION['next'] = 'Insert VATSIM data';
389	426	} elseif (isset($globalIVAO) && $globalIVAO) {
390	427	$_SESSION['install'] = 'vatsim';
391		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
392		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	428	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	429	+ $_SESSION['next'] = 'Insert IVAO data';
	430	+ } else {
	431	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	432	+ }
393	433	} elseif (isset($globalphpVMS) && $globalphpVMS) {
394	434	$_SESSION['install'] = 'vatsim';
395	435	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -410,33 +450,43 @@ discard block
		block discarded – undo
410	450	if ($error != '') {
411	451	$_SESSION['error'] = $error;
412	452	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
413		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	453	+ } else {
	454	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	455	+ }
414	456	} else {
415	457	$error .= update_db::update_vatsim();
416	458	if ($error != '') {
417	459	$_SESSION['error'] = $error;
418	460	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
419		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	461	+ } else {
	462	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	463	+ }
420	464	}
421	465	} elseif (isset($globalVATSIM) && $globalVATSIM) {
422	466	$error .= update_db::update_vatsim();
423	467	if ($error != '') {
424	468	$_SESSION['error'] = $error;
425	469	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
426		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	470	+ } else {
	471	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	472	+ }
427	473	} elseif (isset($globalIVAO) && $globalIVAO) {
428	474	if (file_exists('tmp/ivae_feb2013.zip')) {
429	475	$error .= update_db::update_IVAO();
430	476	if ($error != '') {
431	477	$_SESSION['error'] = $error;
432	478	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
433		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	479	+ } else {
	480	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	481	+ }
434	482	} else {
435	483	$error .= update_db::update_vatsim();
436	484	if ($error != '') {
437	485	$_SESSION['error'] = $error;
438	486	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
439		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	487	+ } else {
	488	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	489	+ }
440	490	}
441	491	} elseif (isset($globalphpVMS) && $globalphpVMS) {
442	492	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

Ysurac / FlightAirMap

Push — master ( 3d0574...048ff1 )

Status

Category

Braces +78 added lines, -28 removed lines patch added patch discarded remove patch