@@ -70,15 +70,15 @@ discard block |
||
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 |
||
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,21 +101,21 @@ discard block |
||
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 | } else { |
111 | 111 | $error .= update_schema::check_version(true); |
112 | 112 | if ($error != '') { |
113 | 113 | $_SESSION['error'] = $error; |
114 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
|
115 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
114 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed')); |
|
115 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed')); |
|
116 | 116 | $_SESSION['install'] = 'sources'; |
117 | 117 | $_SESSION['next'] = 'Insert data in source table'; |
118 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
118 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
119 | 119 | print json_encode($result); |
120 | 120 | } |
121 | 121 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') { |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | $error .= update_db::update_waypoints(); |
125 | 125 | if ($error != '') { |
126 | 126 | $_SESSION['error'] = $error; |
127 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
|
128 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
127 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database')); |
|
128 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database')); |
|
129 | 129 | $_SESSION['install'] = 'airspace'; |
130 | 130 | $_SESSION['next'] = 'Populate airspace table'; |
131 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
131 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
132 | 132 | print json_encode($result); |
133 | 133 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') { |
134 | 134 | include_once('class.update_db.php'); |
@@ -136,11 +136,11 @@ discard block |
||
136 | 136 | $error .= update_db::update_airspace_fam(); |
137 | 137 | if ($error != '') { |
138 | 138 | $_SESSION['error'] = $error; |
139 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
|
140 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
139 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate airspace database')); |
|
140 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database')); |
|
141 | 141 | $_SESSION['install'] = 'countries'; |
142 | 142 | $_SESSION['next'] = 'Populate countries table'; |
143 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
143 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
144 | 144 | print json_encode($result); |
145 | 145 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') { |
146 | 146 | include_once('class.update_db.php'); |
@@ -148,31 +148,31 @@ discard block |
||
148 | 148 | $error .= update_db::update_countries(); |
149 | 149 | if ($error != '') { |
150 | 150 | $_SESSION['error'] = $error; |
151 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
|
152 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
151 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database')); |
|
152 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database')); |
|
153 | 153 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
154 | 154 | $_SESSION['install'] = 'notam'; |
155 | 155 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
156 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
156 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
157 | 157 | print json_encode($result); |
158 | 158 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
159 | 159 | $_SESSION['install'] = 'owner'; |
160 | 160 | $_SESSION['next'] = 'Populate owner table with externals data'; |
161 | 161 | unset($_SESSION['owner']); |
162 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
162 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
163 | 163 | print json_encode($result); |
164 | 164 | } else { |
165 | 165 | $_SESSION['install'] = 'sources'; |
166 | 166 | $_SESSION['next'] = 'Insert data in source table'; |
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 | } |
170 | 170 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
171 | 171 | if (!is_writable('tmp')) { |
172 | 172 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
173 | 173 | $_SESSION['error'] = $error; |
174 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
175 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
174 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
175 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
176 | 176 | print json_encode($result); |
177 | 177 | } else { |
178 | 178 | include_once('class.update_db.php'); |
@@ -180,19 +180,19 @@ discard block |
||
180 | 180 | $error .= update_db::update_ModeS_fam(); |
181 | 181 | if ($error != '') { |
182 | 182 | $_SESSION['error'] = $error; |
183 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
184 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
183 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
184 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
185 | 185 | $_SESSION['install'] = 'populate_flarm'; |
186 | 186 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
187 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
187 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
188 | 188 | print json_encode($result); |
189 | 189 | } |
190 | 190 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
191 | 191 | if (!is_writable('tmp')) { |
192 | 192 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
193 | 193 | $_SESSION['error'] = $error; |
194 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
195 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
194 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
195 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
196 | 196 | print json_encode($result); |
197 | 197 | } else { |
198 | 198 | include_once('class.update_db.php'); |
@@ -201,8 +201,8 @@ discard block |
||
201 | 201 | $error .= update_db::update_ModeS_ogn(); |
202 | 202 | if ($error != '') { |
203 | 203 | $_SESSION['error'] = $error; |
204 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
205 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
204 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
205 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
206 | 206 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
207 | 207 | $_SESSION['install'] = 'vatsim'; |
208 | 208 | if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
@@ -221,15 +221,15 @@ discard block |
||
221 | 221 | $_SESSION['install'] = 'routes'; |
222 | 222 | $_SESSION['next'] = 'Populate routes table with externals data'; |
223 | 223 | } |
224 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
224 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
225 | 225 | print json_encode($result); |
226 | 226 | } |
227 | 227 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
228 | 228 | if (!is_writable('tmp')) { |
229 | 229 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
230 | 230 | $_SESSION['error'] = $error; |
231 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
232 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
231 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
232 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
233 | 233 | print json_encode($result); |
234 | 234 | } else { |
235 | 235 | include_once('class.update_db.php'); |
@@ -237,19 +237,19 @@ discard block |
||
237 | 237 | $error .= update_db::update_routes_fam(); |
238 | 238 | if ($error != '') { |
239 | 239 | $_SESSION['error'] = $error; |
240 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
|
241 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
240 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data')); |
|
241 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data')); |
|
242 | 242 | $_SESSION['install'] = 'translation'; |
243 | 243 | $_SESSION['next'] = 'Populate translation table with externals data'; |
244 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
244 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], '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'] == 'translation') { |
248 | 248 | if (!is_writable('tmp')) { |
249 | 249 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
250 | 250 | $_SESSION['error'] = $error; |
251 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
252 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
251 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
252 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
253 | 253 | print json_encode($result); |
254 | 254 | } else { |
255 | 255 | include_once('class.update_db.php'); |
@@ -257,8 +257,8 @@ discard block |
||
257 | 257 | $error .= update_db::update_translation_fam(); |
258 | 258 | if ($error != '') { |
259 | 259 | $_SESSION['error'] = $error; |
260 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
261 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
260 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
261 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data')); |
|
262 | 262 | if ($_SESSION['waypoints'] == 1) { |
263 | 263 | $_SESSION['install'] = 'waypoints'; |
264 | 264 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -274,15 +274,15 @@ discard block |
||
274 | 274 | $_SESSION['install'] = 'sources'; |
275 | 275 | $_SESSION['next'] = 'Insert data in source table'; |
276 | 276 | } |
277 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
277 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
278 | 278 | print json_encode($result); |
279 | 279 | } |
280 | 280 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
281 | 281 | if (!is_writable('tmp')) { |
282 | 282 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
283 | 283 | $_SESSION['error'] = $error; |
284 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
285 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
284 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
285 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
286 | 286 | print json_encode($result); |
287 | 287 | } else { |
288 | 288 | include_once('class.update_db.php'); |
@@ -290,19 +290,19 @@ discard block |
||
290 | 290 | $error = update_db::update_owner_fam(); |
291 | 291 | if ($error != '') { |
292 | 292 | $_SESSION['error'] = $error; |
293 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
294 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
293 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
294 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data')); |
|
295 | 295 | $_SESSION['install'] = 'sources'; |
296 | 296 | $_SESSION['next'] = 'Insert data in source table'; |
297 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
297 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
298 | 298 | print json_encode($result); |
299 | 299 | } |
300 | 300 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
301 | 301 | if (!is_writable('tmp')) { |
302 | 302 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
303 | 303 | $_SESSION['error'] = $error; |
304 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
305 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
304 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
305 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
306 | 306 | print json_encode($result); |
307 | 307 | } else { |
308 | 308 | include_once('class.update_db.php'); |
@@ -311,24 +311,24 @@ discard block |
||
311 | 311 | $error .= update_db::update_notam(); |
312 | 312 | if ($error != '') { |
313 | 313 | $_SESSION['error'] = $error; |
314 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
315 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
314 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
315 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data')); |
|
316 | 316 | } else { |
317 | 317 | if ($error != '') { |
318 | 318 | $_SESSION['error'] = $error; |
319 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
|
320 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
319 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)')); |
|
320 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)')); |
|
321 | 321 | } |
322 | 322 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
323 | 323 | $_SESSION['install'] = 'owner'; |
324 | 324 | $_SESSION['next'] = 'Populate owner table'; |
325 | 325 | unset($_SESSION['owner']); |
326 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
326 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
327 | 327 | print json_encode($result); |
328 | 328 | } else { |
329 | 329 | $_SESSION['install'] = 'sources'; |
330 | 330 | $_SESSION['next'] = 'Insert data in source table'; |
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 | } |
334 | 334 | } |
@@ -365,9 +365,9 @@ discard block |
||
365 | 365 | $Source = new Source(); |
366 | 366 | $Source->deleteAllLocation(); |
367 | 367 | foreach ($sources as $src) { |
368 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
368 | + if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png'); |
|
369 | 369 | } |
370 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
370 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table')); |
|
371 | 371 | unset($_SESSION['sources']); |
372 | 372 | } |
373 | 373 | /* |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | $_SESSION['install'] = 'finish'; |
393 | 393 | $_SESSION['next'] = 'finish'; |
394 | 394 | } |
395 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
395 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
396 | 396 | print json_encode($result); |
397 | 397 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') { |
398 | 398 | include_once('../install/class.create_db.php'); |
@@ -404,48 +404,48 @@ discard block |
||
404 | 404 | $error .= update_db::update_IVAO(); |
405 | 405 | if ($error != '') { |
406 | 406 | $_SESSION['error'] = $error; |
407 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
408 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
407 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
408 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
409 | 409 | } else { |
410 | 410 | $error .= update_db::update_vatsim(); |
411 | 411 | if ($error != '') { |
412 | 412 | $_SESSION['error'] = $error; |
413 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
414 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
413 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
414 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
415 | 415 | } |
416 | 416 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
417 | 417 | $error .= update_db::update_vatsim(); |
418 | 418 | if ($error != '') { |
419 | 419 | $_SESSION['error'] = $error; |
420 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
421 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
420 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
421 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
422 | 422 | } elseif (isset($globalIVAO) && $globalIVAO) { |
423 | 423 | if (file_exists('tmp/ivae_feb2013.zip')) { |
424 | 424 | $error .= update_db::update_IVAO(); |
425 | 425 | if ($error != '') { |
426 | 426 | $_SESSION['error'] = $error; |
427 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
428 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
427 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
428 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
429 | 429 | } else { |
430 | 430 | $error .= update_db::update_vatsim(); |
431 | 431 | if ($error != '') { |
432 | 432 | $_SESSION['error'] = $error; |
433 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
|
434 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
433 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)')); |
|
434 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)')); |
|
435 | 435 | } |
436 | 436 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
437 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
|
437 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data')); |
|
438 | 438 | } |
439 | 439 | //$_SESSION['install'] = 'routes'; |
440 | 440 | //$_SESSION['next'] = 'Populate routes table with externals data'; |
441 | 441 | $_SESSION['install'] = 'finish'; |
442 | 442 | $_SESSION['next'] = 'finish'; |
443 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
443 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
444 | 444 | print json_encode($result); |
445 | 445 | } else { |
446 | 446 | //unset($_SESSION['install']); |
447 | 447 | $_SESSION['error'] = 'Unknwon task : '.$_SESSION['install']; |
448 | - $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish'); |
|
448 | + $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish'); |
|
449 | 449 | print json_encode($result); |
450 | 450 | } |
451 | 451 | ?> |
452 | 452 | \ No newline at end of file |