View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( ea19e9...cc9dce )
by Yannick
122:33 queued 97:55
created
Status
Category
Toggle Patches
install/install-action.php 1 patch
Spacing   +72 added lines, -72 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,23 +101,23 @@  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'));
110 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
109 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
110 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
111 111 
 		print json_encode($result);
112 112 
 	} else {
113 113 
 		$error .= update_schema::check_version(true);
114 114 
 		if ($error != '') {
115 115 
 			$_SESSION['error'] = $error;
116 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
117 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
116 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed'));
117 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
118 118 
 		$_SESSION['install'] = 'sources';
119 119 
 		$_SESSION['next'] = 'Insert data in source table';
120 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
120 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
121 121 
 		print json_encode($result);
122 122 
 	}
123 123 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
 
@@ -126,11 +126,11 @@  discard block
 
 block discarded – undo
126 126 
 	$error .= update_db::update_waypoints();
127 127 
 	if ($error != '') {
128 128 
 		$_SESSION['error'] = $error;
129 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
130 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
129 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database'));
130 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
131 131 
 	$_SESSION['install'] = 'airspace';
132 132 
 	$_SESSION['next'] = 'Populate airspace table';
133 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
133 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
134 134 
 	print json_encode($result);
135 135 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
136 136 
 	include_once('class.update_db.php');
 
@@ -138,11 +138,11 @@  discard block
 
 block discarded – undo
138 138 
 	$error .= update_db::update_airspace_fam();
139 139 
 	if ($error != '') {
140 140 
 		$_SESSION['error'] = $error;
141 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database'));
142 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
141 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate airspace database'));
142 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
143 143 
 	$_SESSION['install'] = 'countries';
144 144 
 	$_SESSION['next'] = 'Populate countries table';
145 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
145 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
146 146 
 	print json_encode($result);
147 147 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
148 148 
 	include_once('class.update_db.php');
 
@@ -150,31 +150,31 @@  discard block
 
 block discarded – undo
150 150 
 	$error .= update_db::update_countries();
151 151 
 	if ($error != '') {
152 152 
 		$_SESSION['error'] = $error;
153 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
154 
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
153 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database'));
154 
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
155 155 
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
156 156 
 	    $_SESSION['install'] = 'notam';
157 157 
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
158 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
158 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
159 159 
 	    print json_encode($result);
160 160 
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
161 161 
 	    $_SESSION['install'] = 'owner';
162 162 
 	    $_SESSION['next'] = 'Populate owner table with externals data';
163 163 
 	    unset($_SESSION['owner']);
164 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
164 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
165 165 
 	    print json_encode($result);
166 166 
 	} else {
167 167 
 	    $_SESSION['install'] = 'sources';
168 168 
 	    $_SESSION['next'] = 'Insert data in source table';
169 
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
169 
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
170 170 
 	    print json_encode($result);
171 171 
 	}
172 172 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
173 173 
 	if (!is_writable('tmp')) {
174 174 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
175 175 
 		$_SESSION['error'] = $error;
176 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
177 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
176 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
177 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
178 178 
 		print json_encode($result);
179 179 
 	} else {
180 180 
 		include_once('class.update_db.php');
 
@@ -182,19 +182,19 @@  discard block
 
 block discarded – undo
182 182 
 		$error .= update_db::update_ModeS_fam();
183 183 
 		if ($error != '') {
184 184 
 			$_SESSION['error'] = $error;
185 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
186 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
185 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
186 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
187 187 
 		$_SESSION['install'] = 'populate_flarm';
188 188 
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
189 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
189 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
190 190 
 		print json_encode($result);
191 191 
 	}
192 192 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
193 193 
 	if (!is_writable('tmp')) {
194 194 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
195 195 
 		$_SESSION['error'] = $error;
196 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
197 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
196 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
197 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
198 198 
 		print json_encode($result);
199 199 
 	} else {
200 200 
 		include_once('class.update_db.php');
 
@@ -203,8 +203,8 @@  discard block
 
 block discarded – undo
203 203 
 		$error .= update_db::update_ModeS_ogn();
204 204 
 		if ($error != '') {
205 205 
 			$_SESSION['error'] = $error;
206 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
207 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
206 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
207 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
208 208 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
209 209 
 			$_SESSION['install'] = 'vatsim';
210 210 
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
 
@@ -223,15 +223,15 @@  discard block
 
 block discarded – undo
223 223 
 			$_SESSION['install'] = 'routes';
224 224 
 			$_SESSION['next'] = 'Populate routes table with externals data';
225 225 
 		}
226 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
226 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
227 227 
 		print json_encode($result);
228 228 
 	}
229 229 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
230 230 
 	if (!is_writable('tmp')) {
231 231 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
232 232 
 		$_SESSION['error'] = $error;
233 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
234 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
233 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
234 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
235 235 
 		print json_encode($result);
236 236 
 	} else {
237 237 
 		include_once('class.update_db.php');
 
@@ -239,19 +239,19 @@  discard block
 
 block discarded – undo
239 239 
 		$error .= update_db::update_routes_fam();
240 240 
 		if ($error != '') {
241 241 
 			$_SESSION['error'] = $error;
242 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
243 
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
242 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data'));
243 
+		} else 	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
244 244 
 		$_SESSION['install'] = 'translation';
245 245 
 		$_SESSION['next'] = 'Populate translation table with externals data';
246 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
246 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
247 247 
 		print json_encode($result);
248 248 
 	}
249 249 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
250 250 
 	if (!is_writable('tmp')) {
251 251 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
252 252 
 		$_SESSION['error'] = $error;
253 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
254 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
253 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
254 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
255 255 
 		print json_encode($result);
256 256 
 	} else {
257 257 
 		include_once('class.update_db.php');
 
@@ -259,8 +259,8 @@  discard block
 
 block discarded – undo
259 259 
 		$error .= update_db::update_translation_fam();
260 260 
 		if ($error != '') {
261 261 
 			$_SESSION['error'] = $error;
262 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
263 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
262 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
263 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
264 264 
 		if ($_SESSION['waypoints'] == 1) {
265 265 
 			$_SESSION['install'] = 'waypoints';
266 266 
 			$_SESSION['next'] = 'Populate waypoints table';
 
@@ -276,15 +276,15 @@  discard block
 
 block discarded – undo
276 276 
 			$_SESSION['install'] = 'sources';
277 277 
 			$_SESSION['next'] = 'Insert data in source table';
278 278 
 		}
279 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
279 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
280 280 
 		print json_encode($result);
281 281 
 	}
282 282 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
283 283 
 	if (!is_writable('tmp')) {
284 284 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
285 285 
 		$_SESSION['error'] = $error;
286 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
287 
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
286 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
287 
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
288 288 
 		print json_encode($result);
289 289 
 	} else {
290 290 
 		include_once('class.update_db.php');
 
@@ -292,19 +292,19 @@  discard block
 
 block discarded – undo
292 292 
 		$error = update_db::update_owner_fam();
293 293 
 		if ($error != '') {
294 294 
 			$_SESSION['error'] = $error;
295 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
296 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
295 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
296 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
297 297 
 		$_SESSION['install'] = 'sources';
298 298 
 		$_SESSION['next'] = 'Insert data in source table';
299 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
299 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
300 300 
 		print json_encode($result);
301 301 
 	}
302 302 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
303 303 
 	if (!is_writable('tmp')) {
304 304 
 		$error = 'The directory <i>install/tmp</i> must be writable.';
305 305 
 		$_SESSION['error'] = $error;
306 
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
307 
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
306 
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
307 
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
308 308 
 		print json_encode($result);
309 309 
 	} else {
310 310 
 		include_once('class.update_db.php');
 
@@ -313,24 +313,24 @@  discard block
 
 block discarded – undo
313 313 
 			$error .= update_db::update_notam();
314 314 
 			if ($error != '') {
315 315 
 				$_SESSION['error'] = $error;
316 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
317 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
316 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
317 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
318 318 
 		} else {
319 319 
 			if ($error != '') {
320 320 
 				$_SESSION['error'] = $error;
321 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
322 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
321 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)'));
322 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
323 323 
 		}
324 324 
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
325 325 
 			$_SESSION['install'] = 'owner';
326 326 
 			$_SESSION['next'] = 'Populate owner table';
327 327 
 			unset($_SESSION['owner']);
328 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
328 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
329 329 
 			print json_encode($result);
330 330 
 		} else {
331 331 
 			$_SESSION['install'] = 'sources';
332 332 
 			$_SESSION['next'] = 'Insert data in source table';
333 
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
333 
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
334 334 
 			print json_encode($result);
335 335 
 		}
336 336 
 	}
 
@@ -367,9 +367,9 @@  discard block
 
 block discarded – undo
367 367 
 		$Source = new Source();
368 368 
 		$Source->deleteAllLocation();
369 369 
 		foreach ($sources as $src) {
370 
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
370 
+			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
371 371 
 		}
372 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
372 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
373 373 
 		unset($_SESSION['sources']);
374 374 
 	}
375 375 
 	/*
 
@@ -394,7 +394,7 @@  discard block
 
 block discarded – undo
394 394 
 		$_SESSION['install'] = 'finish';
395 395 
 		$_SESSION['next'] = 'finish';
396 396 
 	}
397 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
397 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
398 398 
 	print json_encode($result);
399 399 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
400 400 
 	include_once('../install/class.create_db.php');
 
@@ -406,48 +406,48 @@  discard block
 
 block discarded – undo
406 406 
 			$error .= update_db::update_IVAO();
407 407 
 			if ($error != '') {
408 408 
 				$_SESSION['error'] = $error;
409 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
410 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
409 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
410 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
411 411 
 		} else {
412 412 
 			$error .= update_db::update_vatsim();
413 413 
 			if ($error != '') {
414 414 
 				$_SESSION['error'] = $error;
415 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
416 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
415 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
416 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
417 417 
 		}
418 418 
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
419 419 
 		$error .= update_db::update_vatsim();
420 420 
 		if ($error != '') {
421 421 
 			$_SESSION['error'] = $error;
422 
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
423 
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
422 
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
423 
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
424 424 
 	} elseif (isset($globalIVAO) && $globalIVAO) {
425 425 
 		if (file_exists('tmp/ivae_feb2013.zip')) {
426 426 
 			$error .= update_db::update_IVAO();
427 427 
 			if ($error != '') {
428 428 
 				$_SESSION['error'] = $error;
429 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
430 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
429 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
430 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
431 431 
 		} else {
432 432 
 			$error .= update_db::update_vatsim();
433 433 
 			if ($error != '') {
434 434 
 				$_SESSION['error'] = $error;
435 
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
436 
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
435 
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)'));
436 
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
437 437 
 		}
438 438 
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
439 
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
439 
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
440 440 
 	}
441 441 
 	//$_SESSION['install'] = 'routes';
442 442 
 	//$_SESSION['next'] = 'Populate routes table with externals data';
443 443 
 	$_SESSION['install'] = 'finish';
444 444 
 	$_SESSION['next'] = 'finish';
445 
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
445 
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
446 446 
 	print json_encode($result);
447 447 
 } else {
448 448 
 	//unset($_SESSION['install']);
449 449 
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
450 
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
450 
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
451 451 
 	print json_encode($result);
452 452 
 }
453 453 
 ?>
454 454 
\ No newline at end of file
Please login to merge, or discard this patch.