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