View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 3d0574...048ff1 )
by Yannick
28:00
created
Status
Category
Toggle Patches
install/install-action.php 1 patch
Spacing   +69 added lines, -69 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,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
81 
+	$result = array('error' => $error, '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,31 +153,31 @@  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 
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
164 164 
 	    $_SESSION['install'] = 'owner';
165 165 
 	    $_SESSION['next'] = 'Populate owner table with externals data';
166 166 
 	    unset($_SESSION['owner']);
167 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
167 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
168 168 
 	    print json_encode($result);
169 169 
 	} else {
170 170 
 	    $_SESSION['install'] = 'sources';
171 171 
 	    $_SESSION['next'] = 'Insert data in source table';
172 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
172 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
173 173 
 	    print json_encode($result);
174 174 
 	}
175 175 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
176 176 
 	if (!is_writable('tmp')) {
177 177 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
178 178 
 		$_SESSION['error'] = $error;
179 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
180 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
179 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
180 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
181 181 
 		print json_encode($result);
182 182 
 	} else {
183 183 
 		include_once('class.update_db.php');
 
@@ -185,19 +185,19 @@  discard block
 
 block discarded – undo
185 185 
 		$error .= update_db::update_ModeS_fam();
186 186 
 		if ($error != '') {
187 187 
 			$_SESSION['error'] = $error;
188 
-			$_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'));
188 
+			$_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'));
190 190 
 		$_SESSION['install'] = 'populate_flarm';
191 191 
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
192 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
192 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
193 193 
 		print json_encode($result);
194 194 
 	}
195 195 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
196 196 
 	if (!is_writable('tmp')) {
197 197 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
198 198 
 		$_SESSION['error'] = $error;
199 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
200 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
199 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
200 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
201 201 
 		print json_encode($result);
202 202 
 	} else {
203 203 
 		include_once('class.update_db.php');
 
@@ -206,8 +206,8 @@  discard block
 
 block discarded – undo
206 206 
 		$error .= update_db::update_ModeS_ogn();
207 207 
 		if ($error != '') {
208 208 
 			$_SESSION['error'] = $error;
209 
-			$_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'));
209 
+			$_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'));
211 211 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
212 212 
 			$_SESSION['install'] = 'vatsim';
213 213 
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
 
@@ -226,15 +226,15 @@  discard block
 
 block discarded – undo
226 226 
 			$_SESSION['install'] = 'routes';
227 227 
 			$_SESSION['next'] = 'Populate routes table with externals data';
228 228 
 		}
229 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
229 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
230 230 
 		print json_encode($result);
231 231 
 	}
232 232 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
233 233 
 	if (!is_writable('tmp')) {
234 234 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
235 235 
 		$_SESSION['error'] = $error;
236 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
237 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
236 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
237 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
238 238 
 		print json_encode($result);
239 239 
 	} else {
240 240 
 		include_once('class.update_db.php');
 
@@ -242,19 +242,19 @@  discard block
 
 block discarded – undo
242 242 
 		$error .= update_db::update_routes_fam();
243 243 
 		if ($error != '') {
244 244 
 			$_SESSION['error'] = $error;
245 
-			$_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'));
245 
+			$_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'));
247 247 
 		$_SESSION['install'] = 'translation';
248 248 
 		$_SESSION['next'] = 'Populate translation table with externals data';
249 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
249 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
250 250 
 		print json_encode($result);
251 251 
 	}
252 252 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
253 253 
 	if (!is_writable('tmp')) {
254 254 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
255 255 
 		$_SESSION['error'] = $error;
256 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
257 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
256 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
257 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
258 258 
 		print json_encode($result);
259 259 
 	} else {
260 260 
 		include_once('class.update_db.php');
 
@@ -262,8 +262,8 @@  discard block
 
 block discarded – undo
262 262 
 		$error .= update_db::update_translation_fam();
263 263 
 		if ($error != '') {
264 264 
 			$_SESSION['error'] = $error;
265 
-			$_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'));
265 
+			$_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'));
267 267 
 		if ($_SESSION['waypoints'] == 1) {
268 268 
 			$_SESSION['install'] = 'waypoints';
269 269 
 			$_SESSION['next'] = 'Populate waypoints table';
 
@@ -279,15 +279,15 @@  discard block
 
 block discarded – undo
279 279 
 			$_SESSION['install'] = 'sources';
280 280 
 			$_SESSION['next'] = 'Insert data in source table';
281 281 
 		}
282 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
282 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
283 283 
 		print json_encode($result);
284 284 
 	}
285 285 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
286 286 
 	if (!is_writable('tmp')) {
287 287 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
288 288 
 		$_SESSION['error'] = $error;
289 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
290 
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
289 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
290 
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
291 291 
 		print json_encode($result);
292 292 
 	} else {
293 293 
 		include_once('class.update_db.php');
 
@@ -295,19 +295,19 @@  discard block
 
 block discarded – undo
295 295 
 		$error = update_db::update_owner_fam();
296 296 
 		if ($error != '') {
297 297 
 			$_SESSION['error'] = $error;
298 
-			$_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'));
298 
+			$_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'));
300 300 
 		$_SESSION['install'] = 'sources';
301 301 
 		$_SESSION['next'] = 'Insert data in source table';
302 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
302 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
303 303 
 		print json_encode($result);
304 304 
 	}
305 305 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
306 306 
 	if (!is_writable('tmp')) {
307 307 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
308 308 
 		$_SESSION['error'] = $error;
309 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
310 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
309 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
310 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
311 311 
 		print json_encode($result);
312 312 
 	} else {
313 313 
 		include_once('class.update_db.php');
 
@@ -316,24 +316,24 @@  discard block
 
 block discarded – undo
316 316 
 			$error .= update_db::update_notam();
317 317 
 			if ($error != '') {
318 318 
 				$_SESSION['error'] = $error;
319 
-				$_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'));
319 
+				$_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'));
321 321 
 		} else {
322 322 
 			if ($error != '') {
323 323 
 				$_SESSION['error'] = $error;
324 
-				$_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)'));
324 
+				$_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)'));
326 326 
 		}
327 327 
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
328 328 
 			$_SESSION['install'] = 'owner';
329 329 
 			$_SESSION['next'] = 'Populate owner table';
330 330 
 			unset($_SESSION['owner']);
331 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
331 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
332 332 
 			print json_encode($result);
333 333 
 		} else {
334 334 
 			$_SESSION['install'] = 'sources';
335 335 
 			$_SESSION['next'] = 'Insert data in source table';
336 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
336 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
337 337 
 			print json_encode($result);
338 338 
 		}
339 339 
 	}
 
@@ -370,9 +370,9 @@  discard block
 
 block discarded – undo
370 370 
 		$Source = new Source();
371 371 
 		$Source->deleteAllLocation();
372 372 
 		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');
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');
374 374 
 		}
375 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
375 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
376 376 
 		unset($_SESSION['sources']);
377 377 
 	}
