View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 982e11...405a4f )
by Yannick
46:13 queued 14:39
created
Status
Category
Toggle Patches
install/install-action.php 1 patch
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch 
@@ -70,15 +70,15 @@  discard block
 
 block discarded – undo
70 70 
 	$globalDebug = FALSE;
71 71 
 	$dbroot = $_SESSION['database_root'];
72 72 
 	$dbrootpass = $_SESSION['database_rootpass'];
73 
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
73 
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
74 74 
 	sleep(5);
75 75 
 	if ($error != '') {
76 76 
 		$_SESSION['error'] = $error;
77 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
78 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
77 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database'));
78 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
79 79 
 	$_SESSION['install'] = 'database_import';
80 80 
 	$_SESSION['next'] = 'Create and import tables';
81 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
81 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
82 82 
 	print json_encode($result);
83 83 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
84 84 
 	$globalDebug = FALSE;
 
@@ -92,8 +92,8 @@  discard block
 
 block discarded – undo
92 92 
 		}
93 93 
 		if ($error != '') {
94 94 
 			$_SESSION['error'] = $error;
95 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
96 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
95 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
96 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
97 97 
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
98 98 
 			$_SESSION['install'] = 'populate';
99 99 
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 
@@ -101,24 +101,24 @@  discard block
 
 block discarded – undo
101 101 
 		    $_SESSION['install'] = 'sources';
102 102 
 		    $_SESSION['next'] = 'Insert data in source table';
103 103 
 		}
104 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
104 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
105 105 
 		print json_encode($result);
