@@ -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 { |
@@ -2272,14 +2428,22 @@ discard block |
||
| 2272 | 2428 | $error = ''; |
| 2273 | 2429 | if ($globalDBdriver == 'mysql') { |
| 2274 | 2430 | $error .= create_db::import_file('../db/aircraft.sql'); |
| 2275 | - if ($error != '') return $error; |
|
| 2431 | + if ($error != '') { |
|
| 2432 | + return $error; |
|
| 2433 | + } |
|
| 2276 | 2434 | $error .= create_db::import_file('../db/aircraft_block.sql'); |
| 2277 | - if ($error != '') return $error; |
|
| 2435 | + if ($error != '') { |
|
| 2436 | + return $error; |
|
| 2437 | + } |
|
| 2278 | 2438 | } else { |
| 2279 | 2439 | $error .= create_db::import_file('../db/pgsql/aircraft.sql'); |
| 2280 | - if ($error != '') return $error; |
|
| 2440 | + if ($error != '') { |
|
| 2441 | + return $error; |
|
| 2442 | + } |
|
| 2281 | 2443 | $error .= create_db::import_file('../db/pgsql/aircraft_block.sql'); |
| 2282 | - if ($error != '') return $error; |
|
| 2444 | + if ($error != '') { |
|
| 2445 | + return $error; |
|
| 2446 | + } |
|
| 2283 | 2447 | } |
| 2284 | 2448 | $query = "UPDATE config SET value = '51' WHERE name = 'schema_version'"; |
| 2285 | 2449 | try { |
@@ -2528,10 +2692,14 @@ discard block |
||
| 2528 | 2692 | $error = ''; |
| 2529 | 2693 | if ($globalDBdriver == 'mysql') { |
| 2530 | 2694 | $error .= create_db::import_file('../db/marine_race.sql'); |
| 2531 | - if ($error != '') return $error; |
|
| 2695 | + if ($error != '') { |
|
| 2696 | + return $error; |
|
| 2697 | + } |
|
| 2532 | 2698 | } else { |
| 2533 | 2699 | $error .= create_db::import_file('../db/pgsql/marine_race.sql'); |
| 2534 | - if ($error != '') return $error; |
|
| 2700 | + if ($error != '') { |
|
| 2701 | + return $error; |
|
| 2702 | + } |
|
| 2535 | 2703 | } |
| 2536 | 2704 | $query = "UPDATE config SET value = '55' WHERE name = 'schema_version'"; |
| 2537 | 2705 | try { |
@@ -2554,8 +2722,11 @@ discard block |
||
| 2554 | 2722 | if ($Connection->tableExists('aircraft')) { |
| 2555 | 2723 | if (!$Connection->tableExists('config')) { |
| 2556 | 2724 | $version = '1'; |
| 2557 | - if ($update) return self::update_from_1(); |
|
| 2558 | - else return $version; |
|
| 2725 | + if ($update) { |
|
| 2726 | + return self::update_from_1(); |
|
| 2727 | + } else { |
|
| 2728 | + return $version; |
|
| 2729 | + } |
|
| 2559 | 2730 | } else { |
| 2560 | 2731 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 2561 | 2732 | try { |
@@ -2568,223 +2739,389 @@ discard block |
||
| 2568 | 2739 | if ($update) { |
| 2569 | 2740 | if ($result['value'] == '2') { |
| 2570 | 2741 | $error = self::update_from_2(); |
| 2571 | - if ($error != '') return $error; |
|
| 2572 | - else return self::check_version(true); |
|
| 2742 | + if ($error != '') { |
|
| 2743 | + return $error; |
|
| 2744 | + } else { |
|
| 2745 | + return self::check_version(true); |
|
| 2746 | + } |
|
| 2573 | 2747 | } elseif ($result['value'] == '3') { |
| 2574 | 2748 | $error = self::update_from_3(); |
| 2575 | - if ($error != '') return $error; |
|
| 2576 | - else return self::check_version(true); |
|
| 2749 | + if ($error != '') { |
|
| 2750 | + return $error; |
|
| 2751 | + } else { |
|
| 2752 | + return self::check_version(true); |
|
| 2753 | + } |
|
| 2577 | 2754 | } elseif ($result['value'] == '4') { |
| 2578 | 2755 | $error = self::update_from_4(); |
| 2579 | - if ($error != '') return $error; |
|
| 2580 | - else return self::check_version(true); |
|
| 2756 | + if ($error != '') { |
|
| 2757 | + return $error; |
|
| 2758 | + } else { |
|
| 2759 | + return self::check_version(true); |
|
| 2760 | + } |
|
| 2581 | 2761 | } elseif ($result['value'] == '5') { |
| 2582 | 2762 | $error = self::update_from_5(); |
| 2583 | - if ($error != '') return $error; |
|
| 2584 | - else return self::check_version(true); |
|
| 2763 | + if ($error != '') { |
|
| 2764 | + return $error; |
|
| 2765 | + } else { |
|
| 2766 | + return self::check_version(true); |
|
| 2767 | + } |
|
| 2585 | 2768 | } elseif ($result['value'] == '6') { |
| 2586 | 2769 | $error = self::update_from_6(); |
| 2587 | - if ($error != '') return $error; |
|
| 2588 | - else return self::check_version(true); |
|
| 2770 | + if ($error != '') { |
|
| 2771 | + return $error; |
|
| 2772 | + } else { |
|
| 2773 | + return self::check_version(true); |
|
| 2774 | + } |
|
| 2589 | 2775 | } elseif ($result['value'] == '7') { |
| 2590 | 2776 | $error = self::update_from_7(); |
| 2591 | - if ($error != '') return $error; |
|
| 2592 | - else return self::check_version(true); |
|
| 2777 | + if ($error != '') { |
|
| 2778 | + return $error; |
|
| 2779 | + } else { |
|
| 2780 | + return self::check_version(true); |
|
| 2781 | + } |
|
| 2593 | 2782 | } elseif ($result['value'] == '8') { |
| 2594 | 2783 | $error = self::update_from_8(); |
| 2595 | - if ($error != '') return $error; |
|
| 2596 | - else return self::check_version(true); |
|
| 2784 | + if ($error != '') { |
|
| 2785 | + return $error; |
|
| 2786 | + } else { |
|
| 2787 | + return self::check_version(true); |
|
| 2788 | + } |
|
| 2597 | 2789 | } elseif ($result['value'] == '9') { |
| 2598 | 2790 | $error = self::update_from_9(); |
| 2599 | - if ($error != '') return $error; |
|
| 2600 | - else return self::check_version(true); |
|
| 2791 | + if ($error != '') { |
|
| 2792 | + return $error; |
|
| 2793 | + } else { |
|
| 2794 | + return self::check_version(true); |
|
| 2795 | + } |
|
| 2601 | 2796 | } elseif ($result['value'] == '10') { |
| 2602 | 2797 | $error = self::update_from_10(); |
| 2603 | - if ($error != '') return $error; |
|
| 2604 | - else return self::check_version(true); |
|
| 2798 | + if ($error != '') { |
|
| 2799 | + return $error; |
|
| 2800 | + } else { |
|
| 2801 | + return self::check_version(true); |
|
| 2802 | + } |
|
| 2605 | 2803 | } elseif ($result['value'] == '11') { |
| 2606 | 2804 | $error = self::update_from_11(); |
| 2607 | - if ($error != '') return $error; |
|
| 2608 | - else return self::check_version(true); |
|
| 2805 | + if ($error != '') { |
|
| 2806 | + return $error; |
|
| 2807 | + } else { |
|
| 2808 | + return self::check_version(true); |
|
| 2809 | + } |
|
| 2609 | 2810 | } elseif ($result['value'] == '12') { |
| 2610 | 2811 | $error = self::update_from_12(); |
| 2611 | - if ($error != '') return $error; |
|
| 2612 | - else return self::check_version(true); |
|
| 2812 | + if ($error != '') { |
|
| 2813 | + return $error; |
|
| 2814 | + } else { |
|
| 2815 | + return self::check_version(true); |
|
| 2816 | + } |
|
| 2613 | 2817 | } elseif ($result['value'] == '13') { |
| 2614 | 2818 | $error = self::update_from_13(); |
| 2615 | - if ($error != '') return $error; |
|
| 2616 | - else return self::check_version(true); |
|
| 2819 | + if ($error != '') { |
|
| 2820 | + return $error; |
|
| 2821 | + } else { |
|
| 2822 | + return self::check_version(true); |
|
| 2823 | + } |
|
| 2617 | 2824 | } elseif ($result['value'] == '14') { |
| 2618 | 2825 | $error = self::update_from_14(); |
| 2619 | - if ($error != '') return $error; |
|
| 2620 | - else return self::check_version(true); |
|
| 2826 | + if ($error != '') { |
|
| 2827 | + return $error; |
|
| 2828 | + } else { |
|
| 2829 | + return self::check_version(true); |
|
| 2830 | + } |
|
| 2621 | 2831 | } elseif ($result['value'] == '15') { |
| 2622 | 2832 | $error = self::update_from_15(); |
| 2623 | - if ($error != '') return $error; |
|
| 2624 | - else return self::check_version(true); |
|
| 2833 | + if ($error != '') { |
|
| 2834 | + return $error; |
|
| 2835 | + } else { |
|
| 2836 | + return self::check_version(true); |
|
| 2837 | + } |
|
| 2625 | 2838 | } elseif ($result['value'] == '16') { |
| 2626 | 2839 | $error = self::update_from_16(); |
| 2627 | - if ($error != '') return $error; |
|
| 2628 | - else return self::check_version(true); |
|
| 2840 | + if ($error != '') { |
|
| 2841 | + return $error; |
|
| 2842 | + } else { |
|
| 2843 | + return self::check_version(true); |
|
| 2844 | + } |
|
| 2629 | 2845 | } elseif ($result['value'] == '17') { |
| 2630 | 2846 | $error = self::update_from_17(); |
| 2631 | - if ($error != '') return $error; |
|
| 2632 | - else return self::check_version(true); |
|
| 2847 | + if ($error != '') { |
|
| 2848 | + return $error; |
|
| 2849 | + } else { |
|
| 2850 | + return self::check_version(true); |
|
| 2851 | + } |
|
| 2633 | 2852 | } elseif ($result['value'] == '18') { |
| 2634 | 2853 | $error = self::update_from_18(); |
| 2635 | - if ($error != '') return $error; |
|
| 2636 | - else return self::check_version(true); |
|
| 2854 | + if ($error != '') { |
|
| 2855 | + return $error; |
|
| 2856 | + } else { |
|
| 2857 | + return self::check_version(true); |
|
| 2858 | + } |
|
| 2637 | 2859 | } elseif ($result['value'] == '19') { |
| 2638 | 2860 | $error = self::update_from_19(); |
| 2639 | - if ($error != '') return $error; |
|
| 2640 | - else return self::check_version(true); |
|
| 2861 | + if ($error != '') { |
|
| 2862 | + return $error; |
|
| 2863 | + } else { |
|
| 2864 | + return self::check_version(true); |
|
| 2865 | + } |
|
| 2641 | 2866 | } elseif ($result['value'] == '20') { |
| 2642 | 2867 | $error = self::update_from_20(); |
| 2643 | - if ($error != '') return $error; |
|
| 2644 | - else return self::check_version(true); |
|
| 2868 | + if ($error != '') { |
|
| 2869 | + return $error; |
|
| 2870 | + } else { |
|
| 2871 | + return self::check_version(true); |
|
| 2872 | + } |
|
| 2645 | 2873 | } elseif ($result['value'] == '21') { |
| 2646 | 2874 | $error = self::update_from_21(); |
| 2647 | - if ($error != '') return $error; |
|
| 2648 | - else return self::check_version(true); |
|
| 2875 | + if ($error != '') { |
|
| 2876 | + return $error; |
|
| 2877 | + } else { |
|
| 2878 | + return self::check_version(true); |
|
| 2879 | + } |
|
| 2649 | 2880 | } elseif ($result['value'] == '22') { |
| 2650 | 2881 | $error = self::update_from_22(); |
| 2651 | - if ($error != '') return $error; |
|
| 2652 | - else return self::check_version(true); |
|
| 2882 | + if ($error != '') { |
|
| 2883 | + return $error; |
|
| 2884 | + } else { |
|
| 2885 | + return self::check_version(true); |
|
| 2886 | + } |
|
| 2653 | 2887 | } elseif ($result['value'] == '23') { |
| 2654 | 2888 | $error = self::update_from_23(); |
| 2655 | - if ($error != '') return $error; |
|
| 2656 | - else return self::check_version(true); |
|
| 2889 | + if ($error != '') { |
|
| 2890 | + return $error; |
|
| 2891 | + } else { |
|
| 2892 | + return self::check_version(true); |
|
| 2893 | + } |
|
| 2657 | 2894 | } elseif ($result['value'] == '24') { |
| 2658 | 2895 | $error = self::update_from_24(); |
| 2659 | - if ($error != '') return $error; |
|
| 2660 | - else return self::check_version(true); |
|
| 2896 | + if ($error != '') { |
|
| 2897 | + return $error; |
|
| 2898 | + } else { |
|
| 2899 | + return self::check_version(true); |
|
| 2900 | + } |
|
| 2661 | 2901 | } elseif ($result['value'] == '25') { |
| 2662 | 2902 | $error = self::update_from_25(); |
| 2663 | - if ($error != '') return $error; |
|
| 2664 | - else return self::check_version(true); |
|
| 2903 | + if ($error != '') { |
|
| 2904 | + return $error; |
|
| 2905 | + } else { |
|
| 2906 | + return self::check_version(true); |
|
| 2907 | + } |
|
| 2665 | 2908 | } elseif ($result['value'] == '26') { |
| 2666 | 2909 | $error = self::update_from_26(); |
| 2667 | - if ($error != '') return $error; |
|
| 2668 | - else return self::check_version(true); |
|
| 2910 | + if ($error != '') { |
|
| 2911 | + return $error; |
|
| 2912 | + } else { |
|
| 2913 | + return self::check_version(true); |
|
| 2914 | + } |
|
| 2669 | 2915 | } elseif ($result['value'] == '27') { |
| 2670 | 2916 | $error = self::update_from_27(); |
| 2671 | - if ($error != '') return $error; |
|
| 2672 | - else return self::check_version(true); |
|
| 2917 | + if ($error != '') { |
|
| 2918 | + return $error; |
|
| 2919 | + } else { |
|
| 2920 | + return self::check_version(true); |
|
| 2921 | + } |
|
| 2673 | 2922 | } elseif ($result['value'] == '28') { |
| 2674 | 2923 | $error = self::update_from_28(); |
| 2675 | - if ($error != '') return $error; |
|
| 2676 | - else return self::check_version(true); |
|
| 2924 | + if ($error != '') { |
|
| 2925 | + return $error; |
|
| 2926 | + } else { |
|
| 2927 | + return self::check_version(true); |
|
| 2928 | + } |
|
| 2677 | 2929 | } elseif ($result['value'] == '29') { |
| 2678 | 2930 | $error = self::update_from_29(); |
| 2679 | - if ($error != '') return $error; |
|
| 2680 | - else return self::check_version(true); |
|
| 2931 | + if ($error != '') { |
|
| 2932 | + return $error; |
|
| 2933 | + } else { |
|
| 2934 | + return self::check_version(true); |
|
| 2935 | + } |
|
| 2681 | 2936 | } elseif ($result['value'] == '30') { |
| 2682 | 2937 | $error = self::update_from_30(); |
| 2683 | - if ($error != '') return $error; |
|
| 2684 | - else return self::check_version(true); |
|
| 2938 | + if ($error != '') { |
|
| 2939 | + return $error; |
|
| 2940 | + } else { |
|
| 2941 | + return self::check_version(true); |
|
| 2942 | + } |
|
| 2685 | 2943 | } elseif ($result['value'] == '31') { |
| 2686 | 2944 | $error = self::update_from_31(); |
| 2687 | - if ($error != '') return $error; |
|
| 2688 | - else return self::check_version(true); |
|
| 2945 | + if ($error != '') { |
|
| 2946 | + return $error; |
|
| 2947 | + } else { |
|
| 2948 | + return self::check_version(true); |
|
| 2949 | + } |
|
| 2689 | 2950 | } elseif ($result['value'] == '32') { |
| 2690 | 2951 | $error = self::update_from_32(); |
| 2691 | - if ($error != '') return $error; |
|
| 2692 | - else return self::check_version(true); |
|
| 2952 | + if ($error != '') { |
|
| 2953 | + return $error; |
|
| 2954 | + } else { |
|
| 2955 | + return self::check_version(true); |
|
| 2956 | + } |
|
| 2693 | 2957 | } elseif ($result['value'] == '33') { |
| 2694 | 2958 | $error = self::update_from_33(); |
| 2695 | - if ($error != '') return $error; |
|
| 2696 | - else return self::check_version(true); |
|
| 2959 | + if ($error != '') { |
|
| 2960 | + return $error; |
|
| 2961 | + } else { |
|
| 2962 | + return self::check_version(true); |
|
| 2963 | + } |
|
| 2697 | 2964 | } elseif ($result['value'] == '34') { |
| 2698 | 2965 | $error = self::update_from_34(); |
| 2699 | - if ($error != '') return $error; |
|
| 2700 | - else return self::check_version(true); |
|
| 2966 | + if ($error != '') { |
|
| 2967 | + return $error; |
|
| 2968 | + } else { |
|
| 2969 | + return self::check_version(true); |
|
| 2970 | + } |
|
| 2701 | 2971 | } elseif ($result['value'] == '35') { |
| 2702 | 2972 | $error = self::update_from_35(); |
| 2703 | - if ($error != '') return $error; |
|
| 2704 | - else return self::check_version(true); |
|
| 2973 | + if ($error != '') { |
|
| 2974 | + return $error; |
|
| 2975 | + } else { |
|
| 2976 | + return self::check_version(true); |
|
| 2977 | + } |
|
| 2705 | 2978 | } elseif ($result['value'] == '36') { |
| 2706 | 2979 | $error = self::update_from_36(); |
| 2707 | - if ($error != '') return $error; |
|
| 2708 | - else return self::check_version(true); |
|
| 2980 | + if ($error != '') { |
|
| 2981 | + return $error; |
|
| 2982 | + } else { |
|
| 2983 | + return self::check_version(true); |
|
| 2984 | + } |
|
| 2709 | 2985 | } elseif ($result['value'] == '37') { |
| 2710 | 2986 | $error = self::update_from_37(); |
| 2711 | - if ($error != '') return $error; |
|
| 2712 | - else return self::check_version(true); |
|
| 2987 | + if ($error != '') { |
|
| 2988 | + return $error; |
|
| 2989 | + } else { |
|
| 2990 | + return self::check_version(true); |
|
| 2991 | + } |
|
| 2713 | 2992 | } elseif ($result['value'] == '38') { |
| 2714 | 2993 | $error = self::update_from_38(); |
| 2715 | - if ($error != '') return $error; |
|
| 2716 | - else return self::check_version(true); |
|
| 2994 | + if ($error != '') { |
|
| 2995 | + return $error; |
|
| 2996 | + } else { |
|
| 2997 | + return self::check_version(true); |
|
| 2998 | + } |
|
| 2717 | 2999 | } elseif ($result['value'] == '39') { |
| 2718 | 3000 | $error = self::update_from_39(); |
| 2719 | - if ($error != '') return $error; |
|
| 2720 | - else return self::check_version(true); |
|
| 3001 | + if ($error != '') { |
|
| 3002 | + return $error; |
|
| 3003 | + } else { |
|
| 3004 | + return self::check_version(true); |
|
| 3005 | + } |
|
| 2721 | 3006 | } elseif ($result['value'] == '40') { |
| 2722 | 3007 | $error = self::update_from_40(); |
| 2723 | - if ($error != '') return $error; |
|
| 2724 | - else return self::check_version(true); |
|
| 3008 | + if ($error != '') { |
|
| 3009 | + return $error; |
|
| 3010 | + } else { |
|
| 3011 | + return self::check_version(true); |
|
| 3012 | + } |
|
| 2725 | 3013 | } elseif ($result['value'] == '41') { |
| 2726 | 3014 | $error = self::update_from_41(); |
| 2727 | - if ($error != '') return $error; |
|
| 2728 | - else return self::check_version(true); |
|
| 3015 | + if ($error != '') { |
|
| 3016 | + return $error; |
|
| 3017 | + } else { |
|
| 3018 | + return self::check_version(true); |
|
| 3019 | + } |
|
| 2729 | 3020 | } elseif ($result['value'] == '42') { |
| 2730 | 3021 | $error = self::update_from_42(); |
| 2731 | - if ($error != '') return $error; |
|
| 2732 | - else return self::check_version(true); |
|
| 3022 | + if ($error != '') { |
|
| 3023 | + return $error; |
|
| 3024 | + } else { |
|
| 3025 | + return self::check_version(true); |
|
| 3026 | + } |
|
| 2733 | 3027 | } elseif ($result['value'] == '43') { |
| 2734 | 3028 | $error = self::update_from_43(); |
| 2735 | - if ($error != '') return $error; |
|
| 2736 | - else return self::check_version(true); |
|
| 3029 | + if ($error != '') { |
|
| 3030 | + return $error; |
|
| 3031 | + } else { |
|
| 3032 | + return self::check_version(true); |
|
| 3033 | + } |
|
| 2737 | 3034 | } elseif ($result['value'] == '44') { |
| 2738 | 3035 | $error = self::update_from_44(); |
| 2739 | - if ($error != '') return $error; |
|
| 2740 | - else return self::check_version(true); |
|
| 3036 | + if ($error != '') { |
|
| 3037 | + return $error; |
|
| 3038 | + } else { |
|
| 3039 | + return self::check_version(true); |
|
| 3040 | + } |
|
| 2741 | 3041 | } elseif ($result['value'] == '45') { |
| 2742 | 3042 | $error = self::update_from_45(); |
| 2743 | - if ($error != '') return $error; |
|
| 2744 | - else return self::check_version(true); |
|
| 3043 | + if ($error != '') { |
|
| 3044 | + return $error; |
|
| 3045 | + } else { |
|
| 3046 | + return self::check_version(true); |
|
| 3047 | + } |
|
| 2745 | 3048 | } elseif ($result['value'] == '46') { |
| 2746 | 3049 | $error = self::update_from_46(); |
| 2747 | - if ($error != '') return $error; |
|
| 2748 | - else return self::check_version(true); |
|
| 3050 | + if ($error != '') { |
|
| 3051 | + return $error; |
|
| 3052 | + } else { |
|
| 3053 | + return self::check_version(true); |
|
| 3054 | + } |
|
| 2749 | 3055 | } elseif ($result['value'] == '47') { |
| 2750 | 3056 | $error = self::update_from_47(); |
| 2751 | - if ($error != '') return $error; |
|
| 2752 | - else return self::check_version(true); |
|
| 3057 | + if ($error != '') { |
|
| 3058 | + return $error; |
|
| 3059 | + } else { |
|
| 3060 | + return self::check_version(true); |
|
| 3061 | + } |
|
| 2753 | 3062 | } elseif ($result['value'] == '48') { |
| 2754 | 3063 | $error = self::update_from_48(); |
| 2755 | - if ($error != '') return $error; |
|
| 2756 | - else return self::check_version(true); |
|
| 3064 | + if ($error != '') { |
|
| 3065 | + return $error; |
|
| 3066 | + } else { |
|
| 3067 | + return self::check_version(true); |
|
| 3068 | + } |
|
| 2757 | 3069 | } elseif ($result['value'] == '49') { |
| 2758 | 3070 | $error = self::update_from_49(); |
| 2759 | - if ($error != '') return $error; |
|
| 2760 | - else return self::check_version(true); |
|
| 3071 | + if ($error != '') { |
|
| 3072 | + return $error; |
|
| 3073 | + } else { |
|
| 3074 | + return self::check_version(true); |
|
| 3075 | + } |
|
| 2761 | 3076 | } elseif ($result['value'] == '50') { |
| 2762 | 3077 | $error = self::update_from_50(); |
| 2763 | - if ($error != '') return $error; |
|
| 2764 | - else return self::check_version(true); |
|
| 3078 | + if ($error != '') { |
|
| 3079 | + return $error; |
|
| 3080 | + } else { |
|
| 3081 | + return self::check_version(true); |
|
| 3082 | + } |
|
| 2765 | 3083 | } elseif ($result['value'] == '51') { |
| 2766 | 3084 | $error = self::update_from_51(); |
| 2767 | - if ($error != '') return $error; |
|
| 2768 | - else return self::check_version(true); |
|
| 3085 | + if ($error != '') { |
|
| 3086 | + return $error; |
|
| 3087 | + } else { |
|
| 3088 | + return self::check_version(true); |
|
| 3089 | + } |
|
| 2769 | 3090 | } elseif ($result['value'] == '52') { |
| 2770 | 3091 | $error = self::update_from_52(); |
| 2771 | - if ($error != '') return $error; |
|
| 2772 | - else return self::check_version(true); |
|
| 3092 | + if ($error != '') { |
|
| 3093 | + return $error; |
|
| 3094 | + } else { |
|
| 3095 | + return self::check_version(true); |
|
| 3096 | + } |
|
| 2773 | 3097 | } elseif ($result['value'] == '53') { |
| 2774 | 3098 | $error = self::update_from_53(); |
| 2775 | - if ($error != '') return $error; |
|
| 2776 | - else return self::check_version(true); |
|
| 3099 | + if ($error != '') { |
|
| 3100 | + return $error; |
|
| 3101 | + } else { |
|
| 3102 | + return self::check_version(true); |
|
| 3103 | + } |
|
| 2777 | 3104 | } elseif ($result['value'] == '54') { |
| 2778 | 3105 | $error = self::update_from_54(); |
| 2779 | - if ($error != '') return $error; |
|
| 2780 | - else return self::check_version(true); |
|
| 2781 | - } else return ''; |
|
| 3106 | + if ($error != '') { |
|
| 3107 | + return $error; |
|
| 3108 | + } else { |
|
| 3109 | + return self::check_version(true); |
|
| 3110 | + } |
|
| 3111 | + } else { |
|
| 3112 | + return ''; |
|
| 3113 | + } |
|
| 2782 | 3114 | } else { |
| 2783 | - if (isset($result['value']) && $result['value'] != '') return $result['value']; |
|
| 2784 | - else return 0; |
|
| 3115 | + if (isset($result['value']) && $result['value'] != '') { |
|
| 3116 | + return $result['value']; |
|
| 3117 | + } else { |
|
| 3118 | + return 0; |
|
| 3119 | + } |
|
| 2785 | 3120 | } |
| 2786 | 3121 | } |
| 2787 | - } else return $version; |
|
| 3122 | + } else { |
|
| 3123 | + return $version; |
|
| 3124 | + } |
|
| 2788 | 3125 | } |
| 2789 | 3126 | } |
| 2790 | 3127 | } |