View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 379791...d6d585 )
by Yannick
76:41 queued 52:22
created
Status
Category
Toggle Patches
install/install-action.php 1 patch
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch 
@@ -69,15 +69,15 @@  discard block
 
 block discarded – undo
69 69 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
70 70 
 	$dbroot = $_SESSION['database_root'];
71 71 
 	$dbrootpass = $_SESSION['database_rootpass'];
72 
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
72 
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
73 73 
 	sleep(5);
74 74 
 	if ($error != '') {
75 75 
 		$_SESSION['error'] = $error;
76 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
77 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
76 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database'));
77 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
78 78 
 	$_SESSION['install'] = 'database_import';
79 79 
 	$_SESSION['next'] = 'Create and import tables';
80 
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
80 
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
81 81 
 	print json_encode($result);
82 82 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
83 83 
 	$check_version = update_schema::check_version(false);
 
@@ -90,8 +90,8 @@  discard block
 
 block discarded – undo
90 90 
 		}
91 91 
 		if ($error != '') {
92 92 
 			$_SESSION['error'] = $error;
93 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
94 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
93 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
94 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
95 95 
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
96 96 
 			$_SESSION['install'] = 'populate';
97 97 
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 
@@ -99,21 +99,21 @@  discard block
 
 block discarded – undo
99 99 
 		    $_SESSION['install'] = 'sources';
100 100 
 		    $_SESSION['next'] = 'Insert data in source table';
101 101 
 		}
102 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
102 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
103 103 
 		print json_encode($result);