106 106 
 	} elseif (!is_numeric($check_version)) {
107 107 
 		$error .= $check_version;
108 108 
 		$_SESSION['error'] = $error;
109 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
109 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
110 110 
 		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
111 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
111 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
112 112 
 		print json_encode($result);
113 113 
 	} else {
114 114 
 		$error .= update_schema::check_version(true);
115 115 
 		if ($error != '') {
116 116 
 			$_SESSION['error'] = $error;
117 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
118 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
117 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed'));
118 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
119 119 
 		$_SESSION['install'] = 'sources';
120 120 
 		$_SESSION['next'] = 'Insert data in source table';
121 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
121 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
122 122 
 		print json_encode($result);
123 123 
 	}
124 124 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
 
@@ -127,8 +127,8 @@  discard block
 
 block discarded – undo
127 127 
 	$error .= update_db::update_waypoints();
128 128 
 	if ($error != '') {
129 129 
 		$_SESSION['error'] = $error;
130 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
131 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
130 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database'));
131 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
132 132 
 /*
133 133 
 	$_SESSION['install'] = 'airspace';
134 134 
 	$_SESSION['next'] = 'Populate airspace table';
 
@@ -145,7 +145,7 @@  discard block
 
 block discarded – undo
145 145 
 */
146 146 
 	$_SESSION['install'] = 'countries';
147 147 
 	$_SESSION['next'] = 'Populate countries table';
148 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
148 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
149 149 
 	print json_encode($result);
150 150 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
151 151 
 	include_once('class.update_db.php');
 
@@ -153,12 +153,12 @@  discard block
 
 block discarded – undo
153 153 
 	$error .= update_db::update_countries();
154 154 
 	if ($error != '') {
155 155 
 		$_SESSION['error'] = $error;
156 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
157 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
156 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database'));
157 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
158 158 
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
159 159 
 	    $_SESSION['install'] = 'notam';
160 160 
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
161 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
161 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
162 162 
 	    print json_encode($result);
163 163 
 	/*
164 164 
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 
@@ -171,15 +171,15 @@  discard block
 
 block discarded – undo
171 171 
 	} else {
172 172 
 	    $_SESSION['install'] = 'sources';
173 173 
 	    $_SESSION['next'] = 'Insert data in source table';
174 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
174 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
175 175 
 	    print json_encode($result);
176 176 
 	}
177 177 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
178 178 
 	if (!is_writable('tmp')) {
179 179 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
180 180 
 		$_SESSION['error'] = $error;
181 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
182 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
181 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
182 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
183 183 
 		print json_encode($result);
184 184 
 	} else {
185 185 
 		include_once('class.update_db.php');
 
@@ -187,19 +187,19 @@  discard block
 
 block discarded – undo
187 187 
 		$error .= update_db::update_ModeS_fam();
188 188 
 		if ($error != '') {
189 189 
 			$_SESSION['error'] = $error;
190 
-			$_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'));
190 
+			$_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'));
192 192 
 		$_SESSION['install'] = 'populate_flarm';
193 193 
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
194 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
194 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
195 195 
 		print json_encode($result);
196 196 
 	}
197 197 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
198 198 
 	if (!is_writable('tmp')) {
199 199 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
200 200 
 		$_SESSION['error'] = $error;
201 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
202 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
201 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
202 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
203 203 
 		print json_encode($result);
204 204 
 	} else {
205 205 
 		include_once('class.update_db.php');
 
@@ -208,8 +208,8 @@  discard block
 
 block discarded – undo
208 208 
 		$error .= update_db::update_ModeS_ogn();
209 209 
 		if ($error != '') {
210 210 
 			$_SESSION['error'] = $error;
211 
-			$_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'));
211 
+			$_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'));
213 213 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
214 214 
 			$_SESSION['install'] = 'vatsim';
215 215 
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
 
@@ -228,15 +228,15 @@  discard block
 
 block discarded – undo
228 228 
 			$_SESSION['install'] = 'routes';
229 229 
 			$_SESSION['next'] = 'Populate routes table with externals data';
230 230 
 		}
231 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
231 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
232 232 
 		print json_encode($result);
233 233 
 	}
234 234 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
235 235 
 	if (!is_writable('tmp')) {
236 236 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
237 237 
 		$_SESSION['error'] = $error;
238 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
239 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
238 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
239 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
240 240 
 		print json_encode($result);
241 241 
 	} else {
242 242 
 		include_once('class.update_db.php');
 
@@ -244,19 +244,19 @@  discard block
 
 block discarded – undo
244 244 
 		$error .= update_db::update_routes_fam();
245 245 
 		if ($error != '') {
246 246 
 			$_SESSION['error'] = $error;
247 
-			$_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'));
247 
+			$_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'));
249 249 
 		$_SESSION['install'] = 'translation';
250 250 
 		$_SESSION['next'] = 'Populate translation table with externals data';
251 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
251 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
252 252 
 		print json_encode($result);
253 253 
 	}
254 254 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
255 255 
 	if (!is_writable('tmp')) {
256 256 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
257 257 
 		$_SESSION['error'] = $error;
258 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
259 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
258 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
259 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
260 260 
 		print json_encode($result);
261 261 
 	} else {
262 262 
 		include_once('class.update_db.php');
 
@@ -264,8 +264,8 @@  discard block
 
 block discarded – undo
264 264 
 		$error .= update_db::update_translation_fam();
265 265 
 		if ($error != '') {
266 266 
 			$_SESSION['error'] = $error;
267 
-			$_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'));
267 
+			$_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'));
269 269 
 		if ($_SESSION['waypoints'] == 1) {
270 270 
 			$_SESSION['install'] = 'waypoints';
271 271 
 			$_SESSION['next'] = 'Populate waypoints table';
 
@@ -283,15 +283,15 @@  discard block
 
 block discarded – undo
283 283 
 			$_SESSION['install'] = 'sources';
284 284 
 			$_SESSION['next'] = 'Insert data in source table';
285 285 
 		}
286 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
286 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
287 287 
 		print json_encode($result);
288 288 
 	}
289 289 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
290 290 
 	if (!is_writable('tmp')) {
291 291 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
292 292 
 		$_SESSION['error'] = $error;
293 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
294 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
293 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
294 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
295 295 
 		print json_encode($result);
296 296 
 	} else {
297 297 
 		include_once('class.update_db.php');
 
@@ -299,19 +299,19 @@  discard block
 
 block discarded – undo
299 299 
 		$error = update_db::update_owner_fam();
300 300 
 		if ($error != '') {
301 301 
 			$_SESSION['error'] = $error;
302 
-			$_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'));
302 
+			$_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'));
304 304 
 		$_SESSION['install'] = 'sources';
305 305 
 		$_SESSION['next'] = 'Insert data in source table';
306 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
306 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
307 307 
 		print json_encode($result);
308 308 
 	}
309 309 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
310 310 
 	if (!is_writable('tmp')) {
311 311 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
312 312 
 		$_SESSION['error'] = $error;
313 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
314 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
313 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
314 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
315 315 
 		print json_encode($result);
316 316 
 	} else {
317 317 
 		include_once('class.update_db.php');
 
@@ -320,13 +320,13 @@  discard block
 
 block discarded – undo
320 320 
 			$error .= update_db::update_notam();
321 321 
 			if ($error != '') {
322 322 
 				$_SESSION['error'] = $error;
323 
-				$_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'));
323 
+				$_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'));
325 325 
 		} else {
326 326 
 			if ($error != '') {
327 327 
 				$_SESSION['error'] = $error;
328 
-				$_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)'));
328 
+				$_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)'));
330 330 
 		}
331 331 
 		/*
332 332 
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 
@@ -339,7 +339,7 @@  discard block
 
 block discarded – undo
339 339 
 		*/
340 340 
 			$_SESSION['install'] = 'sources';
341 341 
 			$_SESSION['next'] = 'Insert data in source table';
342 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
342 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
343 343 
 			print json_encode($result);
344 344 
 		//}
345 345 
 	}
 
@@ -376,9 +376,9 @@  discard block
 
 block discarded – undo
376 376 
 		$Source = new Source();
377 377 
 		$Source->deleteAllLocation();
378 378 
 		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');
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');
380 380 
 		}
381 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
381 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
382 382 
 		unset($_SESSION['sources']);
383 383 
 	}
