Inspection of "Faster to fix last_seen by setting it to first see..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 898c2a...3b5bd1 )

by Yannick

created 2017-02-10 07:41 UTC

Status

Braces +277 added lines, -104 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;
+				}
 			}
 		}
 
@@ -1543,8 +1609,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";
@@ -1558,142 +1627,246 @@  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);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '34') {
     			    $error = self::update_from_34();
-    			    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
		@@ -1543,8 +1609,11 @@ discard block
		block discarded – undo
1543	1609	if ($Connection->tableExists('aircraft')) {
1544	1610	if (!$Connection->tableExists('config')) {
1545	1611	$version = '1';
1546		- if ($update) return self::update_from_1();
1547		- else return $version;
	1612	+ if ($update) {
	1613	+ return self::update_from_1();
	1614	+ } else {
	1615	+ return $version;
	1616	+ }
1548	1617	} else {
1549	1618	$Connection = new Connection();
1550	1619	$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
		@@ -1558,142 +1627,246 @@ discard block
		block discarded – undo
1558	1627	if ($update) {
1559	1628	if ($result['value'] == '2') {
1560	1629	$error = self::update_from_2();
1561		- if ($error != '') return $error;
1562		- else return self::check_version(true);
	1630	+ if ($error != '') {
	1631	+ return $error;
	1632	+ } else {
	1633	+ return self::check_version(true);
	1634	+ }
1563	1635	} elseif ($result['value'] == '3') {
1564	1636	$error = self::update_from_3();
1565		- if ($error != '') return $error;
1566		- else return self::check_version(true);
	1637	+ if ($error != '') {
	1638	+ return $error;
	1639	+ } else {
	1640	+ return self::check_version(true);
	1641	+ }
1567	1642	} elseif ($result['value'] == '4') {
1568	1643	$error = self::update_from_4();
1569		- if ($error != '') return $error;
1570		- else return self::check_version(true);
	1644	+ if ($error != '') {
	1645	+ return $error;
	1646	+ } else {
	1647	+ return self::check_version(true);
	1648	+ }
1571	1649	} elseif ($result['value'] == '5') {
1572	1650	$error = self::update_from_5();
1573		- if ($error != '') return $error;
1574		- else return self::check_version(true);
	1651	+ if ($error != '') {
	1652	+ return $error;
	1653	+ } else {
	1654	+ return self::check_version(true);
	1655	+ }
1575	1656	} elseif ($result['value'] == '6') {
1576	1657	$error = self::update_from_6();
1577		- if ($error != '') return $error;
1578		- else return self::check_version(true);
	1658	+ if ($error != '') {
	1659	+ return $error;
	1660	+ } else {
	1661	+ return self::check_version(true);
	1662	+ }
1579	1663	} elseif ($result['value'] == '7') {
1580	1664	$error = self::update_from_7();
1581		- if ($error != '') return $error;
1582		- else return self::check_version(true);
	1665	+ if ($error != '') {
	1666	+ return $error;
	1667	+ } else {
	1668	+ return self::check_version(true);
	1669	+ }
1583	1670	} elseif ($result['value'] == '8') {
1584	1671	$error = self::update_from_8();
1585		- if ($error != '') return $error;
1586		- else return self::check_version(true);
	1672	+ if ($error != '') {
	1673	+ return $error;
	1674	+ } else {
	1675	+ return self::check_version(true);
	1676	+ }
1587	1677	} elseif ($result['value'] == '9') {
1588	1678	$error = self::update_from_9();
1589		- if ($error != '') return $error;
1590		- else return self::check_version(true);
	1679	+ if ($error != '') {
	1680	+ return $error;
	1681	+ } else {
	1682	+ return self::check_version(true);
	1683	+ }
1591	1684	} elseif ($result['value'] == '10') {
1592	1685	$error = self::update_from_10();
1593		- if ($error != '') return $error;
1594		- else return self::check_version(true);
	1686	+ if ($error != '') {
	1687	+ return $error;
	1688	+ } else {
	1689	+ return self::check_version(true);
	1690	+ }
1595	1691	} elseif ($result['value'] == '11') {
1596	1692	$error = self::update_from_11();
1597		- if ($error != '') return $error;
1598		- else return self::check_version(true);
	1693	+ if ($error != '') {
	1694	+ return $error;
	1695	+ } else {
	1696	+ return self::check_version(true);
	1697	+ }
1599	1698	} elseif ($result['value'] == '12') {
1600	1699	$error = self::update_from_12();
1601		- if ($error != '') return $error;
1602		- else return self::check_version(true);
	1700	+ if ($error != '') {
	1701	+ return $error;
	1702	+ } else {
	1703	+ return self::check_version(true);
	1704	+ }
1603	1705	} elseif ($result['value'] == '13') {
1604	1706	$error = self::update_from_13();
1605		- if ($error != '') return $error;
1606		- else return self::check_version(true);
	1707	+ if ($error != '') {
	1708	+ return $error;
	1709	+ } else {
	1710	+ return self::check_version(true);
	1711	+ }
1607	1712	} elseif ($result['value'] == '14') {
1608	1713	$error = self::update_from_14();
1609		- if ($error != '') return $error;
1610		- else return self::check_version(true);
	1714	+ if ($error != '') {
	1715	+ return $error;
	1716	+ } else {
	1717	+ return self::check_version(true);
	1718	+ }
1611	1719	} elseif ($result['value'] == '15') {
1612	1720	$error = self::update_from_15();
1613		- if ($error != '') return $error;
1614		- else return self::check_version(true);
	1721	+ if ($error != '') {
	1722	+ return $error;
	1723	+ } else {
	1724	+ return self::check_version(true);
	1725	+ }
1615	1726	} elseif ($result['value'] == '16') {
1616	1727	$error = self::update_from_16();
1617		- if ($error != '') return $error;
1618		- else return self::check_version(true);
	1728	+ if ($error != '') {
	1729	+ return $error;
	1730	+ } else {
	1731	+ return self::check_version(true);
	1732	+ }
1619	1733	} elseif ($result['value'] == '17') {
1620	1734	$error = self::update_from_17();
1621		- if ($error != '') return $error;
1622		- else return self::check_version(true);
	1735	+ if ($error != '') {
	1736	+ return $error;
	1737	+ } else {
	1738	+ return self::check_version(true);
	1739	+ }
1623	1740	} elseif ($result['value'] == '18') {
1624	1741	$error = self::update_from_18();
1625		- if ($error != '') return $error;
1626		- else return self::check_version(true);
	1742	+ if ($error != '') {
	1743	+ return $error;
	1744	+ } else {
	1745	+ return self::check_version(true);
	1746	+ }
1627	1747	} elseif ($result['value'] == '19') {
1628	1748	$error = self::update_from_19();
1629		- if ($error != '') return $error;
1630		- else return self::check_version(true);
	1749	+ if ($error != '') {
	1750	+ return $error;
	1751	+ } else {
	1752	+ return self::check_version(true);
	1753	+ }
1631	1754	} elseif ($result['value'] == '20') {
1632	1755	$error = self::update_from_20();
1633		- if ($error != '') return $error;
1634		- else return self::check_version(true);
	1756	+ if ($error != '') {
	1757	+ return $error;
	1758	+ } else {
	1759	+ return self::check_version(true);
	1760	+ }
1635	1761	} elseif ($result['value'] == '21') {
1636	1762	$error = self::update_from_21();
1637		- if ($error != '') return $error;
1638		- else return self::check_version(true);
	1763	+ if ($error != '') {
	1764	+ return $error;
	1765	+ } else {
	1766	+ return self::check_version(true);
	1767	+ }
1639	1768	} elseif ($result['value'] == '22') {
1640	1769	$error = self::update_from_22();
1641		- if ($error != '') return $error;
1642		- else return self::check_version(true);
	1770	+ if ($error != '') {
	1771	+ return $error;
	1772	+ } else {
	1773	+ return self::check_version(true);
	1774	+ }
1643	1775	} elseif ($result['value'] == '23') {
1644	1776	$error = self::update_from_23();
1645		- if ($error != '') return $error;
1646		- else return self::check_version(true);
	1777	+ if ($error != '') {
	1778	+ return $error;
	1779	+ } else {
	1780	+ return self::check_version(true);
	1781	+ }
1647	1782	} elseif ($result['value'] == '24') {
1648	1783	$error = self::update_from_24();
1649		- if ($error != '') return $error;
1650		- else return self::check_version(true);
	1784	+ if ($error != '') {
	1785	+ return $error;
	1786	+ } else {
	1787	+ return self::check_version(true);
	1788	+ }
1651	1789	} elseif ($result['value'] == '25') {
1652	1790	$error = self::update_from_25();
1653		- if ($error != '') return $error;
1654		- else return self::check_version(true);
	1791	+ if ($error != '') {
	1792	+ return $error;
	1793	+ } else {
	1794	+ return self::check_version(true);
	1795	+ }
1655	1796	} elseif ($result['value'] == '26') {
1656	1797	$error = self::update_from_26();
1657		- if ($error != '') return $error;
1658		- else return self::check_version(true);
	1798	+ if ($error != '') {
	1799	+ return $error;
	1800	+ } else {
	1801	+ return self::check_version(true);
	1802	+ }
1659	1803	} elseif ($result['value'] == '27') {
1660	1804	$error = self::update_from_27();
1661		- if ($error != '') return $error;
1662		- else return self::check_version(true);
	1805	+ if ($error != '') {
	1806	+ return $error;
	1807	+ } else {
	1808	+ return self::check_version(true);
	1809	+ }
1663	1810	} elseif ($result['value'] == '28') {
1664	1811	$error = self::update_from_28();
1665		- if ($error != '') return $error;
1666		- else return self::check_version(true);
	1812	+ if ($error != '') {
	1813	+ return $error;
	1814	+ } else {
	1815	+ return self::check_version(true);
	1816	+ }
1667	1817	} elseif ($result['value'] == '29') {
1668	1818	$error = self::update_from_29();
1669		- if ($error != '') return $error;
1670		- else return self::check_version(true);
	1819	+ if ($error != '') {
	1820	+ return $error;
	1821	+ } else {
	1822	+ return self::check_version(true);
	1823	+ }
1671	1824	} elseif ($result['value'] == '30') {
1672	1825	$error = self::update_from_30();
1673		- if ($error != '') return $error;
1674		- else return self::check_version(true);
	1826	+ if ($error != '') {
	1827	+ return $error;
	1828	+ } else {
	1829	+ return self::check_version(true);
	1830	+ }
1675	1831	} elseif ($result['value'] == '31') {
1676	1832	$error = self::update_from_31();
1677		- if ($error != '') return $error;
1678		- else return self::check_version(true);
	1833	+ if ($error != '') {
	1834	+ return $error;
	1835	+ } else {
	1836	+ return self::check_version(true);
	1837	+ }
1679	1838	} elseif ($result['value'] == '32') {
1680	1839	$error = self::update_from_32();
1681		- if ($error != '') return $error;
1682		- else return self::check_version(true);
	1840	+ if ($error != '') {
	1841	+ return $error;
	1842	+ } else {
	1843	+ return self::check_version(true);
	1844	+ }
1683	1845	} elseif ($result['value'] == '33') {
1684	1846	$error = self::update_from_33();
1685		- if ($error != '') return $error;
1686		- else return self::check_version(true);
	1847	+ if ($error != '') {
	1848	+ return $error;
	1849	+ } else {
	1850	+ return self::check_version(true);
	1851	+ }
1687	1852	} elseif ($result['value'] == '34') {
1688	1853	$error = self::update_from_34();
1689		- if ($error != '') return $error;
1690		- else return self::check_version(true);
1691		- } else return '';
	1854	+ if ($error != '') {
	1855	+ return $error;
	1856	+ } else {
	1857	+ return self::check_version(true);
	1858	+ }
	1859	+ } else {
	1860	+ return '';
	1861	+ }
	1862	+ } else {
	1863	+ return $result['value'];
1692	1864	}
1693		- else return $result['value'];
1694	1865	}
1695	1866
1696		- } else return $version;
	1867	+ } else {
	1868	+ return $version;
	1869	+ }
1697	1870	}
1698	1871
1699	1872	}

Ysurac / FlightAirMap

Push — master ( 898c2a...3b5bd1 )

Status

Category

Braces +277 added lines, -104 removed lines patch added patch discarded remove patch