104 104 
 	} elseif (!is_numeric($check_version)) {
105 105 
 		$error .= $check_version;
106 106 
 		$_SESSION['error'] = $error;
107 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
107 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
108 108 
 	} else {
109 109 
 		$error .= update_schema::check_version(true);
110 110 
 		if ($error != '') {
111 111 
 			$_SESSION['error'] = $error;
112 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
113 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
112 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed'));
113 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
114 114 
 		$_SESSION['install'] = 'sources';
115 115 
 		$_SESSION['next'] = 'Insert data in source table';
116 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
116 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
117 117 
 		print json_encode($result);
118 118 
 	}
119 119 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
 
@@ -122,11 +122,11 @@  discard block
 
 block discarded – undo
122 122 
 	$error .= update_db::update_waypoints();
123 123 
 	if ($error != '') {
124 124 
 		$_SESSION['error'] = $error;
125 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
126 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
125 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database'));
126 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
127 127 
 	$_SESSION['install'] = 'airspace';
128 128 
 	$_SESSION['next'] = 'Populate airspace table';
129 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
129 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
130 130 
 	print json_encode($result);
131 131 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
132 132 
 	include_once('class.update_db.php');
 
@@ -134,11 +134,11 @@  discard block
 
 block discarded – undo
134 134 
 	$error .= update_db::update_airspace_fam();
135 135 
 	if ($error != '') {
136 136 
 		$_SESSION['error'] = $error;
137 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database'));
138 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
137 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate airspace database'));
138 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
139 139 
 	$_SESSION['install'] = 'countries';
140 140 
 	$_SESSION['next'] = 'Populate countries table';
141 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
141 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
142 142 
 	print json_encode($result);
143 143 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
144 144 
 	include_once('class.update_db.php');
 
@@ -146,31 +146,31 @@  discard block
 
 block discarded – undo
146 146 
 	$error .= update_db::update_countries();
147 147 
 	if ($error != '') {
148 148 
 		$_SESSION['error'] = $error;
149 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
150 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
149 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database'));
150 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
151 151 
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
152 152 
 	    $_SESSION['install'] = 'notam';
153 153 
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
154 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
154 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
155 155 
 	    print json_encode($result);
156 156 
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
157 157 
 	    $_SESSION['install'] = 'owner';
158 158 
 	    $_SESSION['next'] = 'Populate owner table with externals data';
159 159 
 	    unset($_SESSION['owner']);
160 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
160 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
161 161 
 	    print json_encode($result);
162 162 
 	} else {
163 163 
 	    $_SESSION['install'] = 'sources';
164 164 
 	    $_SESSION['next'] = 'Insert data in source table';
165 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
165 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
166 166 
 	    print json_encode($result);
167 167 
 	}
168 168 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
169 169 
 	if (!is_writable('tmp')) {
170 170 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
171 171 
 		$_SESSION['error'] = $error;
172 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
173 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
172 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
173 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
174 174 
 		print json_encode($result);
175 175 
 	} else {
176 176 
 		include_once('class.update_db.php');
 
@@ -178,19 +178,19 @@  discard block
 
 block discarded – undo
178 178 
 		$error .= update_db::update_ModeS_fam();
179 179 
 		if ($error != '') {
180 180 
 			$_SESSION['error'] = $error;
181 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
182 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
181 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
182 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
183 183 
 		$_SESSION['install'] = 'populate_flarm';
184 184 
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
185 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
185 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
186 186 
 		print json_encode($result);
187 187 
 	}
188 188 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
189 189 
 	if (!is_writable('tmp')) {
190 190 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
191 191 
 		$_SESSION['error'] = $error;
192 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
193 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
192 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
193 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
194 194 
 		print json_encode($result);
195 195 
 	} else {
196 196 
 		include_once('class.update_db.php');
 
@@ -199,8 +199,8 @@  discard block
 
 block discarded – undo
199 199 
 		$error .= update_db::update_ModeS_ogn();
200 200 
 		if ($error != '') {
201 201 
 			$_SESSION['error'] = $error;
202 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
203 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
202 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
203 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
204 204 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
205 205 
 			$_SESSION['install'] = 'vatsim';
206 206 
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
 
@@ -219,15 +219,15 @@  discard block
 
 block discarded – undo
219 219 
 			$_SESSION['install'] = 'routes';
220 220 
 			$_SESSION['next'] = 'Populate routes table with externals data';
221 221 
 		}
222 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
222 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
223 223 
 		print json_encode($result);
224 224 
 	}
225 225 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
226 226 
 	if (!is_writable('tmp')) {
227 227 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
228 228 
 		$_SESSION['error'] = $error;
229 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
230 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
229 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
230 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
231 231 
 		print json_encode($result);
232 232 
 	} else {
233 233 
 		include_once('class.update_db.php');
 
@@ -235,19 +235,19 @@  discard block
 
 block discarded – undo
235 235 
 		$error .= update_db::update_routes_fam();
236 236 
 		if ($error != '') {
237 237 
 			$_SESSION['error'] = $error;
238 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
239 
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
238 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data'));
239 
+		} else 	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
240 240 
 		$_SESSION['install'] = 'translation';
241 241 
 		$_SESSION['next'] = 'Populate translation table with externals data';
242 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
242 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
243 243 
 		print json_encode($result);
244 244 
 	}
245 245 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
246 246 
 	if (!is_writable('tmp')) {
247 247 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
248 248 
 		$_SESSION['error'] = $error;
249 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
250 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
249 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
250 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
251 251 
 		print json_encode($result);
252 252 
 	} else {
253 253 
 		include_once('class.update_db.php');
 
@@ -255,8 +255,8 @@  discard block
 
 block discarded – undo
255 255 
 		$error .= update_db::update_translation_fam();
256 256 
 		if ($error != '') {
257 257 
 			$_SESSION['error'] = $error;
258 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
259 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
258 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
259 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
260 260 
 		if ($_SESSION['waypoints'] == 1) {
261 261 
 			$_SESSION['install'] = 'waypoints';
262 262 
 			$_SESSION['next'] = 'Populate waypoints table';
 
@@ -272,15 +272,15 @@  discard block
 
 block discarded – undo
272 272 
 			$_SESSION['install'] = 'sources';
273 273 
 			$_SESSION['next'] = 'Insert data in source table';
274 274 
 		}
275 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
275 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
276 276 
 		print json_encode($result);
277 277 
 	}
278 278 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
279 279 
 	if (!is_writable('tmp')) {
280 280 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
281 281 
 		$_SESSION['error'] = $error;
282 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
283 
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
282 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
283 
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
284 284 
 		print json_encode($result);
285 285 
 	} else {
286 286 
 		include_once('class.update_db.php');
 
@@ -288,19 +288,19 @@  discard block
 
 block discarded – undo
288 288 
 		$error = update_db::update_owner_fam();
289 289 
 		if ($error != '') {
290 290 
 			$_SESSION['error'] = $error;
291 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
292 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
291 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
292 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
293 293 
 		$_SESSION['install'] = 'sources';
294 294 
 		$_SESSION['next'] = 'Insert data in source table';
295 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
295 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
296 296 
 		print json_encode($result);
297 297 
 	}
298 298 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
299 299 
 	if (!is_writable('tmp')) {
300 300 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
301 301 
 		$_SESSION['error'] = $error;
302 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
303 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
302 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
303 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
304 304 
 		print json_encode($result);
305 305 
 	} else {
306 306 
 		include_once('class.update_db.php');
 
@@ -309,24 +309,24 @@  discard block
 
 block discarded – undo
309 309 
 			$error .= update_db::update_notam();
310 310 
 			if ($error != '') {
311 311 
 				$_SESSION['error'] = $error;
312 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
313 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
312 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
313 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
314 314 
 		} else {
315 315 
 			if ($error != '') {
316 316 
 				$_SESSION['error'] = $error;
317 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
318 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
317 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)'));
318 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
319 319 
 		}
320 320 
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
321 321 
 			$_SESSION['install'] = 'owner';
322 322 
 			$_SESSION['next'] = 'Populate owner table';
323 323 
 			unset($_SESSION['owner']);
324 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
324 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
325 325 
 			print json_encode($result);
326 326 
 		} else {
327 327 
 			$_SESSION['install'] = 'sources';
328 328 
 			$_SESSION['next'] = 'Insert data in source table';
329 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
329 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
330 330 
 			print json_encode($result);
331 331 
 		}
332 332 
 	}
 
@@ -363,9 +363,9 @@  discard block
 
 block discarded – undo
363 363 
 		$Source = new Source();
364 364 
 		$Source->deleteAllLocation();
365 365 
 		foreach ($sources as $src) {
366 
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
366 
+			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
367 367 
 		}
368 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
368 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
369 369 
 		unset($_SESSION['sources']);
370 370 
 	}
371 371 
 	/*
 
@@ -390,7 +390,7 @@  discard block
 
 block discarded – undo
390 390 
 		$_SESSION['install'] = 'finish';
391 391 
 		$_SESSION['next'] = 'finish';
392 392 
 	}
393 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
393 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
394 394 
 	print json_encode($result);
395 395 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
396 396 
 	include_once('../install/class.create_db.php');
 
@@ -402,48 +402,48 @@  discard block
 
 block discarded – undo
402 402 
 			$error .= update_db::update_IVAO();
403 403 
 			if ($error != '') {
404 404 
 				$_SESSION['error'] = $error;
405 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
406 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
405 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
406 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
407 407 
 		} else {
408 408 
 			$error .= update_db::update_vatsim();
409 409 
 			if ($error != '') {
410 410 
 				$_SESSION['error'] = $error;
411 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
412 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
411 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
412 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
413 413 
 		}
414 414 
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
415 415 
 		$error .= update_db::update_vatsim();
416 416 
 		if ($error != '') {
417 417 
 			$_SESSION['error'] = $error;
418 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
419 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
418 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
419 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
420 420 
 	} elseif (isset($globalIVAO) && $globalIVAO) {
421 421 
 		if (file_exists('tmp/ivae_feb2013.zip')) {
422 422 
 			$error .= update_db::update_IVAO();
423 423 
 			if ($error != '') {
424 424 
 				$_SESSION['error'] = $error;
425 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
426 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
425 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
426 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
427 427 
 		} else {
428 428 
 			$error .= update_db::update_vatsim();
429 429 
 			if ($error != '') {
430 430 
 				$_SESSION['error'] = $error;
431 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
432 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
431 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)'));
432 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
433 433 
 		}
434 434 
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
435 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
435 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
436 436 
 	}
437 437 
 	//$_SESSION['install'] = 'routes';
438 438 
 	//$_SESSION['next'] = 'Populate routes table with externals data';
439 439 
 	$_SESSION['install'] = 'finish';
440 440 
 	$_SESSION['next'] = 'finish';
441 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
441 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
442 442 
 	print json_encode($result);
443 443 
 } else {
444 444 
 	//unset($_SESSION['install']);
445 445 
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
446 
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
446 
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
447 447 
 	print json_encode($result);
448 448 
 }
449 449 
 ?>
450 450 
\ No newline at end of file
Please login to merge, or discard this patch.