Completed
Push — master ( f9a26b...f18b47 )
by Yannick
36:54 queued 12:35
created
install/install-action.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -68,15 +68,15 @@  discard block
 block discarded – undo
68 68
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
69 69
 	$dbroot = $_SESSION['database_root'];
70 70
 	$dbrootpass = $_SESSION['database_rootpass'];
71
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
71
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
72 72
 	sleep(5);
73 73
 	if ($error != '') {
74 74
 		$_SESSION['error'] = $error;
75 75
 	}
76
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
76
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
77 77
 	$_SESSION['install'] = 'database_import';
78 78
 	$_SESSION['next'] = 'Create and import tables';
79
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
79
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
80 80
 	print json_encode($result);
81 81
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
82 82
 	if (update_schema::check_version(false) == '0') {
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 		if ($error != '') {
89 89
                         $_SESSION['error'] = $error;
90 90
 		}
91
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
91
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
92 92
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
93 93
 			$_SESSION['install'] = 'populate';
94 94
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -96,87 +96,87 @@  discard block
 block discarded – undo
96 96
 		    $_SESSION['install'] = 'sources';
97 97
 		    $_SESSION['next'] = 'Insert data in source table';
98 98
 		}
99
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
99
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
100 100
 		print json_encode($result);
101 101
 	} else {
102 102
 		$error .= update_schema::check_version(true);
103 103
 		if ($error != '') {
104 104
                         $_SESSION['error'] = $error;
105 105
 		}
106
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
106
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
107 107
 		$_SESSION['install'] = 'sources';
108 108
 		$_SESSION['next'] = 'Insert data in source table';
109
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
109
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
110 110
 		print json_encode($result);
111 111
 	}
112 112
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
113 113
 	include_once('class.update_db.php');
114 114
 	$globalDebug = FALSE;
115 115
 	$error .= update_db::update_waypoints();
116
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
116
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
117 117
 
118 118
 	$_SESSION['install'] = 'airspace';
119 119
 	$_SESSION['next'] = 'Populate airspace table';
120
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
120
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
121 121
 	print json_encode($result);
122 122
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
123 123
 	include_once('class.update_db.php');
124 124
 	$globalDebug = FALSE;
125 125
 	$error .= update_db::update_airspace_fam();
126
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
126
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
127 127
 	$_SESSION['install'] = 'countries';
128 128
 	$_SESSION['next'] = 'Populate countries table';
129
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
129
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
130 130
 	print json_encode($result);
131 131
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
132 132
 	include_once('class.update_db.php');
133 133
 	$globalDebug = FALSE;
134 134
 	$error .= update_db::update_countries();
135
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
135
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
136 136
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
137 137
 	    $_SESSION['install'] = 'notam';
138 138
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
139
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
139
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
140 140
 	    print json_encode($result);
141 141
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
142 142
 	    $_SESSION['install'] = 'owner';
143 143
 	    $_SESSION['next'] = 'Populate owner table with externals data';
144 144
 	    unset($_SESSION['owner']);
145
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
145
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
146 146
 	    print json_encode($result);
147 147
 	} else {
148 148
 	    $_SESSION['install'] = 'sources';
149 149
 	    $_SESSION['next'] = 'Insert data in source table';
150
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
150
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
151 151
 	    print json_encode($result);
152 152
 	}
153 153
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
154 154
 	if (!is_writable('tmp')) {
155 155
                 $error = 'The directory <i>install/tmp</i> must be writable.';
156
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
156
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
157 157
 		print json_encode($result);
158 158
 	} else {
159 159
 		include_once('class.update_db.php');
160 160
 		$globalDebug = FALSE;
161 161
 		$error .= update_db::update_ModeS_fam();
162
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
162
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
163 163
 
164 164
 		$_SESSION['install'] = 'populate_flarm';
165 165
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
166
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
166
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
167 167
 		print json_encode($result);
168 168
 	}
169 169
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
170 170
 	if (!is_writable('tmp')) {
171 171
                 $error = 'The directory <i>install/tmp</i> must be writable.';
172
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
172
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
173 173
 		print json_encode($result);
174 174
 	} else {
175 175
 		include_once('class.update_db.php');
176 176
 		$globalDebug = FALSE;
177 177
 		//$error .= update_db::update_ModeS_flarm();
178 178
 		$error .= update_db::update_ModeS_ogn();
179
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
179
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
180 180
 
181 181
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
182 182
 			$_SESSION['install'] = 'vatsim';
@@ -196,34 +196,34 @@  discard block
 block discarded – undo
196 196
 			$_SESSION['install'] = 'routes';
197 197
 			$_SESSION['next'] = 'Populate routes table with externals data';
198 198
 		}
199
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
199
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
200 200
 		print json_encode($result);
201 201
 	}