384 384 
 	/*
 
@@ -403,7 +403,7 @@  discard block
 
 block discarded – undo
403 403 
 		$_SESSION['install'] = 'finish';
404 404 
 		$_SESSION['next'] = 'finish';
405 405 
 	}
406 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
406 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
407 407 
 	print json_encode($result);
408 408 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
409 409 
 	include_once('../install/class.create_db.php');
 
@@ -415,48 +415,48 @@  discard block
 
 block discarded – undo
415 415 
 			$error .= update_db::update_IVAO();
416 416 
 			if ($error != '') {
417 417 
 				$_SESSION['error'] = $error;
418 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
419 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
418 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
419 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
420 420 
 		} else {
421 421 
 			$error .= update_db::update_vatsim();
422 422 
 			if ($error != '') {
423 423 
 				$_SESSION['error'] = $error;
424 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
425 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
424 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
425 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
426 426 
 		}
427 427 
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
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'));
432 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
431 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
432 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
433 433 
 	} elseif (isset($globalIVAO) && $globalIVAO) {
434 434 
 		if (file_exists('tmp/ivae_feb2013.zip')) {
435 435 
 			$error .= update_db::update_IVAO();
436 436 
 			if ($error != '') {
437 437 
 				$_SESSION['error'] = $error;
438 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
439 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
438 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
439 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
440 440 
 		} else {
441 441 
 			$error .= update_db::update_vatsim();
442 442 
 			if ($error != '') {
443 443 
 				$_SESSION['error'] = $error;
444 
-				$_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)'));
444 
+				$_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)'));
446 446 
 		}
447 447 
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
448 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
448 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
449 449 
 	}
450 450 
 	//$_SESSION['install'] = 'routes';
451 451 
 	//$_SESSION['next'] = 'Populate routes table with externals data';
452 452 
 	$_SESSION['install'] = 'finish';
453 453 
 	$_SESSION['next'] = 'finish';
454 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
454 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
455 455 
 	print json_encode($result);
456 456 
 } else {
457 457 
 	//unset($_SESSION['install']);
458 458 
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
459 
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
459 
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
460 460 
 	print json_encode($result);
461 461 
 }
462 462 
 ?>
463 463 
\ No newline at end of file
Please login to merge, or discard this patch.