378 378 
 	/*
 
@@ -397,7 +397,7 @@  discard block
 
 block discarded – undo
397 397 
 		$_SESSION['install'] = 'finish';
398 398 
 		$_SESSION['next'] = 'finish';
399 399 
 	}
400 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
400 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
401 401 
 	print json_encode($result);
402 402 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
403 403 
 	include_once('../install/class.create_db.php');
 
@@ -409,48 +409,48 @@  discard block
 
 block discarded – undo
409 409 
 			$error .= update_db::update_IVAO();
410 410 
 			if ($error != '') {
411 411 
 				$_SESSION['error'] = $error;
412 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
413 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
412 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
413 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
414 414 
 		} else {
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 
 		}
421 421 
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
422 422 
 		$error .= update_db::update_vatsim();
423 423 
 		if ($error != '') {
424 424 
 			$_SESSION['error'] = $error;
425 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
426 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
425 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
426 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
427 427 
 	} elseif (isset($globalIVAO) && $globalIVAO) {
428 428 
 		if (file_exists('tmp/ivae_feb2013.zip')) {
429 429 
 			$error .= update_db::update_IVAO();
430 430 
 			if ($error != '') {
431 431 
 				$_SESSION['error'] = $error;
432 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
433 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
432 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
433 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
434 434 
 		} else {
435 435 
 			$error .= update_db::update_vatsim();
436 436 
 			if ($error != '') {
437 437 
 				$_SESSION['error'] = $error;
438 
-				$_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)'));
438 
+				$_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)'));
440 440 
 		}
441 441 
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
442 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
442 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
443 443 
 	}
444 444 
 	//$_SESSION['install'] = 'routes';
445 445 
 	//$_SESSION['next'] = 'Populate routes table with externals data';
446 446 
 	$_SESSION['install'] = 'finish';
447 447 
 	$_SESSION['next'] = 'finish';
448 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
448 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
449 449 
 	print json_encode($result);
450 450 
 } else {
451 451 
 	//unset($_SESSION['install']);
452 452 
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
453 
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
453 
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
454 454 
 	print json_encode($result);
455 455 
 }
456 456 
 ?>
457 457 
\ No newline at end of file
Please login to merge, or discard this patch.