Ysurac /
FlightAirMap
@@ -75,7 +75,9 @@ discard block |
||
| 75 | 75 | if ($error != '') { |
| 76 | 76 | $_SESSION['error'] = $error; |
| 77 | 77 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
| 78 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 78 | + } else { |
|
| 79 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 80 | + } |
|
| 79 | 81 | $_SESSION['install'] = 'database_import'; |
| 80 | 82 | $_SESSION['next'] = 'Create and import tables'; |
| 81 | 83 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -93,7 +95,9 @@ discard block |
||
| 93 | 95 | if ($error != '') { |
| 94 | 96 | $_SESSION['error'] = $error; |
| 95 | 97 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
| 96 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 98 | + } else { |
|
| 99 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 100 | + } |
|
| 97 | 101 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 98 | 102 | $_SESSION['install'] = 'populate'; |
| 99 | 103 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -107,7 +111,9 @@ discard block |
||
| 107 | 111 | $error .= $check_version; |
| 108 | 112 | $_SESSION['error'] = $error; |
| 109 | 113 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
| 110 | - if (!isset($_SESSION['next'])) $_SESSION['next'] = ''; |
|
| 114 | + if (!isset($_SESSION['next'])) { |
|
| 115 | + $_SESSION['next'] = ''; |
|
| 116 | + } |
|
| 111 | 117 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 112 | 118 | print json_encode($result); |
| 113 | 119 | } else { |
@@ -115,7 +121,9 @@ discard block |
||
| 115 | 121 | if ($error != '') { |
| 116 | 122 | $_SESSION['error'] = $error; |
| 117 | 123 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
| 118 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 124 | + } else { |
|
| 125 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 126 | + } |
|
| 119 | 127 | $_SESSION['install'] = 'sources'; |
| 120 | 128 | $_SESSION['next'] = 'Insert data in source table'; |
| 121 | 129 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -128,8 +136,10 @@ discard block |
||
| 128 | 136 | if ($error != '') { |
| 129 | 137 | $_SESSION['error'] = $error; |
| 130 | 138 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
| 131 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 132 | -/* |
|
| 139 | + } else { |
|
| 140 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 141 | + } |
|
| 142 | + /* |
|
| 133 | 143 | $_SESSION['install'] = 'airspace'; |
| 134 | 144 | $_SESSION['next'] = 'Populate airspace table'; |
| 135 | 145 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -154,7 +164,9 @@ discard block |
||
| 154 | 164 | if ($error != '') { |
| 155 | 165 | $_SESSION['error'] = $error; |
| 156 | 166 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 157 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 167 | + } else { |
|
| 168 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 169 | + } |
|
| 158 | 170 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 159 | 171 | $_SESSION['install'] = 'notam'; |
| 160 | 172 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
@@ -188,7 +200,9 @@ discard block |
||
| 188 | 200 | if ($error != '') { |
| 189 | 201 | $_SESSION['error'] = $error; |
| 190 | 202 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
| 191 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 203 | + } else { |
|
| 204 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 205 | + } |
|
| 192 | 206 | $_SESSION['install'] = 'populate_flarm'; |
| 193 | 207 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 194 | 208 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -209,18 +223,26 @@ discard block |
||
| 209 | 223 | if ($error != '') { |
| 210 | 224 | $_SESSION['error'] = $error; |
| 211 | 225 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
| 212 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 226 | + } else { |
|
| 227 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 228 | + } |
|
| 213 | 229 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 214 | 230 | $_SESSION['install'] = 'vatsim'; |
| 215 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 216 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 231 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 232 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 233 | + } else { |
|
| 234 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 235 | + } |
|
| 217 | 236 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 218 | 237 | $_SESSION['install'] = 'vatsim'; |
| 219 | 238 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 220 | 239 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 221 | 240 | $_SESSION['install'] = 'vatsim'; |
| 222 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 223 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 241 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 242 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 243 | + } else { |
|
| 244 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 245 | + } |
|
| 224 | 246 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 225 | 247 | $_SESSION['install'] = 'vatsim'; |
| 226 | 248 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -245,7 +267,9 @@ discard block |
||
| 245 | 267 | if ($error != '') { |
| 246 | 268 | $_SESSION['error'] = $error; |
| 247 | 269 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
| 248 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 270 | + } else { |
|
| 271 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 272 | + } |
|
| 249 | 273 | $_SESSION['install'] = 'translation'; |
| 250 | 274 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 251 | 275 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -265,7 +289,9 @@ discard block |
||
| 265 | 289 | if ($error != '') { |
| 266 | 290 | $_SESSION['error'] = $error; |
| 267 | 291 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
| 268 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 292 | + } else { |
|
| 293 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 294 | + } |
|
| 269 | 295 | if ($_SESSION['waypoints'] == 1) { |
| 270 | 296 | $_SESSION['install'] = 'waypoints'; |
| 271 | 297 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -300,7 +326,9 @@ discard block |
||
| 300 | 326 | if ($error != '') { |
| 301 | 327 | $_SESSION['error'] = $error; |
| 302 | 328 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
| 303 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 329 | + } else { |
|
| 330 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 331 | + } |
|
| 304 | 332 | $_SESSION['install'] = 'sources'; |
| 305 | 333 | $_SESSION['next'] = 'Insert data in source table'; |
| 306 | 334 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -321,12 +349,16 @@ discard block |
||
| 321 | 349 | if ($error != '') { |
| 322 | 350 | $_SESSION['error'] = $error; |
| 323 | 351 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
| 324 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 352 | + } else { |
|
| 353 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 354 | + } |
|
| 325 | 355 | } else { |
| 326 | 356 | if ($error != '') { |
| 327 | 357 | $_SESSION['error'] = $error; |
| 328 | 358 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
| 329 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 359 | + } else { |
|
| 360 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 361 | + } |
|
| 330 | 362 | } |
| 331 | 363 | /* |
| 332 | 364 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
@@ -376,7 +408,9 @@ discard block |
||
| 376 | 408 | $Source = new Source(); |
| 377 | 409 | $Source->deleteAllLocation(); |
| 378 | 410 | foreach ($sources as $src) { |
| 379 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 411 | + if (isset($src['latitude']) && $src['latitude'] != '') { |
|
| 412 | + $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 413 | + } |
|
| 380 | 414 | } |
| 381 | 415 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
| 382 | 416 | unset($_SESSION['sources']); |
@@ -387,15 +421,21 @@ discard block |
||
| 387 | 421 | */ |
| 388 | 422 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 389 | 423 | $_SESSION['install'] = 'vatsim'; |
| 390 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 391 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 424 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 425 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 426 | + } else { |
|
| 427 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 428 | + } |
|
| 392 | 429 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 393 | 430 | $_SESSION['install'] = 'vatsim'; |
| 394 | 431 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 395 | 432 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 396 | 433 | $_SESSION['install'] = 'vatsim'; |
| 397 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 398 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 434 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 435 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 436 | + } else { |
|
| 437 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 438 | + } |
|
| 399 | 439 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 400 | 440 | $_SESSION['install'] = 'vatsim'; |
| 401 | 441 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -416,33 +456,43 @@ discard block |
||
| 416 | 456 | if ($error != '') { |
| 417 | 457 | $_SESSION['error'] = $error; |
| 418 | 458 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 419 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 459 | + } else { |
|
| 460 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 461 | + } |
|
| 420 | 462 | } else { |
| 421 | 463 | $error .= update_db::update_vatsim(); |
| 422 | 464 | if ($error != '') { |
| 423 | 465 | $_SESSION['error'] = $error; |
| 424 | 466 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 425 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 467 | + } else { |
|
| 468 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 469 | + } |
|
| 426 | 470 | } |
| 427 | 471 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 428 | 472 | $error .= update_db::update_vatsim(); |
| 429 | 473 | if ($error != '') { |
| 430 | 474 | $_SESSION['error'] = $error; |
| 431 | 475 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 432 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 476 | + } else { |
|
| 477 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 478 | + } |
|
| 433 | 479 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 434 | 480 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 435 | 481 | $error .= update_db::update_IVAO(); |
| 436 | 482 | if ($error != '') { |
| 437 | 483 | $_SESSION['error'] = $error; |
| 438 | 484 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 439 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 485 | + } else { |
|
| 486 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 487 | + } |
|
| 440 | 488 | } else { |
| 441 | 489 | $error .= update_db::update_vatsim(); |
| 442 | 490 | if ($error != '') { |
| 443 | 491 | $_SESSION['error'] = $error; |
| 444 | 492 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
| 445 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 493 | + } else { |
|
| 494 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 495 | + } |
|
| 446 | 496 | } |
| 447 | 497 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 448 | 498 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
@@ -258,7 +258,9 @@ discard block |
||
| 258 | 258 | // Update table countries |
| 259 | 259 | if ($Connection->tableExists('airspace')) { |
| 260 | 260 | $error .= update_db::update_countries(); |
| 261 | - if ($error != '') return $error; |
|
| 261 | + if ($error != '') { |
|
| 262 | + return $error; |
|
| 263 | + } |
|
| 262 | 264 | } |
| 263 | 265 | // Update schema_version to 7 |
| 264 | 266 | $query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'"; |
@@ -314,7 +316,9 @@ discard block |
||
| 314 | 316 | $error = ''; |
| 315 | 317 | // Update table aircraft |
| 316 | 318 | $error .= create_db::import_file('../db/source_location.sql'); |
| 317 | - if ($error != '') return $error; |
|
| 319 | + if ($error != '') { |
|
| 320 | + return $error; |
|
| 321 | + } |
|
| 318 | 322 | // Update schema_version to 6 |
| 319 | 323 | $query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'"; |
| 320 | 324 | try { |
@@ -331,7 +335,9 @@ discard block |
||
| 331 | 335 | $error = ''; |
| 332 | 336 | // Update table aircraft |
| 333 | 337 | $error .= create_db::import_file('../db/notam.sql'); |
| 334 | - if ($error != '') return $error; |
|
| 338 | + if ($error != '') { |
|
| 339 | + return $error; |
|
| 340 | + } |
|
| 335 | 341 | $query = "DELETE FROM config WHERE name = 'last_update_db'; |
| 336 | 342 | INSERT INTO config (name,value) VALUES ('last_update_db',NOW()); |
| 337 | 343 | DELETE FROM config WHERE name = 'last_update_notam_db'; |
@@ -365,7 +371,9 @@ discard block |
||
| 365 | 371 | $error = ''; |
| 366 | 372 | // Update table atc |
| 367 | 373 | $error .= create_db::import_file('../db/atc.sql'); |
| 368 | - if ($error != '') return $error; |
|
| 374 | + if ($error != '') { |
|
| 375 | + return $error; |
|
| 376 | + } |
|
| 369 | 377 | |
| 370 | 378 | $query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'"; |
| 371 | 379 | try { |
@@ -389,13 +397,21 @@ discard block |
||
| 389 | 397 | $error = ''; |
| 390 | 398 | // Add tables |
| 391 | 399 | $error .= create_db::import_file('../db/aircraft_owner.sql'); |
| 392 | - if ($error != '') return $error; |
|
| 400 | + if ($error != '') { |
|
| 401 | + return $error; |
|
| 402 | + } |
|
| 393 | 403 | $error .= create_db::import_file('../db/metar.sql'); |
| 394 | - if ($error != '') return $error; |
|
| 404 | + if ($error != '') { |
|
| 405 | + return $error; |
|
| 406 | + } |
|
| 395 | 407 | $error .= create_db::import_file('../db/taf.sql'); |
| 396 | - if ($error != '') return $error; |
|
| 408 | + if ($error != '') { |
|
| 409 | + return $error; |
|
| 410 | + } |
|
| 397 | 411 | $error .= create_db::import_file('../db/airport.sql'); |
| 398 | - if ($error != '') return $error; |
|
| 412 | + if ($error != '') { |
|
| 413 | + return $error; |
|
| 414 | + } |
|
| 399 | 415 | |
| 400 | 416 | $query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'"; |
| 401 | 417 | try { |
@@ -469,19 +485,33 @@ discard block |
||
| 469 | 485 | $error = ''; |
| 470 | 486 | // Add tables |
| 471 | 487 | $error .= create_db::import_file('../db/stats.sql'); |
| 472 | - if ($error != '') return $error; |
|
| 488 | + if ($error != '') { |
|
| 489 | + return $error; |
|
| 490 | + } |
|
| 473 | 491 | $error .= create_db::import_file('../db/stats_aircraft.sql'); |
| 474 | - if ($error != '') return $error; |
|
| 492 | + if ($error != '') { |
|
| 493 | + return $error; |
|
| 494 | + } |
|
| 475 | 495 | $error .= create_db::import_file('../db/stats_airline.sql'); |
| 476 | - if ($error != '') return $error; |
|
| 496 | + if ($error != '') { |
|
| 497 | + return $error; |
|
| 498 | + } |
|
| 477 | 499 | $error .= create_db::import_file('../db/stats_airport.sql'); |
| 478 | - if ($error != '') return $error; |
|
| 500 | + if ($error != '') { |
|
| 501 | + return $error; |
|
| 502 | + } |
|
| 479 | 503 | $error .= create_db::import_file('../db/stats_owner.sql'); |
| 480 | - if ($error != '') return $error; |
|
| 504 | + if ($error != '') { |
|
| 505 | + return $error; |
|
| 506 | + } |
|
| 481 | 507 | $error .= create_db::import_file('../db/stats_pilot.sql'); |
| 482 | - if ($error != '') return $error; |
|
| 508 | + if ($error != '') { |
|
| 509 | + return $error; |
|
| 510 | + } |
|
| 483 | 511 | $error .= create_db::import_file('../db/spotter_archive_output.sql'); |
| 484 | - if ($error != '') return $error; |
|
| 512 | + if ($error != '') { |
|
| 513 | + return $error; |
|
| 514 | + } |
|
| 485 | 515 | |
| 486 | 516 | $query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'"; |
| 487 | 517 | try { |
@@ -521,7 +551,9 @@ discard block |
||
| 521 | 551 | // Add tables |
| 522 | 552 | if (!$Connection->tableExists('stats_flight')) { |
| 523 | 553 | $error .= create_db::import_file('../db/stats_flight.sql'); |
| 524 | - if ($error != '') return $error; |
|
| 554 | + if ($error != '') { |
|
| 555 | + return $error; |
|
| 556 | + } |
|
| 525 | 557 | } |
| 526 | 558 | $query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'"; |
| 527 | 559 | try { |
@@ -545,7 +577,9 @@ discard block |
||
| 545 | 577 | } catch(PDOException $e) { |
| 546 | 578 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 579 | } |
| 548 | - if ($error != '') return $error; |
|
| 580 | + if ($error != '') { |
|
| 581 | + return $error; |
|
| 582 | + } |
|
| 549 | 583 | $query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'"; |
| 550 | 584 | try { |
| 551 | 585 | $sth = $Connection->db->prepare($query); |
@@ -566,7 +600,9 @@ discard block |
||
| 566 | 600 | if (!$Connection->tableExists('stats_callsign')) { |
| 567 | 601 | $error .= create_db::import_file('../db/stats_callsign.sql'); |
| 568 | 602 | } |
| 569 | - if ($error != '') return $error; |
|
| 603 | + if ($error != '') { |
|
| 604 | + return $error; |
|
| 605 | + } |
|
| 570 | 606 | $query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'"; |
| 571 | 607 | try { |
| 572 | 608 | $sth = $Connection->db->prepare($query); |
@@ -584,7 +620,9 @@ discard block |
||
| 584 | 620 | if (!$Connection->tableExists('stats_country')) { |
| 585 | 621 | $error .= create_db::import_file('../db/stats_country.sql'); |
| 586 | 622 | } |
| 587 | - if ($error != '') return $error; |
|
| 623 | + if ($error != '') { |
|
| 624 | + return $error; |
|
| 625 | + } |
|
| 588 | 626 | $query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'"; |
| 589 | 627 | try { |
| 590 | 628 | $sth = $Connection->db->prepare($query); |
@@ -607,7 +645,9 @@ discard block |
||
| 607 | 645 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 646 | } |
| 609 | 647 | } |
| 610 | - if ($error != '') return $error; |
|
| 648 | + if ($error != '') { |
|
| 649 | + return $error; |
|
| 650 | + } |
|
| 611 | 651 | $query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'"; |
| 612 | 652 | try { |
| 613 | 653 | $sth = $Connection->db->prepare($query); |
@@ -623,7 +663,9 @@ discard block |
||
| 623 | 663 | $error = ''; |
| 624 | 664 | // Update airport table |
| 625 | 665 | $error .= create_db::import_file('../db/airport.sql'); |
| 626 | - if ($error != '') return 'Import airport.sql : '.$error; |
|
| 666 | + if ($error != '') { |
|
| 667 | + return 'Import airport.sql : '.$error; |
|
| 668 | + } |
|
| 627 | 669 | // Remove primary key on Spotter_Archive |
| 628 | 670 | $query = "alter table spotter_archive drop spotter_archive_id"; |
| 629 | 671 | try { |
@@ -699,7 +741,9 @@ discard block |
||
| 699 | 741 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 742 | } |
| 701 | 743 | } |
| 702 | - if ($error != '') return $error; |
|
| 744 | + if ($error != '') { |
|
| 745 | + return $error; |
|
| 746 | + } |
|
| 703 | 747 | $query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'"; |
| 704 | 748 | try { |
| 705 | 749 | $sth = $Connection->db->prepare($query); |
@@ -717,7 +761,9 @@ discard block |
||
| 717 | 761 | // Update airline table |
| 718 | 762 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 719 | 763 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 764 | + if ($error != '') { |
|
| 765 | + return 'Import airlines.sql : '.$error; |
|
| 766 | + } |
|
| 721 | 767 | } |
| 722 | 768 | if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
| 723 | 769 | // Add column over_country |
@@ -729,7 +775,9 @@ discard block |
||
| 729 | 775 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 776 | } |
| 731 | 777 | } |
| 732 | - if ($error != '') return $error; |
|
| 778 | + if ($error != '') { |
|
| 779 | + return $error; |
|
| 780 | + } |
|
| 733 | 781 | /* |
| 734 | 782 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 735 | 783 | // Force update ModeS (this will put type_flight data |
@@ -759,7 +807,9 @@ discard block |
||
| 759 | 807 | } catch(PDOException $e) { |
| 760 | 808 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 809 | } |
| 762 | - if ($error != '') return $error; |
|
| 810 | + if ($error != '') { |
|
| 811 | + return $error; |
|
| 812 | + } |
|
| 763 | 813 | } |
| 764 | 814 | $query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'"; |
| 765 | 815 | try { |
@@ -782,7 +832,9 @@ discard block |
||
| 782 | 832 | } else { |
| 783 | 833 | $error .= create_db::import_file('../db/pgsql/stats_source.sql'); |
| 784 | 834 | } |
| 785 | - if ($error != '') return $error; |
|
| 835 | + if ($error != '') { |
|
| 836 | + return $error; |
|
| 837 | + } |
|
| 786 | 838 | } |
| 787 | 839 | $query = "UPDATE config SET value = '23' WHERE name = 'schema_version'"; |
| 788 | 840 | try { |
@@ -803,12 +855,16 @@ discard block |
||
| 803 | 855 | if ($globalDBdriver == 'mysql') { |
| 804 | 856 | if (!$Connection->tableExists('tle')) { |
| 805 | 857 | $error .= create_db::import_file('../db/tle.sql'); |
| 806 | - if ($error != '') return $error; |
|
| 858 | + if ($error != '') { |
|
| 859 | + return $error; |
|
| 860 | + } |
|
| 807 | 861 | } |
| 808 | 862 | } else { |
| 809 | 863 | if (!$Connection->tableExists('tle')) { |
| 810 | 864 | $error .= create_db::import_file('../db/pgsql/tle.sql'); |
| 811 | - if ($error != '') return $error; |
|
| 865 | + if ($error != '') { |
|
| 866 | + return $error; |
|
| 867 | + } |
|
| 812 | 868 | } |
| 813 | 869 | $query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)"; |
| 814 | 870 | try { |
@@ -848,7 +904,9 @@ discard block |
||
| 848 | 904 | } else { |
| 849 | 905 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 850 | 906 | } |
| 851 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 907 | + if ($error != '') { |
|
| 908 | + return 'Import airlines.sql : '.$error; |
|
| 909 | + } |
|
| 852 | 910 | if (!$Connection->checkColumnName('airlines','forsource')) { |
| 853 | 911 | // Add forsource to airlines |
| 854 | 912 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
@@ -1331,20 +1389,28 @@ discard block |
||
| 1331 | 1389 | } |
| 1332 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1333 | 1391 | $error .= create_db::import_file('../db/airlines.sql'); |
| 1334 | - if ($error != '') return $error; |
|
| 1392 | + if ($error != '') { |
|
| 1393 | + return $error; |
|
| 1394 | + } |
|
| 1335 | 1395 | } else { |
| 1336 | 1396 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 1337 | - if ($error != '') return $error; |
|
| 1397 | + if ($error != '') { |
|
| 1398 | + return $error; |
|
| 1399 | + } |
|
| 1338 | 1400 | } |
| 1339 | 1401 | if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) { |
| 1340 | 1402 | include_once(dirname(__FILE__).'/class.update_db.php'); |
| 1341 | 1403 | if (isset($globalVATSIM) && $globalVATSIM) { |
| 1342 | 1404 | $error .= update_db::update_vatsim(); |
| 1343 | - if ($error != '') return $error; |
|
| 1405 | + if ($error != '') { |
|
| 1406 | + return $error; |
|
| 1407 | + } |
|
| 1344 | 1408 | } |
| 1345 | 1409 | if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) { |
| 1346 | 1410 | $error .= update_db::update_IVAO(); |
| 1347 | - if ($error != '') return $error; |
|
| 1411 | + if ($error != '') { |
|
| 1412 | + return $error; |
|
| 1413 | + } |
|
| 1348 | 1414 | } |
| 1349 | 1415 | } |
| 1350 | 1416 | |
@@ -1607,41 +1673,65 @@ discard block |
||
| 1607 | 1673 | if ($globalDBdriver == 'mysql') { |
| 1608 | 1674 | if (!$Connection->tableExists('tracker_output')) { |
| 1609 | 1675 | $error .= create_db::import_file('../db/tracker_output.sql'); |
| 1610 | - if ($error != '') return $error; |
|
| 1676 | + if ($error != '') { |
|
| 1677 | + return $error; |
|
| 1678 | + } |
|
| 1611 | 1679 | } |
| 1612 | 1680 | if (!$Connection->tableExists('tracker_live')) { |
| 1613 | 1681 | $error .= create_db::import_file('../db/tracker_live.sql'); |
| 1614 | - if ($error != '') return $error; |
|
| 1682 | + if ($error != '') { |
|
| 1683 | + return $error; |
|
| 1684 | + } |
|
| 1615 | 1685 | } |
| 1616 | 1686 | if (!$Connection->tableExists('marine_output')) { |
| 1617 | 1687 | $error .= create_db::import_file('../db/marine_output.sql'); |
| 1618 | - if ($error != '') return $error; |
|
| 1688 | + if ($error != '') { |
|
| 1689 | + return $error; |
|
| 1690 | + } |
|
| 1619 | 1691 | } |
| 1620 | 1692 | if (!$Connection->tableExists('marine_live')) { |
| 1621 | 1693 | $error .= create_db::import_file('../db/marine_live.sql'); |
| 1622 | - if ($error != '') return $error; |
|
| 1694 | + if ($error != '') { |
|
| 1695 | + return $error; |
|
| 1696 | + } |
|
| 1623 | 1697 | } |
| 1624 | 1698 | if (!$Connection->tableExists('marine_identity')) { |
| 1625 | 1699 | $error .= create_db::import_file('../db/marine_identity.sql'); |
| 1626 | - if ($error != '') return $error; |
|
| 1700 | + if ($error != '') { |
|
| 1701 | + return $error; |
|
| 1702 | + } |
|
| 1627 | 1703 | } |
| 1628 | 1704 | if (!$Connection->tableExists('marine_mid')) { |
| 1629 | 1705 | $error .= create_db::import_file('../db/marine_mid.sql'); |
| 1630 | - if ($error != '') return $error; |
|
| 1706 | + if ($error != '') { |
|
| 1707 | + return $error; |
|
| 1708 | + } |
|
| 1631 | 1709 | } |
| 1632 | 1710 | } else { |
| 1633 | 1711 | $error .= create_db::import_file('../db/pgsql/tracker_output.sql'); |
| 1634 | - if ($error != '') return $error; |
|
| 1712 | + if ($error != '') { |
|
| 1713 | + return $error; |
|
| 1714 | + } |
|
| 1635 | 1715 | $error .= create_db::import_file('../db/pgsql/tracker_live.sql'); |
| 1636 | - if ($error != '') return $error; |
|
| 1716 | + if ($error != '') { |
|
| 1717 | + return $error; |
|
| 1718 | + } |
|
| 1637 | 1719 | $error .= create_db::import_file('../db/pgsql/marine_output.sql'); |
| 1638 | - if ($error != '') return $error; |
|
| 1720 | + if ($error != '') { |
|
| 1721 | + return $error; |
|
| 1722 | + } |
|
| 1639 | 1723 | $error .= create_db::import_file('../db/pgsql/marine_live.sql'); |
| 1640 | - if ($error != '') return $error; |
|
| 1724 | + if ($error != '') { |
|
| 1725 | + return $error; |
|
| 1726 | + } |
|
| 1641 | 1727 | $error .= create_db::import_file('../db/pgsql/marine_identity.sql'); |
| 1642 | - if ($error != '') return $error; |
|
| 1728 | + if ($error != '') { |
|
| 1729 | + return $error; |
|
| 1730 | + } |
|
| 1643 | 1731 | $error .= create_db::import_file('../db/pgsql/marine_mid.sql'); |
| 1644 | - if ($error != '') return $error; |
|
| 1732 | + if ($error != '') { |
|
| 1733 | + return $error; |
|
| 1734 | + } |
|
| 1645 | 1735 | } |
| 1646 | 1736 | $query = "UPDATE config SET value = '37' WHERE name = 'schema_version'"; |
| 1647 | 1737 | try { |
@@ -1660,39 +1750,61 @@ discard block |
||
| 1660 | 1750 | if ($globalDBdriver == 'mysql') { |
| 1661 | 1751 | if (!$Connection->tableExists('marine_image')) { |
| 1662 | 1752 | $error .= create_db::import_file('../db/marine_image.sql'); |
| 1663 | - if ($error != '') return $error; |
|
| 1753 | + if ($error != '') { |
|
| 1754 | + return $error; |
|
| 1755 | + } |
|
| 1664 | 1756 | } |
| 1665 | 1757 | if (!$Connection->tableExists('marine_archive')) { |
| 1666 | 1758 | $error .= create_db::import_file('../db/marine_archive.sql'); |
| 1667 | - if ($error != '') return $error; |
|
| 1759 | + if ($error != '') { |
|
| 1760 | + return $error; |
|
| 1761 | + } |
|
| 1668 | 1762 | } |
| 1669 | 1763 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1670 | 1764 | $error .= create_db::import_file('../db/marine_archive_output.sql'); |
| 1671 | - if ($error != '') return $error; |
|
| 1765 | + if ($error != '') { |
|
| 1766 | + return $error; |
|
| 1767 | + } |
|
| 1672 | 1768 | } |
| 1673 | 1769 | if (!$Connection->tableExists('tracker_archive')) { |
| 1674 | 1770 | $error .= create_db::import_file('../db/tracker_archive.sql'); |
| 1675 | - if ($error != '') return $error; |
|
| 1771 | + if ($error != '') { |
|
| 1772 | + return $error; |
|
| 1773 | + } |
|
| 1676 | 1774 | } |
| 1677 | 1775 | if (!$Connection->tableExists('tracker_archive_output')) { |
| 1678 | 1776 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1679 | - if ($error != '') return $error; |
|
| 1777 | + if ($error != '') { |
|
| 1778 | + return $error; |
|
| 1779 | + } |
|
| 1680 | 1780 | } |
| 1681 | 1781 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1682 | 1782 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1683 | - if ($error != '') return $error; |
|
| 1783 | + if ($error != '') { |
|
| 1784 | + return $error; |
|
| 1785 | + } |
|
| 1684 | 1786 | } |
| 1685 | 1787 | } else { |
| 1686 | 1788 | $error .= create_db::import_file('../db/pgsql/marine_image.sql'); |
| 1687 | - if ($error != '') return $error; |
|
| 1789 | + if ($error != '') { |
|
| 1790 | + return $error; |
|
| 1791 | + } |
|
| 1688 | 1792 | $error .= create_db::import_file('../db/pgsql/marine_archive.sql'); |
| 1689 | - if ($error != '') return $error; |
|
| 1793 | + if ($error != '') { |
|
| 1794 | + return $error; |
|
| 1795 | + } |
|
| 1690 | 1796 | $error .= create_db::import_file('../db/pgsql/marine_archive_output.sql'); |
| 1691 | - if ($error != '') return $error; |
|
| 1797 | + if ($error != '') { |
|
| 1798 | + return $error; |
|
| 1799 | + } |
|
| 1692 | 1800 | $error .= create_db::import_file('../db/pgsql/tracker_archive.sql'); |
| 1693 | - if ($error != '') return $error; |
|
| 1801 | + if ($error != '') { |
|
| 1802 | + return $error; |
|
| 1803 | + } |
|
| 1694 | 1804 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1695 | - if ($error != '') return $error; |
|
| 1805 | + if ($error != '') { |
|
| 1806 | + return $error; |
|
| 1807 | + } |
|
| 1696 | 1808 | } |
| 1697 | 1809 | if ($globalDBdriver == 'mysql') { |
| 1698 | 1810 | $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
@@ -2063,7 +2175,9 @@ discard block |
||
| 2063 | 2175 | if ($globalDBdriver == 'mysql') { |
| 2064 | 2176 | if (!$Connection->tableExists('tracker_archive_output')) { |
| 2065 | 2177 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 2066 | - if ($error != '') return $error; |
|
| 2178 | + if ($error != '') { |
|
| 2179 | + return $error; |
|
| 2180 | + } |
|
| 2067 | 2181 | } |
| 2068 | 2182 | $query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;"; |
| 2069 | 2183 | } else { |
@@ -2091,14 +2205,22 @@ discard block |
||
| 2091 | 2205 | $error = ''; |
| 2092 | 2206 | if ($globalDBdriver == 'mysql') { |
| 2093 | 2207 | $error .= create_db::import_file('../db/airport.sql'); |
| 2094 | - if ($error != '') return $error; |
|
| 2208 | + if ($error != '') { |
|
| 2209 | + return $error; |
|
| 2210 | + } |
|
| 2095 | 2211 | $error .= create_db::import_file('../db/airlines.sql'); |
| 2096 | - if ($error != '') return $error; |
|
| 2212 | + if ($error != '') { |
|
| 2213 | + return $error; |
|
| 2214 | + } |
|
| 2097 | 2215 | } else { |
| 2098 | 2216 | $error .= create_db::import_file('../db/pgsql/airport.sql'); |
| 2099 | - if ($error != '') return $error; |
|
| 2217 | + if ($error != '') { |
|
| 2218 | + return $error; |
|
| 2219 | + } |
|
| 2100 | 2220 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 2101 | - if ($error != '') return $error; |
|
| 2221 | + if ($error != '') { |
|
| 2222 | + return $error; |
|
| 2223 | + } |
|
| 2102 | 2224 | } |
| 2103 | 2225 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 2104 | 2226 | if (file_exists('tmp/ivae_feb2013.zip')) { |
@@ -2115,7 +2237,9 @@ discard block |
||
| 2115 | 2237 | $error .= update_db::update_vatsim(); |
| 2116 | 2238 | } |
| 2117 | 2239 | } |
| 2118 | - if ($error != '') return $error; |
|
| 2240 | + if ($error != '') { |
|
| 2241 | + return $error; |
|
| 2242 | + } |
|
| 2119 | 2243 | $query = "UPDATE config SET value = '45' WHERE name = 'schema_version'"; |
| 2120 | 2244 | try { |
| 2121 | 2245 | $sth = $Connection->db->prepare($query); |
@@ -2133,10 +2257,14 @@ discard block |
||
| 2133 | 2257 | if (!$Connection->tableExists('satellite')) { |
| 2134 | 2258 | if ($globalDBdriver == 'mysql') { |
| 2135 | 2259 | $error .= create_db::import_file('../db/satellite.sql'); |
| 2136 | - if ($error != '') return $error; |
|
| 2260 | + if ($error != '') { |
|
| 2261 | + return $error; |
|
| 2262 | + } |
|
| 2137 | 2263 | } else { |
| 2138 | 2264 | $error .= create_db::import_file('../db/pgsql/satellite.sql'); |
| 2139 | - if ($error != '') return $error; |
|
| 2265 | + if ($error != '') { |
|
| 2266 | + return $error; |
|
| 2267 | + } |
|
| 2140 | 2268 | } |
| 2141 | 2269 | } |
| 2142 | 2270 | $query = "UPDATE config SET value = '46' WHERE name = 'schema_version'"; |
@@ -2156,37 +2284,53 @@ discard block |
||
| 2156 | 2284 | if (!$Connection->tableExists('stats_marine')) { |
| 2157 | 2285 | if ($globalDBdriver == 'mysql') { |
| 2158 | 2286 | $error .= create_db::import_file('../db/stats_marine.sql'); |
| 2159 | - if ($error != '') return $error; |
|
| 2287 | + if ($error != '') { |
|
| 2288 | + return $error; |
|
| 2289 | + } |
|
| 2160 | 2290 | } else { |
| 2161 | 2291 | $error .= create_db::import_file('../db/pgsql/stats_marine.sql'); |
| 2162 | - if ($error != '') return $error; |
|
| 2292 | + if ($error != '') { |
|
| 2293 | + return $error; |
|
| 2294 | + } |
|
| 2163 | 2295 | } |
| 2164 | 2296 | } |
| 2165 | 2297 | if (!$Connection->tableExists('stats_marine_country')) { |
| 2166 | 2298 | if ($globalDBdriver == 'mysql') { |
| 2167 | 2299 | $error .= create_db::import_file('../db/stats_marine_country.sql'); |
| 2168 | - if ($error != '') return $error; |
|
| 2300 | + if ($error != '') { |
|
| 2301 | + return $error; |
|
| 2302 | + } |
|
| 2169 | 2303 | } else { |
| 2170 | 2304 | $error .= create_db::import_file('../db/pgsql/stats_marine_country.sql'); |
| 2171 | - if ($error != '') return $error; |
|
| 2305 | + if ($error != '') { |
|
| 2306 | + return $error; |
|
| 2307 | + } |
|
| 2172 | 2308 | } |
| 2173 | 2309 | } |
| 2174 | 2310 | if (!$Connection->tableExists('stats_tracker')) { |
| 2175 | 2311 | if ($globalDBdriver == 'mysql') { |
| 2176 | 2312 | $error .= create_db::import_file('../db/stats_tracker.sql'); |
| 2177 | - if ($error != '') return $error; |
|
| 2313 | + if ($error != '') { |
|
| 2314 | + return $error; |
|
| 2315 | + } |
|
| 2178 | 2316 | } else { |
| 2179 | 2317 | $error .= create_db::import_file('../db/pgsql/stats_tracker.sql'); |
| 2180 | - if ($error != '') return $error; |
|
| 2318 | + if ($error != '') { |
|
| 2319 | + return $error; |
|
| 2320 | + } |
|
| 2181 | 2321 | } |
| 2182 | 2322 | } |
| 2183 | 2323 | if (!$Connection->tableExists('stats_tracker_country')) { |
| 2184 | 2324 | if ($globalDBdriver == 'mysql') { |
| 2185 | 2325 | $error .= create_db::import_file('../db/stats_tracker_country.sql'); |
| 2186 | - if ($error != '') return $error; |
|
| 2326 | + if ($error != '') { |
|
| 2327 | + return $error; |
|
| 2328 | + } |
|
| 2187 | 2329 | } else { |
| 2188 | 2330 | $error .= create_db::import_file('../db/pgsql/stats_tracker_country.sql'); |
| 2189 | - if ($error != '') return $error; |
|
| 2331 | + if ($error != '') { |
|
| 2332 | + return $error; |
|
| 2333 | + } |
|
| 2190 | 2334 | } |
| 2191 | 2335 | } |
| 2192 | 2336 | $query = "UPDATE config SET value = '47' WHERE name = 'schema_version'"; |
@@ -2206,10 +2350,14 @@ discard block |
||
| 2206 | 2350 | if (!$Connection->tableExists('stats_marine_type')) { |
| 2207 | 2351 | if ($globalDBdriver == 'mysql') { |
| 2208 | 2352 | $error .= create_db::import_file('../db/stats_marine_type.sql'); |
| 2209 | - if ($error != '') return $error; |
|
| 2353 | + if ($error != '') { |
|
| 2354 | + return $error; |
|
| 2355 | + } |
|
| 2210 | 2356 | } else { |
| 2211 | 2357 | $error .= create_db::import_file('../db/pgsql/stats_marine_type.sql'); |
| 2212 | - if ($error != '') return $error; |
|
| 2358 | + if ($error != '') { |
|
| 2359 | + return $error; |
|
| 2360 | + } |
|
| 2213 | 2361 | } |
| 2214 | 2362 | } |
| 2215 | 2363 | $query = "UPDATE config SET value = '48' WHERE name = 'schema_version'"; |
@@ -2229,10 +2377,14 @@ discard block |
||
| 2229 | 2377 | if (!$Connection->tableExists('stats_tracker_type')) { |
| 2230 | 2378 | if ($globalDBdriver == 'mysql') { |
| 2231 | 2379 | $error .= create_db::import_file('../db/stats_tracker_type.sql'); |
| 2232 | - if ($error != '') return $error; |
|
| 2380 | + if ($error != '') { |
|
| 2381 | + return $error; |
|
| 2382 | + } |
|
| 2233 | 2383 | } else { |
| 2234 | 2384 | $error .= create_db::import_file('../db/pgsql/stats_tracker_type.sql'); |
| 2235 | - if ($error != '') return $error; |
|
| 2385 | + if ($error != '') { |
|
| 2386 | + return $error; |
|
| 2387 | + } |
|
| 2236 | 2388 | } |
| 2237 | 2389 | } |
| 2238 | 2390 | $query = "UPDATE config SET value = '49' WHERE name = 'schema_version'"; |
@@ -2251,10 +2403,14 @@ discard block |
||
| 2251 | 2403 | $error = ''; |
| 2252 | 2404 | if ($globalDBdriver == 'mysql') { |
| 2253 | 2405 | $error .= create_db::import_file('../db/airport.sql'); |
| 2254 | - if ($error != '') return $error; |
|
| 2406 | + if ($error != '') { |
|
| 2407 | + return $error; |
|
| 2408 | + } |
|
| 2255 | 2409 | } else { |
| 2256 | 2410 | $error .= create_db::import_file('../db/pgsql/airport.sql'); |
| 2257 | - if ($error != '') return $error; |
|
| 2411 | + if ($error != '') { |
|
| 2412 | + return $error; |
|
| 2413 | + } |
|
| 2258 | 2414 | } |
| 2259 | 2415 | $query = "UPDATE config SET value = '50' WHERE name = 'schema_version'"; |
| 2260 | 2416 | try { |
@@ -2276,8 +2432,11 @@ discard block |
||
| 2276 | 2432 | if ($Connection->tableExists('aircraft')) { |
| 2277 | 2433 | if (!$Connection->tableExists('config')) { |
| 2278 | 2434 | $version = '1'; |
| 2279 | - if ($update) return self::update_from_1(); |
|
| 2280 | - else return $version; |
|
| 2435 | + if ($update) { |
|
| 2436 | + return self::update_from_1(); |
|
| 2437 | + } else { |
|
| 2438 | + return $version; |
|
| 2439 | + } |
|
| 2281 | 2440 | } else { |
| 2282 | 2441 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 2283 | 2442 | try { |
@@ -2290,203 +2449,354 @@ discard block |
||
| 2290 | 2449 | if ($update) { |
| 2291 | 2450 | if ($result['value'] == '2') { |
| 2292 | 2451 | $error = self::update_from_2(); |
| 2293 | - if ($error != '') return $error; |
|
| 2294 | - else return self::check_version(true); |
|
| 2452 | + if ($error != '') { |
|
| 2453 | + return $error; |
|
| 2454 | + } else { |
|
| 2455 | + return self::check_version(true); |
|
| 2456 | + } |
|
| 2295 | 2457 | } elseif ($result['value'] == '3') { |
| 2296 | 2458 | $error = self::update_from_3(); |
| 2297 | - if ($error != '') return $error; |
|
| 2298 | - else return self::check_version(true); |
|
| 2459 | + if ($error != '') { |
|
| 2460 | + return $error; |
|
| 2461 | + } else { |
|
| 2462 | + return self::check_version(true); |
|
| 2463 | + } |
|
| 2299 | 2464 | } elseif ($result['value'] == '4') { |
| 2300 | 2465 | $error = self::update_from_4(); |
| 2301 | - if ($error != '') return $error; |
|
| 2302 | - else return self::check_version(true); |
|
| 2466 | + if ($error != '') { |
|
| 2467 | + return $error; |
|
| 2468 | + } else { |
|
| 2469 | + return self::check_version(true); |
|
| 2470 | + } |
|
| 2303 | 2471 | } elseif ($result['value'] == '5') { |
| 2304 | 2472 | $error = self::update_from_5(); |
| 2305 | - if ($error != '') return $error; |
|
| 2306 | - else return self::check_version(true); |
|
| 2473 | + if ($error != '') { |
|
| 2474 | + return $error; |
|
| 2475 | + } else { |
|
| 2476 | + return self::check_version(true); |
|
| 2477 | + } |
|
| 2307 | 2478 | } elseif ($result['value'] == '6') { |
| 2308 | 2479 | $error = self::update_from_6(); |
| 2309 | - if ($error != '') return $error; |
|
| 2310 | - else return self::check_version(true); |
|
| 2480 | + if ($error != '') { |
|
| 2481 | + return $error; |
|
| 2482 | + } else { |
|
| 2483 | + return self::check_version(true); |
|
| 2484 | + } |
|
| 2311 | 2485 | } elseif ($result['value'] == '7') { |
| 2312 | 2486 | $error = self::update_from_7(); |
| 2313 | - if ($error != '') return $error; |
|
| 2314 | - else return self::check_version(true); |
|
| 2487 | + if ($error != '') { |
|
| 2488 | + return $error; |
|
| 2489 | + } else { |
|
| 2490 | + return self::check_version(true); |
|
| 2491 | + } |
|
| 2315 | 2492 | } elseif ($result['value'] == '8') { |
| 2316 | 2493 | $error = self::update_from_8(); |
| 2317 | - if ($error != '') return $error; |
|
| 2318 | - else return self::check_version(true); |
|
| 2494 | + if ($error != '') { |
|
| 2495 | + return $error; |
|
| 2496 | + } else { |
|
| 2497 | + return self::check_version(true); |
|
| 2498 | + } |
|
| 2319 | 2499 | } elseif ($result['value'] == '9') { |
| 2320 | 2500 | $error = self::update_from_9(); |
| 2321 | - if ($error != '') return $error; |
|
| 2322 | - else return self::check_version(true); |
|
| 2501 | + if ($error != '') { |
|
| 2502 | + return $error; |
|
| 2503 | + } else { |
|
| 2504 | + return self::check_version(true); |
|
| 2505 | + } |
|
| 2323 | 2506 | } elseif ($result['value'] == '10') { |
| 2324 | 2507 | $error = self::update_from_10(); |
| 2325 | - if ($error != '') return $error; |
|
| 2326 | - else return self::check_version(true); |
|
| 2508 | + if ($error != '') { |
|
| 2509 | + return $error; |
|
| 2510 | + } else { |
|
| 2511 | + return self::check_version(true); |
|
| 2512 | + } |
|
| 2327 | 2513 | } elseif ($result['value'] == '11') { |
| 2328 | 2514 | $error = self::update_from_11(); |
| 2329 | - if ($error != '') return $error; |
|
| 2330 | - else return self::check_version(true); |
|
| 2515 | + if ($error != '') { |
|
| 2516 | + return $error; |
|
| 2517 | + } else { |
|
| 2518 | + return self::check_version(true); |
|
| 2519 | + } |
|
| 2331 | 2520 | } elseif ($result['value'] == '12') { |
| 2332 | 2521 | $error = self::update_from_12(); |
| 2333 | - if ($error != '') return $error; |
|
| 2334 | - else return self::check_version(true); |
|
| 2522 | + if ($error != '') { |
|
| 2523 | + return $error; |
|
| 2524 | + } else { |
|
| 2525 | + return self::check_version(true); |
|
| 2526 | + } |
|
| 2335 | 2527 | } elseif ($result['value'] == '13') { |
| 2336 | 2528 | $error = self::update_from_13(); |
| 2337 | - if ($error != '') return $error; |
|
| 2338 | - else return self::check_version(true); |
|
| 2529 | + if ($error != '') { |
|
| 2530 | + return $error; |
|
| 2531 | + } else { |
|
| 2532 | + return self::check_version(true); |
|
| 2533 | + } |
|
| 2339 | 2534 | } elseif ($result['value'] == '14') { |
| 2340 | 2535 | $error = self::update_from_14(); |
| 2341 | - if ($error != '') return $error; |
|
| 2342 | - else return self::check_version(true); |
|
| 2536 | + if ($error != '') { |
|
| 2537 | + return $error; |
|
| 2538 | + } else { |
|
| 2539 | + return self::check_version(true); |
|
| 2540 | + } |
|
| 2343 | 2541 | } elseif ($result['value'] == '15') { |
| 2344 | 2542 | $error = self::update_from_15(); |
| 2345 | - if ($error != '') return $error; |
|
| 2346 | - else return self::check_version(true); |
|
| 2543 | + if ($error != '') { |
|
| 2544 | + return $error; |
|
| 2545 | + } else { |
|
| 2546 | + return self::check_version(true); |
|
| 2547 | + } |
|
| 2347 | 2548 | } elseif ($result['value'] == '16') { |
| 2348 | 2549 | $error = self::update_from_16(); |
| 2349 | - if ($error != '') return $error; |
|
| 2350 | - else return self::check_version(true); |
|
| 2550 | + if ($error != '') { |
|
| 2551 | + return $error; |
|
| 2552 | + } else { |
|
| 2553 | + return self::check_version(true); |
|
| 2554 | + } |
|
| 2351 | 2555 | } elseif ($result['value'] == '17') { |
| 2352 | 2556 | $error = self::update_from_17(); |
| 2353 | - if ($error != '') return $error; |
|
| 2354 | - else return self::check_version(true); |
|
| 2557 | + if ($error != '') { |
|
| 2558 | + return $error; |
|
| 2559 | + } else { |
|
| 2560 | + return self::check_version(true); |
|
| 2561 | + } |
|
| 2355 | 2562 | } elseif ($result['value'] == '18') { |
| 2356 | 2563 | $error = self::update_from_18(); |
| 2357 | - if ($error != '') return $error; |
|
| 2358 | - else return self::check_version(true); |
|
| 2564 | + if ($error != '') { |
|
| 2565 | + return $error; |
|
| 2566 | + } else { |
|
| 2567 | + return self::check_version(true); |
|
| 2568 | + } |
|
| 2359 | 2569 | } elseif ($result['value'] == '19') { |
| 2360 | 2570 | $error = self::update_from_19(); |
| 2361 | - if ($error != '') return $error; |
|
| 2362 | - else return self::check_version(true); |
|
| 2571 | + if ($error != '') { |
|
| 2572 | + return $error; |
|
| 2573 | + } else { |
|
| 2574 | + return self::check_version(true); |
|
| 2575 | + } |
|
| 2363 | 2576 | } elseif ($result['value'] == '20') { |
| 2364 | 2577 | $error = self::update_from_20(); |
| 2365 | - if ($error != '') return $error; |
|
| 2366 | - else return self::check_version(true); |
|
| 2578 | + if ($error != '') { |
|
| 2579 | + return $error; |
|
| 2580 | + } else { |
|
| 2581 | + return self::check_version(true); |
|
| 2582 | + } |
|
| 2367 | 2583 | } elseif ($result['value'] == '21') { |
| 2368 | 2584 | $error = self::update_from_21(); |
| 2369 | - if ($error != '') return $error; |
|
| 2370 | - else return self::check_version(true); |
|
| 2585 | + if ($error != '') { |
|
| 2586 | + return $error; |
|
| 2587 | + } else { |
|
| 2588 | + return self::check_version(true); |
|
| 2589 | + } |
|
| 2371 | 2590 | } elseif ($result['value'] == '22') { |
| 2372 | 2591 | $error = self::update_from_22(); |
| 2373 | - if ($error != '') return $error; |
|
| 2374 | - else return self::check_version(true); |
|
| 2592 | + if ($error != '') { |
|
| 2593 | + return $error; |
|
| 2594 | + } else { |
|
| 2595 | + return self::check_version(true); |
|
| 2596 | + } |
|
| 2375 | 2597 | } elseif ($result['value'] == '23') { |
| 2376 | 2598 | $error = self::update_from_23(); |
| 2377 | - if ($error != '') return $error; |
|
| 2378 | - else return self::check_version(true); |
|
| 2599 | + if ($error != '') { |
|
| 2600 | + return $error; |
|
| 2601 | + } else { |
|
| 2602 | + return self::check_version(true); |
|
| 2603 | + } |
|
| 2379 | 2604 | } elseif ($result['value'] == '24') { |
| 2380 | 2605 | $error = self::update_from_24(); |
| 2381 | - if ($error != '') return $error; |
|
| 2382 | - else return self::check_version(true); |
|
| 2606 | + if ($error != '') { |
|
| 2607 | + return $error; |
|
| 2608 | + } else { |
|
| 2609 | + return self::check_version(true); |
|
| 2610 | + } |
|
| 2383 | 2611 | } elseif ($result['value'] == '25') { |
| 2384 | 2612 | $error = self::update_from_25(); |
| 2385 | - if ($error != '') return $error; |
|
| 2386 | - else return self::check_version(true); |
|
| 2613 | + if ($error != '') { |
|
| 2614 | + return $error; |
|
| 2615 | + } else { |
|
| 2616 | + return self::check_version(true); |
|
| 2617 | + } |
|
| 2387 | 2618 | } elseif ($result['value'] == '26') { |
| 2388 | 2619 | $error = self::update_from_26(); |
| 2389 | - if ($error != '') return $error; |
|
| 2390 | - else return self::check_version(true); |
|
| 2620 | + if ($error != '') { |
|
| 2621 | + return $error; |
|
| 2622 | + } else { |
|
| 2623 | + return self::check_version(true); |
|
| 2624 | + } |
|
| 2391 | 2625 | } elseif ($result['value'] == '27') { |
| 2392 | 2626 | $error = self::update_from_27(); |
| 2393 | - if ($error != '') return $error; |
|
| 2394 | - else return self::check_version(true); |
|
| 2627 | + if ($error != '') { |
|
| 2628 | + return $error; |
|
| 2629 | + } else { |
|
| 2630 | + return self::check_version(true); |
|
| 2631 | + } |
|
| 2395 | 2632 | } elseif ($result['value'] == '28') { |
| 2396 | 2633 | $error = self::update_from_28(); |
| 2397 | - if ($error != '') return $error; |
|
| 2398 | - else return self::check_version(true); |
|
| 2634 | + if ($error != '') { |
|
| 2635 | + return $error; |
|
| 2636 | + } else { |
|
| 2637 | + return self::check_version(true); |
|
| 2638 | + } |
|
| 2399 | 2639 | } elseif ($result['value'] == '29') { |
| 2400 | 2640 | $error = self::update_from_29(); |
| 2401 | - if ($error != '') return $error; |
|
| 2402 | - else return self::check_version(true); |
|
| 2641 | + if ($error != '') { |
|
| 2642 | + return $error; |
|
| 2643 | + } else { |
|
| 2644 | + return self::check_version(true); |
|
| 2645 | + } |
|
| 2403 | 2646 | } elseif ($result['value'] == '30') { |
| 2404 | 2647 | $error = self::update_from_30(); |
| 2405 | - if ($error != '') return $error; |
|
| 2406 | - else return self::check_version(true); |
|
| 2648 | + if ($error != '') { |
|
| 2649 | + return $error; |
|
| 2650 | + } else { |
|
| 2651 | + return self::check_version(true); |
|
| 2652 | + } |
|
| 2407 | 2653 | } elseif ($result['value'] == '31') { |
| 2408 | 2654 | $error = self::update_from_31(); |
| 2409 | - if ($error != '') return $error; |
|
| 2410 | - else return self::check_version(true); |
|
| 2655 | + if ($error != '') { |
|
| 2656 | + return $error; |
|
| 2657 | + } else { |
|
| 2658 | + return self::check_version(true); |
|
| 2659 | + } |
|
| 2411 | 2660 | } elseif ($result['value'] == '32') { |
| 2412 | 2661 | $error = self::update_from_32(); |
| 2413 | - if ($error != '') return $error; |
|
| 2414 | - else return self::check_version(true); |
|
| 2662 | + if ($error != '') { |
|
| 2663 | + return $error; |
|
| 2664 | + } else { |
|
| 2665 | + return self::check_version(true); |
|
| 2666 | + } |
|
| 2415 | 2667 | } elseif ($result['value'] == '33') { |
| 2416 | 2668 | $error = self::update_from_33(); |
| 2417 | - if ($error != '') return $error; |
|
| 2418 | - else return self::check_version(true); |
|
| 2669 | + if ($error != '') { |
|
| 2670 | + return $error; |
|
| 2671 | + } else { |
|
| 2672 | + return self::check_version(true); |
|
| 2673 | + } |
|
| 2419 | 2674 | } elseif ($result['value'] == '34') { |
| 2420 | 2675 | $error = self::update_from_34(); |
| 2421 | - if ($error != '') return $error; |
|
| 2422 | - else return self::check_version(true); |
|
| 2676 | + if ($error != '') { |
|
| 2677 | + return $error; |
|
| 2678 | + } else { |
|
| 2679 | + return self::check_version(true); |
|
| 2680 | + } |
|
| 2423 | 2681 | } elseif ($result['value'] == '35') { |
| 2424 | 2682 | $error = self::update_from_35(); |
| 2425 | - if ($error != '') return $error; |
|
| 2426 | - else return self::check_version(true); |
|
| 2683 | + if ($error != '') { |
|
| 2684 | + return $error; |
|
| 2685 | + } else { |
|
| 2686 | + return self::check_version(true); |
|
| 2687 | + } |
|
| 2427 | 2688 | } elseif ($result['value'] == '36') { |
| 2428 | 2689 | $error = self::update_from_36(); |
| 2429 | - if ($error != '') return $error; |
|
| 2430 | - else return self::check_version(true); |
|
| 2690 | + if ($error != '') { |
|
| 2691 | + return $error; |
|
| 2692 | + } else { |
|
| 2693 | + return self::check_version(true); |
|
| 2694 | + } |
|
| 2431 | 2695 | } elseif ($result['value'] == '37') { |
| 2432 | 2696 | $error = self::update_from_37(); |
| 2433 | - if ($error != '') return $error; |
|
| 2434 | - else return self::check_version(true); |
|
| 2697 | + if ($error != '') { |
|
| 2698 | + return $error; |
|
| 2699 | + } else { |
|
| 2700 | + return self::check_version(true); |
|
| 2701 | + } |
|
| 2435 | 2702 | } elseif ($result['value'] == '38') { |
| 2436 | 2703 | $error = self::update_from_38(); |
| 2437 | - if ($error != '') return $error; |
|
| 2438 | - else return self::check_version(true); |
|
| 2704 | + if ($error != '') { |
|
| 2705 | + return $error; |
|
| 2706 | + } else { |
|
| 2707 | + return self::check_version(true); |
|
| 2708 | + } |
|
| 2439 | 2709 | } elseif ($result['value'] == '39') { |
| 2440 | 2710 | $error = self::update_from_39(); |
| 2441 | - if ($error != '') return $error; |
|
| 2442 | - else return self::check_version(true); |
|
| 2711 | + if ($error != '') { |
|
| 2712 | + return $error; |
|
| 2713 | + } else { |
|
| 2714 | + return self::check_version(true); |
|
| 2715 | + } |
|
| 2443 | 2716 | } elseif ($result['value'] == '40') { |
| 2444 | 2717 | $error = self::update_from_40(); |
| 2445 | - if ($error != '') return $error; |
|
| 2446 | - else return self::check_version(true); |
|
| 2718 | + if ($error != '') { |
|
| 2719 | + return $error; |
|
| 2720 | + } else { |
|
| 2721 | + return self::check_version(true); |
|
| 2722 | + } |
|
| 2447 | 2723 | } elseif ($result['value'] == '41') { |
| 2448 | 2724 | $error = self::update_from_41(); |
| 2449 | - if ($error != '') return $error; |
|
| 2450 | - else return self::check_version(true); |
|
| 2725 | + if ($error != '') { |
|
| 2726 | + return $error; |
|
| 2727 | + } else { |
|
| 2728 | + return self::check_version(true); |
|
| 2729 | + } |
|
| 2451 | 2730 | } elseif ($result['value'] == '42') { |
| 2452 | 2731 | $error = self::update_from_42(); |
| 2453 | - if ($error != '') return $error; |
|
| 2454 | - else return self::check_version(true); |
|
| 2732 | + if ($error != '') { |
|
| 2733 | + return $error; |
|
| 2734 | + } else { |
|
| 2735 | + return self::check_version(true); |
|
| 2736 | + } |
|
| 2455 | 2737 | } elseif ($result['value'] == '43') { |
| 2456 | 2738 | $error = self::update_from_43(); |
| 2457 | - if ($error != '') return $error; |
|
| 2458 | - else return self::check_version(true); |
|
| 2739 | + if ($error != '') { |
|
| 2740 | + return $error; |
|
| 2741 | + } else { |
|
| 2742 | + return self::check_version(true); |
|
| 2743 | + } |
|
| 2459 | 2744 | } elseif ($result['value'] == '44') { |
| 2460 | 2745 | $error = self::update_from_44(); |
| 2461 | - if ($error != '') return $error; |
|
| 2462 | - else return self::check_version(true); |
|
| 2746 | + if ($error != '') { |
|
| 2747 | + return $error; |
|
| 2748 | + } else { |
|
| 2749 | + return self::check_version(true); |
|
| 2750 | + } |
|
| 2463 | 2751 | } elseif ($result['value'] == '45') { |
| 2464 | 2752 | $error = self::update_from_45(); |
| 2465 | - if ($error != '') return $error; |
|
| 2466 | - else return self::check_version(true); |
|
| 2753 | + if ($error != '') { |
|
| 2754 | + return $error; |
|
| 2755 | + } else { |
|
| 2756 | + return self::check_version(true); |
|
| 2757 | + } |
|
| 2467 | 2758 | } elseif ($result['value'] == '46') { |
| 2468 | 2759 | $error = self::update_from_46(); |
| 2469 | - if ($error != '') return $error; |
|
| 2470 | - else return self::check_version(true); |
|
| 2760 | + if ($error != '') { |
|
| 2761 | + return $error; |
|
| 2762 | + } else { |
|
| 2763 | + return self::check_version(true); |
|
| 2764 | + } |
|
| 2471 | 2765 | } elseif ($result['value'] == '47') { |
| 2472 | 2766 | $error = self::update_from_47(); |
| 2473 | - if ($error != '') return $error; |
|
| 2474 | - else return self::check_version(true); |
|
| 2767 | + if ($error != '') { |
|
| 2768 | + return $error; |
|
| 2769 | + } else { |
|
| 2770 | + return self::check_version(true); |
|
| 2771 | + } |
|
| 2475 | 2772 | } elseif ($result['value'] == '48') { |
| 2476 | 2773 | $error = self::update_from_48(); |
| 2477 | - if ($error != '') return $error; |
|
| 2478 | - else return self::check_version(true); |
|
| 2774 | + if ($error != '') { |
|
| 2775 | + return $error; |
|
| 2776 | + } else { |
|
| 2777 | + return self::check_version(true); |
|
| 2778 | + } |
|
| 2479 | 2779 | } elseif ($result['value'] == '49') { |
| 2480 | 2780 | $error = self::update_from_49(); |
| 2481 | - if ($error != '') return $error; |
|
| 2482 | - else return self::check_version(true); |
|
| 2483 | - } else return ''; |
|
| 2781 | + if ($error != '') { |
|
| 2782 | + return $error; |
|
| 2783 | + } else { |
|
| 2784 | + return self::check_version(true); |
|
| 2785 | + } |
|
| 2786 | + } else { |
|
| 2787 | + return ''; |
|
| 2788 | + } |
|
| 2484 | 2789 | } else { |
| 2485 | - if (isset($result['value']) && $result['value'] != '') return $result['value']; |
|
| 2486 | - else return 0; |
|
| 2790 | + if (isset($result['value']) && $result['value'] != '') { |
|
| 2791 | + return $result['value']; |
|
| 2792 | + } else { |
|
| 2793 | + return 0; |
|
| 2794 | + } |
|
| 2487 | 2795 | } |
| 2488 | 2796 | } |
| 2489 | - } else return $version; |
|
| 2797 | + } else { |
|
| 2798 | + return $version; |
|
| 2799 | + } |
|
| 2490 | 2800 | } |
| 2491 | 2801 | } |
| 2492 | 2802 | } |