202 202
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
203 203
 	if (!is_writable('tmp')) {
204 204
                 $error = 'The directory <i>install/tmp</i> must be writable.';
205
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
205
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
206 206
 		print json_encode($result);
207 207
 	} else {
208 208
 		include_once('class.update_db.php');
209 209
 		$globalDebug = FALSE;
210 210
 		$error .= update_db::update_routes_fam();
211
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
211
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
212 212
 		$_SESSION['install'] = 'translation';
213 213
 		$_SESSION['next'] = 'Populate translation table with externals data';
214
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
214
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
215 215
 		print json_encode($result);
216 216
 	}
217 217
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
218 218
 	if (!is_writable('tmp')) {
219 219
                 $error = 'The directory <i>install/tmp</i> must be writable.';
220
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
220
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
221 221
 		print json_encode($result);
222 222
 	} else {
223 223
 		include_once('class.update_db.php');
224 224
 		$globalDebug = FALSE;
225 225
 		$error .= update_db::update_translation();
226
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
226
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
227 227
 
228 228
 		if ($_SESSION['waypoints'] == 1) {
229 229
 			$_SESSION['install'] = 'waypoints';
@@ -240,48 +240,48 @@  discard block
 block discarded – undo
240 240
 			$_SESSION['install'] = 'sources';
241 241
 			$_SESSION['next'] = 'Insert data in source table';
242 242
 		}
243
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
243
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
244 244
 		print json_encode($result);
245 245
 	}
246 246
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
247 247
 	if (!is_writable('tmp')) {
248 248
                 $error = 'The directory <i>install/tmp</i> must be writable.';
249
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
249
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
250 250
 		print json_encode($result);
251 251
 	} else {
252 252
 		include_once('class.update_db.php');
253 253
 		$globalDebug = FALSE;
254 254
 		$error = update_db::update_owner_fam();
255
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
255
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
256 256
 		$_SESSION['install'] = 'sources';
257 257
 		$_SESSION['next'] = 'Insert data in source table';
258
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
258
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
259 259
 		print json_encode($result);
260 260
 	}
261 261
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
262 262
 	if (!is_writable('tmp')) {
263 263
                 $error = 'The directory <i>install/tmp</i> must be writable.';
264
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
264
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
265 265
 		print json_encode($result);
266 266
 	} else {
267 267
 		include_once('class.update_db.php');
268 268
 		$globalDebug = FALSE;
269 269
 		if (isset($globalNOTAMSource) && $globalNOTAMSource != '') {
270 270
 			$error .= update_db::update_notam();
271
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
271
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
272 272
 		} else {
273
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
273
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
274 274
 		}
275 275
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
276 276
 			$_SESSION['install'] = 'owner';
277 277
 			$_SESSION['next'] = 'Populate owner table';
278 278
 			unset($_SESSION['owner']);
279
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
279
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
280 280
 			print json_encode($result);
281 281
 		} else {
282 282
 			$_SESSION['install'] = 'sources';
283 283
 			$_SESSION['next'] = 'Insert data in source table';
284
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
284
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
285 285
 			print json_encode($result);
286 286
 		}
287 287
 	}
@@ -319,9 +319,9 @@  discard block
 block discarded – undo
319 319
 	    $Source = new Source();
320 320
 	    $Source->deleteAllLocation();
321 321
 	    foreach ($sources as $src) {
322
-		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
322
+		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
323 323
 	    }
324
-	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
324
+	    $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
325 325
 	    unset($_SESSION['sources']);
326 326
 	}
327 327
 	/*
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 		$_SESSION['install'] = 'finish';
347 347
 		$_SESSION['next'] = 'finish';
348 348
 	}
349
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
349
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
350 350
 	print json_encode($result);
351 351
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
352 352
 	include_once('../install/class.create_db.php');
@@ -356,36 +356,36 @@  discard block
 block discarded – undo
356 356
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
357 357
 		if (file_exists('tmp/ivae_feb2013.zip')) {
358 358
 			$error .= update_db::update_IVAO();
359
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
359
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
360 360
 		} else {
361 361
 			$error .= update_db::update_vatsim();
362
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
362
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
363 363
 		}
364 364
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
365 365
 		$error .= update_db::update_vatsim();
366
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
366
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
367 367
 	} elseif (isset($globalIVAO) && $globalIVAO) {
368 368
 		if (file_exists('tmp/ivae_feb2013.zip')) {
369 369
 			$error .= update_db::update_IVAO();
370
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
370
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
371 371
 		} else {
372 372
 			$error .= update_db::update_vatsim();
373
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
373
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
374 374
 		}
375 375
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
376
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
376
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
377 377
 	}
378 378
 	//$_SESSION['install'] = 'routes';
379 379
 	//$_SESSION['next'] = 'Populate routes table with externals data';
380 380
 	$_SESSION['install'] = 'finish';
381 381
 	$_SESSION['next'] = 'finish';
382 382
 
383
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
383
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
384 384
 	print json_encode($result);
385 385
 } else {
386 386
 	//unset($_SESSION['install']);
387 387
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
388
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
388
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
389 389
 	print json_encode($result);
390 390
 }
391 391
 ?>
392 392
\ No newline at end of file
Please login to merge, or discard this patch.