Inspection of "Fix" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 749c97...054a4d )

by Yannick

created 2017-02-06 19:33 UTC

Status

Braces +272 added lines, -102 removed lines patch added patch discarded remove patch

@@ -258,7 +258,9 @@  discard block
 block discarded – undo
     		// Update table countries
     		if ($Connection->tableExists('airspace')) {
     		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+		    if ($error != '') {
+		    	return $error;
+		    }
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
@@ -314,7 +316,9 @@  discard block
 block discarded – undo
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
         	try {
@@ -331,7 +335,9 @@  discard block
 block discarded – undo
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
@@ -365,7 +371,9 @@  discard block
 block discarded – undo
 		$error = '';
     		// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
         	try {
@@ -389,13 +397,21 @@  discard block
 block discarded – undo
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/metar.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/taf.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
         	try {
@@ -469,19 +485,33 @@  discard block
 block discarded – undo
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airline.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_pilot.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
         	try {
@@ -521,7 +551,9 @@  discard block
 block discarded – undo
     		// Add tables
     		if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
         	try {
@@ -545,7 +577,9 @@  discard block
 block discarded – undo
     		} catch(PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -566,7 +600,9 @@  discard block
 block discarded – undo
     		if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -584,7 +620,9 @@  discard block
 block discarded – undo
     		if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -607,7 +645,9 @@  discard block
 block discarded – undo
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -623,7 +663,9 @@  discard block
 block discarded – undo
 		$error = '';
     		// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return 'Import airport.sql : '.$error;
+		if ($error != '') {
+			return 'Import airport.sql : '.$error;
+		}
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
         	try {
@@ -699,7 +741,9 @@  discard block
 block discarded – undo
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -717,7 +761,9 @@  discard block
 block discarded – undo
     		// Update airline table
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return 'Import airlines.sql : '.$error;
+			if ($error != '') {
+				return 'Import airlines.sql : '.$error;
+			}
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
@@ -729,7 +775,9 @@  discard block
 block discarded – undo
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			// Force update ModeS (this will put type_flight data
@@ -759,7 +807,9 @@  discard block
 block discarded – undo
 			} catch(PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
         	try {
@@ -782,7 +832,9 @@  discard block
 block discarded – undo
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
         	try {
@@ -804,12 +856,16 @@  discard block
 block discarded – undo
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
 			try {
@@ -849,7 +905,9 @@  discard block
 block discarded – undo
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
-		if ($error != '') return 'Import airlines.sql : '.$error;
+		if ($error != '') {
+			return 'Import airlines.sql : '.$error;
+		}
 		if (!$Connection->checkColumnName('airlines','forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
@@ -1332,20 +1390,28 @@  discard block
 block discarded – undo
 		}
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
 			include_once(dirname(__FILE__)'/class.update_db.php');
 			if (isset($globalVATSIM) && $globalVATSIM) {
 				$error .= update_db::update_vatsim();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
 				$error .= update_db::update_IVAO();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 
@@ -1391,8 +1457,11 @@  discard block
 block discarded – undo
     	    if ($Connection->tableExists('aircraft')) {
     		if (!$Connection->tableExists('config')) {
     		    $version = '1';
-    		    if ($update) return self::update_from_1();
-    		    else return $version;
+    		    if ($update) {
+    		    	return self::update_from_1();
+    		    } else {
+    		    	return $version;
+    		    }
 		} else {
     		    $Connection = new Connection();
 		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
@@ -1406,138 +1475,239 @@  discard block
 block discarded – undo
     		    if ($update) {
     			if ($result['value'] == '2') {
     			    $error = self::update_from_2();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '3') {
     			    $error = self::update_from_3();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '4') {
     			    $error = self::update_from_4();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '5') {
     			    $error = self::update_from_5();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '6') {
     			    $error = self::update_from_6();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '7') {
     			    $error = self::update_from_7();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '8') {
     			    $error = self::update_from_8();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '9') {
     			    $error = self::update_from_9();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '10') {
     			    $error = self::update_from_10();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '11') {
     			    $error = self::update_from_11();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '12') {
     			    $error = self::update_from_12();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '13') {
     			    $error = self::update_from_13();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '14') {
     			    $error = self::update_from_14();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '15') {
     			    $error = self::update_from_15();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '16') {
     			    $error = self::update_from_16();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '17') {
     			    $error = self::update_from_17();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '18') {
     			    $error = self::update_from_18();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '19') {
     			    $error = self::update_from_19();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '20') {
     			    $error = self::update_from_20();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '21') {
     			    $error = self::update_from_21();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '22') {
     			    $error = self::update_from_22();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '23') {
     			    $error = self::update_from_23();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '24') {
     			    $error = self::update_from_24();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '25') {
     			    $error = self::update_from_25();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '26') {
     			    $error = self::update_from_26();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '27') {
     			    $error = self::update_from_27();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '28') {
     			    $error = self::update_from_28();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '29') {
     			    $error = self::update_from_29();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '30') {
     			    $error = self::update_from_30();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '31') {
     			    $error = self::update_from_31();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '32') {
     			    $error = self::update_from_32();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '33') {
     			    $error = self::update_from_33();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} else return '';
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
+    			} else {
+    				return '';
+    			}
+    		    } else {
+    		    	return $result['value'];
     		    }
-    		    else return $result['value'];
 		}
 		
-	    } else return $version;
+	    } else {
+	    	return $version;
+	    }
     	}
     	
 }

Please login to merge, or discard this 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 {
		@@ -804,12 +856,16 @@ discard block
		block discarded – undo
804	856	if ($globalDBdriver == 'mysql') {
805	857	if (!$Connection->tableExists('tle')) {
806	858	$error .= create_db::import_file('../db/tle.sql');
807		- if ($error != '') return $error;
	859	+ if ($error != '') {
	860	+ return $error;
	861	+ }
808	862	}
809	863	} else {
810	864	if (!$Connection->tableExists('tle')) {
811	865	$error .= create_db::import_file('../db/pgsql/tle.sql');
812		- if ($error != '') return $error;
	866	+ if ($error != '') {
	867	+ return $error;
	868	+ }
813	869	}
814	870	$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
815	871	try {
		@@ -849,7 +905,9 @@ discard block
		block discarded – undo
849	905	} else {
850	906	$error .= create_db::import_file('../db/pgsql/airlines.sql');
851	907	}
852		- if ($error != '') return 'Import airlines.sql : '.$error;
	908	+ if ($error != '') {
	909	+ return 'Import airlines.sql : '.$error;
	910	+ }
853	911	if (!$Connection->checkColumnName('airlines','forsource')) {
854	912	// Add forsource to airlines
855	913	$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
		@@ -1332,20 +1390,28 @@ discard block
		block discarded – undo
1332	1390	}
1333	1391	if ($globalDBdriver == 'mysql') {
1334	1392	$error .= create_db::import_file('../db/airlines.sql');
1335		- if ($error != '') return $error;
	1393	+ if ($error != '') {
	1394	+ return $error;
	1395	+ }
1336	1396	} else {
1337	1397	$error .= create_db::import_file('../db/pgsql/airlines.sql');
1338		- if ($error != '') return $error;
	1398	+ if ($error != '') {
	1399	+ return $error;
	1400	+ }
1339	1401	}
1340	1402	if ((isset($globalVATSIM) && $globalVATSIM) \|\| (isset($globalIVAO) && $globalIVAO)) {
1341	1403	include_once(dirname(__FILE__)'/class.update_db.php');
1342	1404	if (isset($globalVATSIM) && $globalVATSIM) {
1343	1405	$error .= update_db::update_vatsim();
1344		- if ($error != '') return $error;
	1406	+ if ($error != '') {
	1407	+ return $error;
	1408	+ }
1345	1409	}
1346	1410	if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
1347	1411	$error .= update_db::update_IVAO();
1348		- if ($error != '') return $error;
	1412	+ if ($error != '') {
	1413	+ return $error;
	1414	+ }
1349	1415	}
1350	1416	}
1351	1417
		@@ -1391,8 +1457,11 @@ discard block
		block discarded – undo
1391	1457	if ($Connection->tableExists('aircraft')) {
1392	1458	if (!$Connection->tableExists('config')) {
1393	1459	$version = '1';
1394		- if ($update) return self::update_from_1();
1395		- else return $version;
	1460	+ if ($update) {
	1461	+ return self::update_from_1();
	1462	+ } else {
	1463	+ return $version;
	1464	+ }
1396	1465	} else {
1397	1466	$Connection = new Connection();
1398	1467	$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
		@@ -1406,138 +1475,239 @@ discard block
		block discarded – undo
1406	1475	if ($update) {
1407	1476	if ($result['value'] == '2') {
1408	1477	$error = self::update_from_2();
1409		- if ($error != '') return $error;
1410		- else return self::check_version(true);
	1478	+ if ($error != '') {
	1479	+ return $error;
	1480	+ } else {
	1481	+ return self::check_version(true);
	1482	+ }
1411	1483	} elseif ($result['value'] == '3') {
1412	1484	$error = self::update_from_3();
1413		- if ($error != '') return $error;
1414		- else return self::check_version(true);
	1485	+ if ($error != '') {
	1486	+ return $error;
	1487	+ } else {
	1488	+ return self::check_version(true);
	1489	+ }
1415	1490	} elseif ($result['value'] == '4') {
1416	1491	$error = self::update_from_4();
1417		- if ($error != '') return $error;
1418		- else return self::check_version(true);
	1492	+ if ($error != '') {
	1493	+ return $error;
	1494	+ } else {
	1495	+ return self::check_version(true);
	1496	+ }
1419	1497	} elseif ($result['value'] == '5') {
1420	1498	$error = self::update_from_5();
1421		- if ($error != '') return $error;
1422		- else return self::check_version(true);
	1499	+ if ($error != '') {
	1500	+ return $error;
	1501	+ } else {
	1502	+ return self::check_version(true);
	1503	+ }
1423	1504	} elseif ($result['value'] == '6') {
1424	1505	$error = self::update_from_6();
1425		- if ($error != '') return $error;
1426		- else return self::check_version(true);
	1506	+ if ($error != '') {
	1507	+ return $error;
	1508	+ } else {
	1509	+ return self::check_version(true);
	1510	+ }
1427	1511	} elseif ($result['value'] == '7') {
1428	1512	$error = self::update_from_7();
1429		- if ($error != '') return $error;
1430		- else return self::check_version(true);
	1513	+ if ($error != '') {
	1514	+ return $error;
	1515	+ } else {
	1516	+ return self::check_version(true);
	1517	+ }
1431	1518	} elseif ($result['value'] == '8') {
1432	1519	$error = self::update_from_8();
1433		- if ($error != '') return $error;
1434		- else return self::check_version(true);
	1520	+ if ($error != '') {
	1521	+ return $error;
	1522	+ } else {
	1523	+ return self::check_version(true);
	1524	+ }
1435	1525	} elseif ($result['value'] == '9') {
1436	1526	$error = self::update_from_9();
1437		- if ($error != '') return $error;
1438		- else return self::check_version(true);
	1527	+ if ($error != '') {
	1528	+ return $error;
	1529	+ } else {
	1530	+ return self::check_version(true);
	1531	+ }
1439	1532	} elseif ($result['value'] == '10') {
1440	1533	$error = self::update_from_10();
1441		- if ($error != '') return $error;
1442		- else return self::check_version(true);
	1534	+ if ($error != '') {
	1535	+ return $error;
	1536	+ } else {
	1537	+ return self::check_version(true);
	1538	+ }
1443	1539	} elseif ($result['value'] == '11') {
1444	1540	$error = self::update_from_11();
1445		- if ($error != '') return $error;
1446		- else return self::check_version(true);
	1541	+ if ($error != '') {
	1542	+ return $error;
	1543	+ } else {
	1544	+ return self::check_version(true);
	1545	+ }
1447	1546	} elseif ($result['value'] == '12') {
1448	1547	$error = self::update_from_12();
1449		- if ($error != '') return $error;
1450		- else return self::check_version(true);
	1548	+ if ($error != '') {
	1549	+ return $error;
	1550	+ } else {
	1551	+ return self::check_version(true);
	1552	+ }
1451	1553	} elseif ($result['value'] == '13') {
1452	1554	$error = self::update_from_13();
1453		- if ($error != '') return $error;
1454		- else return self::check_version(true);
	1555	+ if ($error != '') {
	1556	+ return $error;
	1557	+ } else {
	1558	+ return self::check_version(true);
	1559	+ }
1455	1560	} elseif ($result['value'] == '14') {
1456	1561	$error = self::update_from_14();
1457		- if ($error != '') return $error;
1458		- else return self::check_version(true);
	1562	+ if ($error != '') {
	1563	+ return $error;
	1564	+ } else {
	1565	+ return self::check_version(true);
	1566	+ }
1459	1567	} elseif ($result['value'] == '15') {
1460	1568	$error = self::update_from_15();
1461		- if ($error != '') return $error;
1462		- else return self::check_version(true);
	1569	+ if ($error != '') {
	1570	+ return $error;
	1571	+ } else {
	1572	+ return self::check_version(true);
	1573	+ }
1463	1574	} elseif ($result['value'] == '16') {
1464	1575	$error = self::update_from_16();
1465		- if ($error != '') return $error;
1466		- else return self::check_version(true);
	1576	+ if ($error != '') {
	1577	+ return $error;
	1578	+ } else {
	1579	+ return self::check_version(true);
	1580	+ }
1467	1581	} elseif ($result['value'] == '17') {
1468	1582	$error = self::update_from_17();
1469		- if ($error != '') return $error;
1470		- else return self::check_version(true);
	1583	+ if ($error != '') {
	1584	+ return $error;
	1585	+ } else {
	1586	+ return self::check_version(true);
	1587	+ }
1471	1588	} elseif ($result['value'] == '18') {
1472	1589	$error = self::update_from_18();
1473		- if ($error != '') return $error;
1474		- else return self::check_version(true);
	1590	+ if ($error != '') {
	1591	+ return $error;
	1592	+ } else {
	1593	+ return self::check_version(true);
	1594	+ }
1475	1595	} elseif ($result['value'] == '19') {
1476	1596	$error = self::update_from_19();
1477		- if ($error != '') return $error;
1478		- else return self::check_version(true);
	1597	+ if ($error != '') {
	1598	+ return $error;
	1599	+ } else {
	1600	+ return self::check_version(true);
	1601	+ }
1479	1602	} elseif ($result['value'] == '20') {
1480	1603	$error = self::update_from_20();
1481		- if ($error != '') return $error;
1482		- else return self::check_version(true);
	1604	+ if ($error != '') {
	1605	+ return $error;
	1606	+ } else {
	1607	+ return self::check_version(true);
	1608	+ }
1483	1609	} elseif ($result['value'] == '21') {
1484	1610	$error = self::update_from_21();
1485		- if ($error != '') return $error;
1486		- else return self::check_version(true);
	1611	+ if ($error != '') {
	1612	+ return $error;
	1613	+ } else {
	1614	+ return self::check_version(true);
	1615	+ }
1487	1616	} elseif ($result['value'] == '22') {
1488	1617	$error = self::update_from_22();
1489		- if ($error != '') return $error;
1490		- else return self::check_version(true);
	1618	+ if ($error != '') {
	1619	+ return $error;
	1620	+ } else {
	1621	+ return self::check_version(true);
	1622	+ }
1491	1623	} elseif ($result['value'] == '23') {
1492	1624	$error = self::update_from_23();
1493		- if ($error != '') return $error;
1494		- else return self::check_version(true);
	1625	+ if ($error != '') {
	1626	+ return $error;
	1627	+ } else {
	1628	+ return self::check_version(true);
	1629	+ }
1495	1630	} elseif ($result['value'] == '24') {
1496	1631	$error = self::update_from_24();
1497		- if ($error != '') return $error;
1498		- else return self::check_version(true);
	1632	+ if ($error != '') {
	1633	+ return $error;
	1634	+ } else {
	1635	+ return self::check_version(true);
	1636	+ }
1499	1637	} elseif ($result['value'] == '25') {
1500	1638	$error = self::update_from_25();
1501		- if ($error != '') return $error;
1502		- else return self::check_version(true);
	1639	+ if ($error != '') {
	1640	+ return $error;
	1641	+ } else {
	1642	+ return self::check_version(true);
	1643	+ }
1503	1644	} elseif ($result['value'] == '26') {
1504	1645	$error = self::update_from_26();
1505		- if ($error != '') return $error;
1506		- else return self::check_version(true);
	1646	+ if ($error != '') {
	1647	+ return $error;
	1648	+ } else {
	1649	+ return self::check_version(true);
	1650	+ }
1507	1651	} elseif ($result['value'] == '27') {
1508	1652	$error = self::update_from_27();
1509		- if ($error != '') return $error;
1510		- else return self::check_version(true);
	1653	+ if ($error != '') {
	1654	+ return $error;
	1655	+ } else {
	1656	+ return self::check_version(true);
	1657	+ }
1511	1658	} elseif ($result['value'] == '28') {
1512	1659	$error = self::update_from_28();
1513		- if ($error != '') return $error;
1514		- else return self::check_version(true);
	1660	+ if ($error != '') {
	1661	+ return $error;
	1662	+ } else {
	1663	+ return self::check_version(true);
	1664	+ }
1515	1665	} elseif ($result['value'] == '29') {
1516	1666	$error = self::update_from_29();
1517		- if ($error != '') return $error;
1518		- else return self::check_version(true);
	1667	+ if ($error != '') {
	1668	+ return $error;
	1669	+ } else {
	1670	+ return self::check_version(true);
	1671	+ }
1519	1672	} elseif ($result['value'] == '30') {
1520	1673	$error = self::update_from_30();
1521		- if ($error != '') return $error;
1522		- else return self::check_version(true);
	1674	+ if ($error != '') {
	1675	+ return $error;
	1676	+ } else {
	1677	+ return self::check_version(true);
	1678	+ }
1523	1679	} elseif ($result['value'] == '31') {
1524	1680	$error = self::update_from_31();
1525		- if ($error != '') return $error;
1526		- else return self::check_version(true);
	1681	+ if ($error != '') {
	1682	+ return $error;
	1683	+ } else {
	1684	+ return self::check_version(true);
	1685	+ }
1527	1686	} elseif ($result['value'] == '32') {
1528	1687	$error = self::update_from_32();
1529		- if ($error != '') return $error;
1530		- else return self::check_version(true);
	1688	+ if ($error != '') {
	1689	+ return $error;
	1690	+ } else {
	1691	+ return self::check_version(true);
	1692	+ }
1531	1693	} elseif ($result['value'] == '33') {
1532	1694	$error = self::update_from_33();
1533		- if ($error != '') return $error;
1534		- else return self::check_version(true);
1535		- } else return '';
	1695	+ if ($error != '') {
	1696	+ return $error;
	1697	+ } else {
	1698	+ return self::check_version(true);
	1699	+ }
	1700	+ } else {
	1701	+ return '';
	1702	+ }
	1703	+ } else {
	1704	+ return $result['value'];
1536	1705	}
1537		- else return $result['value'];
1538	1706	}
1539	1707
1540		- } else return $version;
	1708	+ } else {
	1709	+ return $version;
	1710	+ }
1541	1711	}
1542	1712
1543	1713	}

Ysurac / FlightAirMap

Push — master ( 749c97...054a4d )

Status

Category

Braces +272 added lines, -102 removed lines patch added patch discarded remove patch