Completed
Push — master ( a1a065...dafbc5 )
by Yannick
24:29
created
install/class.update_schema.php 1 patch
Braces   +428 added lines, -158 removed lines patch added patch discarded remove patch
@@ -258,7 +258,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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'";
@@ -2159,8 +2287,11 @@  discard block
 block discarded – undo
2159 2287
 			if ($Connection->tableExists('aircraft')) {
2160 2288
 				if (!$Connection->tableExists('config')) {
2161 2289
 					$version = '1';
2162
-					if ($update) return self::update_from_1();
2163
-					else return $version;
2290
+					if ($update) {
2291
+						return self::update_from_1();
2292
+					} else {
2293
+						return $version;
2294
+					}
2164 2295
 				} else {
2165 2296
 					$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2166 2297
 					try {
@@ -2173,187 +2304,326 @@  discard block
 block discarded – undo
2173 2304
 					if ($update) {
2174 2305
 						if ($result['value'] == '2') {
2175 2306
 							$error = self::update_from_2();
2176
-							if ($error != '') return $error;
2177
-							else return self::check_version(true);
2307
+							if ($error != '') {
2308
+								return $error;
2309
+							} else {
2310
+								return self::check_version(true);
2311
+							}
2178 2312
 						} elseif ($result['value'] == '3') {
2179 2313
 							$error = self::update_from_3();
2180
-							if ($error != '') return $error;
2181
-							else return self::check_version(true);
2314
+							if ($error != '') {
2315
+								return $error;
2316
+							} else {
2317
+								return self::check_version(true);
2318
+							}
2182 2319
 						} elseif ($result['value'] == '4') {
2183 2320
 							$error = self::update_from_4();
2184
-							if ($error != '') return $error;
2185
-							else return self::check_version(true);
2321
+							if ($error != '') {
2322
+								return $error;
2323
+							} else {
2324
+								return self::check_version(true);
2325
+							}
2186 2326
 						} elseif ($result['value'] == '5') {
2187 2327
 							$error = self::update_from_5();
2188
-							if ($error != '') return $error;
2189
-							else return self::check_version(true);
2328
+							if ($error != '') {
2329
+								return $error;
2330
+							} else {
2331
+								return self::check_version(true);
2332
+							}
2190 2333
 						} elseif ($result['value'] == '6') {
2191 2334
 							$error = self::update_from_6();
2192
-							if ($error != '') return $error;
2193
-							else return self::check_version(true);
2335
+							if ($error != '') {
2336
+								return $error;
2337
+							} else {
2338
+								return self::check_version(true);
2339
+							}
2194 2340
 						} elseif ($result['value'] == '7') {
2195 2341
 							$error = self::update_from_7();
2196
-							if ($error != '') return $error;
2197
-							else return self::check_version(true);
2342
+							if ($error != '') {
2343
+								return $error;
2344
+							} else {
2345
+								return self::check_version(true);
2346
+							}
2198 2347
 						} elseif ($result['value'] == '8') {
2199 2348
 							$error = self::update_from_8();
2200
-							if ($error != '') return $error;
2201
-							else return self::check_version(true);
2349
+							if ($error != '') {
2350
+								return $error;
2351
+							} else {
2352
+								return self::check_version(true);
2353
+							}
2202 2354
 						} elseif ($result['value'] == '9') {
2203 2355
 							$error = self::update_from_9();
2204
-							if ($error != '') return $error;
2205
-							else return self::check_version(true);
2356
+							if ($error != '') {
2357
+								return $error;
2358
+							} else {
2359
+								return self::check_version(true);
2360
+							}
2206 2361
 						} elseif ($result['value'] == '10') {
2207 2362
 							$error = self::update_from_10();
2208
-							if ($error != '') return $error;
2209
-							else return self::check_version(true);
2363
+							if ($error != '') {
2364
+								return $error;
2365
+							} else {
2366
+								return self::check_version(true);
2367
+							}
2210 2368
 						} elseif ($result['value'] == '11') {
2211 2369
 							$error = self::update_from_11();
2212
-							if ($error != '') return $error;
2213
-							else return self::check_version(true);
2370
+							if ($error != '') {
2371
+								return $error;
2372
+							} else {
2373
+								return self::check_version(true);
2374
+							}
2214 2375
 						} elseif ($result['value'] == '12') {
2215 2376
 							$error = self::update_from_12();
2216
-							if ($error != '') return $error;
2217
-							else return self::check_version(true);
2377
+							if ($error != '') {
2378
+								return $error;
2379
+							} else {
2380
+								return self::check_version(true);
2381
+							}
2218 2382
 						} elseif ($result['value'] == '13') {
2219 2383
 							$error = self::update_from_13();
2220
-							if ($error != '') return $error;
2221
-							else return self::check_version(true);
2384
+							if ($error != '') {
2385
+								return $error;
2386
+							} else {
2387
+								return self::check_version(true);
2388
+							}
2222 2389
 						} elseif ($result['value'] == '14') {
2223 2390
 							$error = self::update_from_14();
2224
-							if ($error != '') return $error;
2225
-							else return self::check_version(true);
2391
+							if ($error != '') {
2392
+								return $error;
2393
+							} else {
2394
+								return self::check_version(true);
2395
+							}
2226 2396
 						} elseif ($result['value'] == '15') {
2227 2397
 							$error = self::update_from_15();
2228
-							if ($error != '') return $error;
2229
-							else return self::check_version(true);
2398
+							if ($error != '') {
2399
+								return $error;
2400
+							} else {
2401
+								return self::check_version(true);
2402
+							}
2230 2403
 						} elseif ($result['value'] == '16') {
2231 2404
 							$error = self::update_from_16();
2232
-							if ($error != '') return $error;
2233
-							else return self::check_version(true);
2405
+							if ($error != '') {
2406
+								return $error;
2407
+							} else {
2408
+								return self::check_version(true);
2409
+							}
2234 2410
 						} elseif ($result['value'] == '17') {
2235 2411
 							$error = self::update_from_17();
2236
-							if ($error != '') return $error;
2237
-							else return self::check_version(true);
2412
+							if ($error != '') {
2413
+								return $error;
2414
+							} else {
2415
+								return self::check_version(true);
2416
+							}
2238 2417
 						} elseif ($result['value'] == '18') {
2239 2418
 							$error = self::update_from_18();
2240
-							if ($error != '') return $error;
2241
-							else return self::check_version(true);
2419
+							if ($error != '') {
2420
+								return $error;
2421
+							} else {
2422
+								return self::check_version(true);
2423
+							}
2242 2424
 						} elseif ($result['value'] == '19') {
2243 2425
 							$error = self::update_from_19();
2244
-							if ($error != '') return $error;
2245
-							else return self::check_version(true);
2426
+							if ($error != '') {
2427
+								return $error;
2428
+							} else {
2429
+								return self::check_version(true);
2430
+							}
2246 2431
 						} elseif ($result['value'] == '20') {
2247 2432
 							$error = self::update_from_20();
2248
-							if ($error != '') return $error;
2249
-							else return self::check_version(true);
2433
+							if ($error != '') {
2434
+								return $error;
2435
+							} else {
2436
+								return self::check_version(true);
2437
+							}
2250 2438
 						} elseif ($result['value'] == '21') {
2251 2439
 							$error = self::update_from_21();
2252
-							if ($error != '') return $error;
2253
-							else return self::check_version(true);
2440
+							if ($error != '') {
2441
+								return $error;
2442
+							} else {
2443
+								return self::check_version(true);
2444
+							}
2254 2445
 						} elseif ($result['value'] == '22') {
2255 2446
 							$error = self::update_from_22();
2256
-							if ($error != '') return $error;
2257
-							else return self::check_version(true);
2447
+							if ($error != '') {
2448
+								return $error;
2449
+							} else {
2450
+								return self::check_version(true);
2451
+							}
2258 2452
 						} elseif ($result['value'] == '23') {
2259 2453
 							$error = self::update_from_23();
2260
-							if ($error != '') return $error;
2261
-							else return self::check_version(true);
2454
+							if ($error != '') {
2455
+								return $error;
2456
+							} else {
2457
+								return self::check_version(true);
2458
+							}
2262 2459
 						} elseif ($result['value'] == '24') {
2263 2460
 							$error = self::update_from_24();
2264
-							if ($error != '') return $error;
2265
-							else return self::check_version(true);
2461
+							if ($error != '') {
2462
+								return $error;
2463
+							} else {
2464
+								return self::check_version(true);
2465
+							}
2266 2466
 						} elseif ($result['value'] == '25') {
2267 2467
 							$error = self::update_from_25();
2268
-							if ($error != '') return $error;
2269
-							else return self::check_version(true);
2468
+							if ($error != '') {
2469
+								return $error;
2470
+							} else {
2471
+								return self::check_version(true);
2472
+							}
2270 2473
 						} elseif ($result['value'] == '26') {
2271 2474
 							$error = self::update_from_26();
2272
-							if ($error != '') return $error;
2273
-							else return self::check_version(true);
2475
+							if ($error != '') {
2476
+								return $error;
2477
+							} else {
2478
+								return self::check_version(true);
2479
+							}
2274 2480
 						} elseif ($result['value'] == '27') {
2275 2481
 							$error = self::update_from_27();
2276
-							if ($error != '') return $error;
2277
-							else return self::check_version(true);
2482
+							if ($error != '') {
2483
+								return $error;
2484
+							} else {
2485
+								return self::check_version(true);
2486
+							}
2278 2487
 						} elseif ($result['value'] == '28') {
2279 2488
 							$error = self::update_from_28();
2280
-							if ($error != '') return $error;
2281
-							else return self::check_version(true);
2489
+							if ($error != '') {
2490
+								return $error;
2491
+							} else {
2492
+								return self::check_version(true);
2493
+							}
2282 2494
 						} elseif ($result['value'] == '29') {
2283 2495
 							$error = self::update_from_29();
2284
-							if ($error != '') return $error;
2285
-							else return self::check_version(true);
2496
+							if ($error != '') {
2497
+								return $error;
2498
+							} else {
2499
+								return self::check_version(true);
2500
+							}
2286 2501
 						} elseif ($result['value'] == '30') {
2287 2502
 							$error = self::update_from_30();
2288
-							if ($error != '') return $error;
2289
-							else return self::check_version(true);
2503
+							if ($error != '') {
2504
+								return $error;
2505
+							} else {
2506
+								return self::check_version(true);
2507
+							}
2290 2508
 						} elseif ($result['value'] == '31') {
2291 2509
 							$error = self::update_from_31();
2292
-							if ($error != '') return $error;
2293
-							else return self::check_version(true);
2510
+							if ($error != '') {
2511
+								return $error;
2512
+							} else {
2513
+								return self::check_version(true);
2514
+							}
2294 2515
 						} elseif ($result['value'] == '32') {
2295 2516
 							$error = self::update_from_32();
2296
-							if ($error != '') return $error;
2297
-							else return self::check_version(true);
2517
+							if ($error != '') {
2518
+								return $error;
2519
+							} else {
2520
+								return self::check_version(true);
2521
+							}
2298 2522
 						} elseif ($result['value'] == '33') {
2299 2523
 							$error = self::update_from_33();
2300
-							if ($error != '') return $error;
2301
-							else return self::check_version(true);
2524
+							if ($error != '') {
2525
+								return $error;
2526
+							} else {
2527
+								return self::check_version(true);
2528
+							}
2302 2529
 						} elseif ($result['value'] == '34') {
2303 2530
 							$error = self::update_from_34();
2304
-							if ($error != '') return $error;
2305
-							else return self::check_version(true);
2531
+							if ($error != '') {
2532
+								return $error;
2533
+							} else {
2534
+								return self::check_version(true);
2535
+							}
2306 2536
 						} elseif ($result['value'] == '35') {
2307 2537
 							$error = self::update_from_35();
2308
-							if ($error != '') return $error;
2309
-							else return self::check_version(true);
2538
+							if ($error != '') {
2539
+								return $error;
2540
+							} else {
2541
+								return self::check_version(true);
2542
+							}
2310 2543
 						} elseif ($result['value'] == '36') {
2311 2544
 							$error = self::update_from_36();
2312
-							if ($error != '') return $error;
2313
-							else return self::check_version(true);
2545
+							if ($error != '') {
2546
+								return $error;
2547
+							} else {
2548
+								return self::check_version(true);
2549
+							}
2314 2550
 						} elseif ($result['value'] == '37') {
2315 2551
 							$error = self::update_from_37();
2316
-							if ($error != '') return $error;
2317
-							else return self::check_version(true);
2552
+							if ($error != '') {
2553
+								return $error;
2554
+							} else {
2555
+								return self::check_version(true);
2556
+							}
2318 2557
 						} elseif ($result['value'] == '38') {
2319 2558
 							$error = self::update_from_38();
2320
-							if ($error != '') return $error;
2321
-							else return self::check_version(true);
2559
+							if ($error != '') {
2560
+								return $error;
2561
+							} else {
2562
+								return self::check_version(true);
2563
+							}
2322 2564
 						} elseif ($result['value'] == '39') {
2323 2565
 							$error = self::update_from_39();
2324
-							if ($error != '') return $error;
2325
-							else return self::check_version(true);
2566
+							if ($error != '') {
2567
+								return $error;
2568
+							} else {
2569
+								return self::check_version(true);
2570
+							}
2326 2571
 						} elseif ($result['value'] == '40') {
2327 2572
 							$error = self::update_from_40();
2328
-							if ($error != '') return $error;
2329
-							else return self::check_version(true);
2573
+							if ($error != '') {
2574
+								return $error;
2575
+							} else {
2576
+								return self::check_version(true);
2577
+							}
2330 2578
 						} elseif ($result['value'] == '41') {
2331 2579
 							$error = self::update_from_41();
2332
-							if ($error != '') return $error;
2333
-							else return self::check_version(true);
2580
+							if ($error != '') {
2581
+								return $error;
2582
+							} else {
2583
+								return self::check_version(true);
2584
+							}
2334 2585
 						} elseif ($result['value'] == '42') {
2335 2586
 							$error = self::update_from_42();
2336
-							if ($error != '') return $error;
2337
-							else return self::check_version(true);
2587
+							if ($error != '') {
2588
+								return $error;
2589
+							} else {
2590
+								return self::check_version(true);
2591
+							}
2338 2592
 						} elseif ($result['value'] == '43') {
2339 2593
 							$error = self::update_from_43();
2340
-							if ($error != '') return $error;
2341
-							else return self::check_version(true);
2594
+							if ($error != '') {
2595
+								return $error;
2596
+							} else {
2597
+								return self::check_version(true);
2598
+							}
2342 2599
 						} elseif ($result['value'] == '44') {
2343 2600
 							$error = self::update_from_44();
2344
-							if ($error != '') return $error;
2345
-							else return self::check_version(true);
2601
+							if ($error != '') {
2602
+								return $error;
2603
+							} else {
2604
+								return self::check_version(true);
2605
+							}
2346 2606
 						} elseif ($result['value'] == '45') {
2347 2607
 							$error = self::update_from_45();
2348
-							if ($error != '') return $error;
2349
-							else return self::check_version(true);
2350
-						} else return '';
2608
+							if ($error != '') {
2609
+								return $error;
2610
+							} else {
2611
+								return self::check_version(true);
2612
+							}
2613
+						} else {
2614
+							return '';
2615
+						}
2351 2616
 					} else {
2352
-						if (isset($result['value']) && $result['value'] != '') return $result['value'];
2353
-						else return 0;
2617
+						if (isset($result['value']) && $result['value'] != '') {
2618
+							return $result['value'];
2619
+						} else {
2620
+							return 0;
2621
+						}
2354 2622
 					}
2355 2623
 				}
2356
-			} else return $version;
2624
+			} else {
2625
+				return $version;
2626
+			}
2357 2627
 		}
2358 2628
 	}
2359 2629
 }
Please login to merge, or discard this patch.