Inspection of "Install modeS data when needed" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( b7b4dc...cb13e2 )

by Yannick

created 2017-12-19 08:54 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,'errorlst' => $_SESSION['errorlst'],'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 ((!isset($globalAircraft) || $globalAircraft === TRUE) && (!isset($globalVA) || $globalVA === FALSE)) {
 			$_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';
@@ -188,7 +200,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']);
@@ -209,18 +223,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';
@@ -245,7 +267,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']);
@@ -265,7 +289,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';
@@ -300,7 +326,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']);
@@ -321,12 +349,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) {
@@ -376,7 +408,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']);
@@ -387,15 +421,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';
@@ -416,33 +456,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,'errorlst' => $_SESSION['errorlst'],'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 ((!isset($globalAircraft) \|\| $globalAircraft === TRUE) && (!isset($globalVA) \|\| $globalVA === FALSE)) {
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';
		@@ -188,7 +200,9 @@ discard block
		block discarded – undo
188	200	if ($error != '') {
189	201	$_SESSION['error'] = $error;
190	202	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
191		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	203	+ } else {
	204	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	205	+ }
192	206	$_SESSION['install'] = 'populate_flarm';
193	207	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
194	208	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -209,18 +223,26 @@ discard block
		block discarded – undo
209	223	if ($error != '') {
210	224	$_SESSION['error'] = $error;
211	225	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
212		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	226	+ } else {
	227	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	228	+ }
213	229	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
214	230	$_SESSION['install'] = 'vatsim';
215		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
216		- else $_SESSION['next'] = 'Insert VATSIM data';
	231	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	232	+ $_SESSION['next'] = 'Insert IVAO data';
	233	+ } else {
	234	+ $_SESSION['next'] = 'Insert VATSIM data';
	235	+ }
217	236	} elseif (isset($globalVATSIM) && $globalVATSIM) {
218	237	$_SESSION['install'] = 'vatsim';
219	238	$_SESSION['next'] = 'Insert VATSIM data';
220	239	} elseif (isset($globalIVAO) && $globalIVAO) {
221	240	$_SESSION['install'] = 'vatsim';
222		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
223		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	241	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	242	+ $_SESSION['next'] = 'Insert IVAO data';
	243	+ } else {
	244	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	245	+ }
224	246	} elseif (isset($globalphpVMS) && $globalphpVMS) {
225	247	$_SESSION['install'] = 'vatsim';
226	248	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -245,7 +267,9 @@ discard block
		block discarded – undo
245	267	if ($error != '') {
246	268	$_SESSION['error'] = $error;
247	269	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
248		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	270	+ } else {
	271	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	272	+ }
249	273	$_SESSION['install'] = 'translation';
250	274	$_SESSION['next'] = 'Populate translation table with externals data';
251	275	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -265,7 +289,9 @@ discard block
		block discarded – undo
265	289	if ($error != '') {
266	290	$_SESSION['error'] = $error;
267	291	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
268		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	292	+ } else {
	293	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	294	+ }
269	295	if ($_SESSION['waypoints'] == 1) {
270	296	$_SESSION['install'] = 'waypoints';
271	297	$_SESSION['next'] = 'Populate waypoints table';
		@@ -300,7 +326,9 @@ discard block
		block discarded – undo
300	326	if ($error != '') {
301	327	$_SESSION['error'] = $error;
302	328	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
303		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	329	+ } else {
	330	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	331	+ }
304	332	$_SESSION['install'] = 'sources';
305	333	$_SESSION['next'] = 'Insert data in source table';
306	334	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
		@@ -321,12 +349,16 @@ discard block
		block discarded – undo
321	349	if ($error != '') {
322	350	$_SESSION['error'] = $error;
323	351	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
324		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	352	+ } else {
	353	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	354	+ }
325	355	} else {
326	356	if ($error != '') {
327	357	$_SESSION['error'] = $error;
328	358	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
329		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	359	+ } else {
	360	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	361	+ }
330	362	}
331	363	/*
332	364	if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
		@@ -376,7 +408,9 @@ discard block
		block discarded – undo
376	408	$Source = new Source();
377	409	$Source->deleteAllLocation();
378	410	foreach ($sources as $src) {
379		- if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	411	+ if (isset($src['latitude']) && $src['latitude'] != '') {
	412	+ $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	413	+ }
380	414	}
381	415	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
382	416	unset($_SESSION['sources']);
		@@ -387,15 +421,21 @@ discard block
		block discarded – undo
387	421	*/
388	422	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
389	423	$_SESSION['install'] = 'vatsim';
390		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
391		- else $_SESSION['next'] = 'Insert VATSIM data';
	424	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	425	+ $_SESSION['next'] = 'Insert IVAO data';
	426	+ } else {
	427	+ $_SESSION['next'] = 'Insert VATSIM data';
	428	+ }
392	429	} elseif (isset($globalVATSIM) && $globalVATSIM) {
393	430	$_SESSION['install'] = 'vatsim';
394	431	$_SESSION['next'] = 'Insert VATSIM data';
395	432	} elseif (isset($globalIVAO) && $globalIVAO) {
396	433	$_SESSION['install'] = 'vatsim';
397		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
398		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	434	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	435	+ $_SESSION['next'] = 'Insert IVAO data';
	436	+ } else {
	437	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	438	+ }
399	439	} elseif (isset($globalphpVMS) && $globalphpVMS) {
400	440	$_SESSION['install'] = 'vatsim';
401	441	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -416,33 +456,43 @@ discard block
		block discarded – undo
416	456	if ($error != '') {
417	457	$_SESSION['error'] = $error;
418	458	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
419		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	459	+ } else {
	460	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	461	+ }
420	462	} else {
421	463	$error .= update_db::update_vatsim();
422	464	if ($error != '') {
423	465	$_SESSION['error'] = $error;
424	466	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
425		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	467	+ } else {
	468	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	469	+ }
426	470	}
427	471	} elseif (isset($globalVATSIM) && $globalVATSIM) {
428	472	$error .= update_db::update_vatsim();
429	473	if ($error != '') {
430	474	$_SESSION['error'] = $error;
431	475	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
432		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	476	+ } else {
	477	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	478	+ }
433	479	} elseif (isset($globalIVAO) && $globalIVAO) {
434	480	if (file_exists('tmp/ivae_feb2013.zip')) {
435	481	$error .= update_db::update_IVAO();
436	482	if ($error != '') {
437	483	$_SESSION['error'] = $error;
438	484	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
439		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	485	+ } else {
	486	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	487	+ }
440	488	} else {
441	489	$error .= update_db::update_vatsim();
442	490	if ($error != '') {
443	491	$_SESSION['error'] = $error;
444	492	$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
445		- } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	493	+ } else {
	494	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	495	+ }
446	496	}
447	497	} elseif (isset($globalphpVMS) && $globalphpVMS) {
448	498	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

Ysurac / FlightAirMap

Push — master ( b7b4dc...cb13e2 )

Status

Category

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