Completed
Push — master ( c585c5...63f6a6 )
by Yannick
32:09 queued 01:10
created
scripts/update_db.php 1 patch
Braces   +30 added lines, -11 removed lines patch added patch discarded remove patch
@@ -9,7 +9,9 @@  discard block
 block discarded – undo
9 9
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
10 10
 	exec("ps ux", $output, $result);
11 11
 	$j = 0;
12
-	foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
12
+	foreach ($output as $line) {
13
+		if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
14
+	}
13 15
 	if ($j > 1) {
14 16
 		echo "Script is already runnning...";
15 17
 		die();
@@ -29,14 +31,18 @@  discard block
 block discarded – undo
29 31
 			$update_db->update_notam();
30 32
 		}
31 33
 		$update_db->insert_last_notam_update();
32
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
34
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
35
+		echo "NOTAM are only updated once a day.\n";
36
+	}
33 37
 	if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
34 38
 		$update_db->update_all();
35 39
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
36 40
 	//	$Spotter = new Spotter();
37 41
 	//	$Spotter->updateFieldsFromOtherTables();
38 42
 		$update_db->insert_last_update();
39
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
43
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
44
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
45
+	}
40 46
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
41 47
 		echo "Check if new airspace version exist...";
42 48
 		echo $update_db->update_airspace_fam();
@@ -45,8 +51,11 @@  discard block
 block discarded – undo
45 51
 	if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) {
46 52
 		echo "Check if new geoid version exist...";
47 53
 		$error = $update_db->update_geoid_fam();
48
-		if ($error == '') $update_db->insert_last_geoid_update();
49
-		else echo $error;
54
+		if ($error == '') {
55
+			$update_db->insert_last_geoid_update();
56
+		} else {
57
+			echo $error;
58
+		}
50 59
 	}
51 60
 	if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) {
52 61
 		echo "Check if new marine identity version exist...";
@@ -64,7 +73,9 @@  discard block
 block discarded – undo
64 73
 			//echo "Done";
65 74
 		}
66 75
 		$update_db->insert_last_owner_update();
67
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
76
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
77
+		echo "Owner are only updated every 15 days.\n";
78
+	}
68 79
 
69 80
 	if ($update_db->check_last_airlines_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
70 81
 		echo "Updating airlines...\n";
@@ -72,7 +83,9 @@  discard block
 block discarded – undo
72 83
 			echo $update_db->update_airlines_fam();
73 84
 		}
74 85
 		$update_db->insert_last_airlines_update();
75
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Airlines are only updated every 15 days.\n";
86
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
87
+		echo "Airlines are only updated every 15 days.\n";
88
+	}
76 89
 
77 90
 	if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
78 91
 		require_once(dirname(__FILE__).'/../require/class.Accident.php');
@@ -81,7 +94,9 @@  discard block
 block discarded – undo
81 94
 		if ($Accident->check_last_accidents_update()) {
82 95
 			$Accident->download_update();
83 96
 			$Accident->insert_last_accidents_update();
84
-		} else echo "Accidents are updated once a day.\n";
97
+		} else {
98
+			echo "Accidents are updated once a day.\n";
99
+		}
85 100
 	}
86 101
   
87 102
 }
@@ -94,15 +109,19 @@  discard block
 block discarded – undo
94 109
 	if ($METAR->check_last_update()) {
95 110
 		$METAR->addMETARCycle();
96 111
 		$METAR->insert_last_update();
97
-	} else echo "METAR are only updated every 30 minutes.\n";
98
-}
112
+	} else {
113
+		echo "METAR are only updated every 30 minutes.\n";
114
+	}
115
+	}
99 116
 
100 117
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
101 118
 	echo "Updating schedules...";
102 119
 	//$update_db->update_oneworld();
103 120
 	$update_db->update_skyteam();
104 121
 	$update_db->insert_last_schedules_update();
105
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
122
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
123
+	echo "Schedules are only updated every 15 days.\n";
124
+}
106 125
 
107 126
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
108 127
 	echo "Updating statistics and archive old data...";
Please login to merge, or discard this patch.
install/class.update_db.php 1 patch
Braces   +1116 added lines, -387 removed lines patch added patch discarded remove patch
@@ -26,7 +26,9 @@  discard block
 block discarded – undo
26 26
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
27 27
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
28 28
 		curl_setopt($ch, CURLOPT_TIMEOUT, 20);
29
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
29
+		if ($referer != '') {
30
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
31
+		}
30 32
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
31 33
 		curl_setopt($ch, CURLOPT_FILE, $fp);
32 34
 		curl_exec($ch);
@@ -37,12 +39,16 @@  discard block
 block discarded – undo
37 39
 	public static function gunzip($in_file,$out_file_name = '') {
38 40
 		//echo $in_file.' -> '.$out_file_name."\n";
39 41
 		$buffer_size = 4096; // read 4kb at a time
40
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
42
+		if ($out_file_name == '') {
43
+			$out_file_name = str_replace('.gz', '', $in_file);
44
+		}
41 45
 		if ($in_file != '' && file_exists($in_file)) {
42 46
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
43
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
44
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
45
-			else {
47
+			if (function_exists('gzopen')) {
48
+				$file = gzopen($in_file,'rb');
49
+			} elseif (function_exists('gzopen64')) {
50
+				$file = gzopen64($in_file,'rb');
51
+			} else {
46 52
 				echo 'gzopen not available';
47 53
 				die;
48 54
 			}
@@ -63,8 +69,12 @@  discard block
 block discarded – undo
63 69
 			if ($res === TRUE) {
64 70
 				$zip->extractTo($path);
65 71
 				$zip->close();
66
-			} else return false;
67
-		} else return false;
72
+			} else {
73
+				return false;
74
+			}
75
+		} else {
76
+			return false;
77
+		}
68 78
 	}
69 79
 	
70 80
 	public static function connect_sqlite($database) {
@@ -79,7 +89,9 @@  discard block
 block discarded – undo
79 89
 	public static function retrieve_route_sqlite_to_dest($database_file) {
80 90
 		global $globalDebug, $globalTransaction;
81 91
 		//$query = 'TRUNCATE TABLE routes';
82
-		if ($globalDebug) echo " - Delete previous routes from DB -";
92
+		if ($globalDebug) {
93
+			echo " - Delete previous routes from DB -";
94
+		}
83 95
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
84 96
 		$Connection = new Connection();
85 97
 		try {
@@ -90,7 +102,9 @@  discard block
 block discarded – undo
90 102
                         return "error : ".$e->getMessage();
91 103
                 }
92 104
 
93
-    		if ($globalDebug) echo " - Add routes to DB -";
105
+    		if ($globalDebug) {
106
+    			echo " - Add routes to DB -";
107
+    		}
94 108
     		update_db::connect_sqlite($database_file);
95 109
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
96 110
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
@@ -105,15 +119,21 @@  discard block
 block discarded – undo
105 119
 		$Connection = new Connection();
106 120
 		$sth_dest = $Connection->db->prepare($query_dest);
107 121
 		try {
108
-			if ($globalTransaction) $Connection->db->beginTransaction();
122
+			if ($globalTransaction) {
123
+				$Connection->db->beginTransaction();
124
+			}
109 125
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
110 126
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 127
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
112 128
 				$sth_dest->execute($query_dest_values);
113 129
             		}
114
-			if ($globalTransaction) $Connection->db->commit();
130
+			if ($globalTransaction) {
131
+				$Connection->db->commit();
132
+			}
115 133
 		} catch(PDOException $e) {
116
-			if ($globalTransaction) $Connection->db->rollBack(); 
134
+			if ($globalTransaction) {
135
+				$Connection->db->rollBack();
136
+			}
117 137
 			return "error : ".$e->getMessage();
118 138
 		}
119 139
                 return '';
@@ -121,7 +141,9 @@  discard block
 block discarded – undo
121 141
 	public static function retrieve_route_oneworld($database_file) {
122 142
 		global $globalDebug, $globalTransaction;
123 143
 		//$query = 'TRUNCATE TABLE routes';
124
-		if ($globalDebug) echo " - Delete previous routes from DB -";
144
+		if ($globalDebug) {
145
+			echo " - Delete previous routes from DB -";
146
+		}
125 147
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
126 148
 		$Connection = new Connection();
127 149
 		try {
@@ -132,14 +154,18 @@  discard block
 block discarded – undo
132 154
                         return "error : ".$e->getMessage();
133 155
                 }
134 156
 
135
-    		if ($globalDebug) echo " - Add routes to DB -";
157
+    		if ($globalDebug) {
158
+    			echo " - Add routes to DB -";
159
+    		}
136 160
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
137 161
 		$Spotter = new Spotter();
138 162
 		if ($fh = fopen($database_file,"r")) {
139 163
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
140 164
 			$Connection = new Connection();
141 165
 			$sth_dest = $Connection->db->prepare($query_dest);
142
-			if ($globalTransaction) $Connection->db->beginTransaction();
166
+			if ($globalTransaction) {
167
+				$Connection->db->beginTransaction();
168
+			}
143 169
 			while (!feof($fh)) {
144 170
 				$line = fgetcsv($fh,9999,',');
145 171
 				if ($line[0] != '') {
@@ -148,13 +174,17 @@  discard block
 block discarded – undo
148 174
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
149 175
 							$sth_dest->execute($query_dest_values);
150 176
 						} catch(PDOException $e) {
151
-							if ($globalTransaction) $Connection->db->rollBack(); 
177
+							if ($globalTransaction) {
178
+								$Connection->db->rollBack();
179
+							}
152 180
 							return "error : ".$e->getMessage();
153 181
 						}
154 182
 					}
155 183
 				}
156 184
 			}
157
-			if ($globalTransaction) $Connection->db->commit();
185
+			if ($globalTransaction) {
186
+				$Connection->db->commit();
187
+			}
158 188
 		}
159 189
                 return '';
160 190
 	}
@@ -162,7 +192,9 @@  discard block
 block discarded – undo
162 192
 	public static function retrieve_route_skyteam($database_file) {
163 193
 		global $globalDebug, $globalTransaction;
164 194
 		//$query = 'TRUNCATE TABLE routes';
165
-		if ($globalDebug) echo " - Delete previous routes from DB -";
195
+		if ($globalDebug) {
196
+			echo " - Delete previous routes from DB -";
197
+		}
166 198
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
167 199
 		$Connection = new Connection();
168 200
 		try {
@@ -173,7 +205,9 @@  discard block
 block discarded – undo
173 205
                         return "error : ".$e->getMessage();
174 206
                 }
175 207
 
176
-    		if ($globalDebug) echo " - Add routes to DB -";
208
+    		if ($globalDebug) {
209
+    			echo " - Add routes to DB -";
210
+    		}
177 211
 
178 212
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
179 213
 		$Spotter = new Spotter();
@@ -182,7 +216,9 @@  discard block
 block discarded – undo
182 216
 			$Connection = new Connection();
183 217
 			$sth_dest = $Connection->db->prepare($query_dest);
184 218
 			try {
185
-				if ($globalTransaction) $Connection->db->beginTransaction();
219
+				if ($globalTransaction) {
220
+					$Connection->db->beginTransaction();
221
+				}
186 222
 				while (!feof($fh)) {
187 223
 					$line = fgetcsv($fh,9999,',');
188 224
 					if ($line[0] != '') {
@@ -193,9 +229,13 @@  discard block
 block discarded – undo
193 229
 						}
194 230
 					}
195 231
 				}
196
-				if ($globalTransaction) $Connection->db->commit();
232
+				if ($globalTransaction) {
233
+					$Connection->db->commit();
234
+				}
197 235
 			} catch(PDOException $e) {
198
-				if ($globalTransaction) $Connection->db->rollBack(); 
236
+				if ($globalTransaction) {
237
+					$Connection->db->rollBack();
238
+				}
199 239
 				return "error : ".$e->getMessage();
200 240
 			}
201 241
 		}
@@ -238,11 +278,16 @@  discard block
 block discarded – undo
238 278
 		$sth_dest = $Connection->db->prepare($query_dest);
239 279
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
240 280
 		try {
241
-			if ($globalTransaction) $Connection->db->beginTransaction();
281
+			if ($globalTransaction) {
282
+				$Connection->db->beginTransaction();
283
+			}
242 284
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
243 285
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
244
-				if ($values['UserString4'] == 'M') $type = 'military';
245
-				else $type = null;
286
+				if ($values['UserString4'] == 'M') {
287
+					$type = 'military';
288
+				} else {
289
+					$type = null;
290
+				}
246 291
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
247 292
 				$sth_dest->execute($query_dest_values);
248 293
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
@@ -250,7 +295,9 @@  discard block
 block discarded – undo
250 295
 				    $sth_dest_owner->execute($query_dest_owner_values);
251 296
 				}
252 297
             		}
253
-			if ($globalTransaction) $Connection->db->commit();
298
+			if ($globalTransaction) {
299
+				$Connection->db->commit();
300
+			}
254 301
 		} catch(PDOException $e) {
255 302
 			return "error : ".$e->getMessage();
256 303
 		}
@@ -287,7 +334,9 @@  discard block
 block discarded – undo
287 334
 			$Connection = new Connection();
288 335
 			$sth_dest = $Connection->db->prepare($query_dest);
289 336
 			try {
290
-				if ($globalTransaction) $Connection->db->beginTransaction();
337
+				if ($globalTransaction) {
338
+					$Connection->db->beginTransaction();
339
+				}
291 340
             			while (!feof($fh)) {
292 341
             				$values = array();
293 342
             				$line = $Common->hex2str(fgets($fh,9999));
@@ -298,7 +347,9 @@  discard block
 block discarded – undo
298 347
             				// Check if we can find ICAO, else set it to GLID
299 348
             				$aircraft_name_split = explode(' ',$aircraft_name);
300 349
             				$search_more = '';
301
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
350
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
351
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
352
+            				}
302 353
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
303 354
             				$sth_search = $Connection->db->prepare($query_search);
304 355
 					try {
@@ -311,7 +362,9 @@  discard block
 block discarded – undo
311 362
 					} catch(PDOException $e) {
312 363
 						return "error : ".$e->getMessage();
313 364
 					}
314
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
365
+					if (!isset($values['ICAOTypeCode'])) {
366
+						$values['ICAOTypeCode'] = 'GLID';
367
+					}
315 368
 					// Add data to db
316 369
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
317 370
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
@@ -320,7 +373,9 @@  discard block
 block discarded – undo
320 373
 						$sth_dest->execute($query_dest_values);
321 374
 					}
322 375
 				}
323
-				if ($globalTransaction) $Connection->db->commit();
376
+				if ($globalTransaction) {
377
+					$Connection->db->commit();
378
+				}
324 379
 			} catch(PDOException $e) {
325 380
 				return "error : ".$e->getMessage();
326 381
 			}
@@ -356,7 +411,9 @@  discard block
 block discarded – undo
356 411
 			$Connection = new Connection();
357 412
 			$sth_dest = $Connection->db->prepare($query_dest);
358 413
 			try {
359
-				if ($globalTransaction) $Connection->db->beginTransaction();
414
+				if ($globalTransaction) {
415
+					$Connection->db->beginTransaction();
416
+				}
360 417
 				$tmp = fgetcsv($fh,9999,',',"'");
361 418
             			while (!feof($fh)) {
362 419
             				$line = fgetcsv($fh,9999,',',"'");
@@ -370,13 +427,17 @@  discard block
 block discarded – undo
370 427
             				// Check if we can find ICAO, else set it to GLID
371 428
             				$aircraft_name_split = explode(' ',$aircraft_name);
372 429
             				$search_more = '';
373
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
430
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
431
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
432
+            				}
374 433
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
375 434
             				$sth_search = $Connection->db->prepare($query_search);
376 435
 					try {
377 436
                                     		$sth_search->execute();
378 437
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
438
+	            				if (isset($result['icao']) && $result['icao'] != '') {
439
+	            					$values['ICAOTypeCode'] = $result['icao'];
440
+	            				}
380 441
 					} catch(PDOException $e) {
381 442
 						return "error : ".$e->getMessage();
382 443
 					}
@@ -389,7 +450,9 @@  discard block
 block discarded – undo
389 450
 						$sth_dest->execute($query_dest_values);
390 451
 					}
391 452
 				}
392
-				if ($globalTransaction) $Connection->db->commit();
453
+				if ($globalTransaction) {
454
+					$Connection->db->commit();
455
+				}
393 456
 			} catch(PDOException $e) {
394 457
 				return "error : ".$e->getMessage();
395 458
 			}
@@ -428,7 +491,9 @@  discard block
 block discarded – undo
428 491
 			$sth_dest = $Connection->db->prepare($query_dest);
429 492
 			$sth_modes = $Connection->db->prepare($query_modes);
430 493
 			try {
431
-				if ($globalTransaction) $Connection->db->beginTransaction();
494
+				if ($globalTransaction) {
495
+					$Connection->db->beginTransaction();
496
+				}
432 497
 				$tmp = fgetcsv($fh,9999,',','"');
433 498
             			while (!feof($fh)) {
434 499
             				$line = fgetcsv($fh,9999,',','"');
@@ -438,16 +503,22 @@  discard block
 block discarded – undo
438 503
             				    $values['registration'] = $line[0];
439 504
             				    $values['base'] = $line[4];
440 505
             				    $values['owner'] = $line[5];
441
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
442
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
506
+            				    if ($line[6] == '') {
507
+            				    	$values['date_first_reg'] = null;
508
+            				    } else {
509
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
510
+					    }
443 511
 					    $values['cancel'] = $line[7];
444 512
 					} elseif ($country == 'EI') {
445 513
 					    // TODO : add modeS & reg to aircraft_modes
446 514
             				    $values['registration'] = $line[0];
447 515
             				    $values['base'] = $line[3];
448 516
             				    $values['owner'] = $line[2];
449
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
450
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
517
+            				    if ($line[1] == '') {
518
+            				    	$values['date_first_reg'] = null;
519
+            				    } else {
520
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
521
+					    }
451 522
 					    $values['cancel'] = '';
452 523
 					    $values['modes'] = $line[7];
453 524
 					    $values['icao'] = $line[8];
@@ -466,16 +537,22 @@  discard block
 block discarded – undo
466 537
             				    $values['registration'] = $line[3];
467 538
             				    $values['base'] = null;
468 539
             				    $values['owner'] = $line[5];
469
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
470
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
540
+            				    if ($line[18] == '') {
541
+            				    	$values['date_first_reg'] = null;
542
+            				    } else {
543
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
544
+					    }
471 545
 					    $values['cancel'] = '';
472 546
 					} elseif ($country == 'VH') {
473 547
 					    // TODO : add modeS & reg to aircraft_modes
474 548
             				    $values['registration'] = $line[0];
475 549
             				    $values['base'] = null;
476 550
             				    $values['owner'] = $line[12];
477
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
478
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
551
+            				    if ($line[28] == '') {
552
+            				    	$values['date_first_reg'] = null;
553
+            				    } else {
554
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
555
+					    }
479 556
 
480 557
 					    $values['cancel'] = $line[39];
481 558
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -494,29 +571,41 @@  discard block
 block discarded – undo
494 571
             				    $values['registration'] = $line[0];
495 572
             				    $values['base'] = null;
496 573
             				    $values['owner'] = $line[8];
497
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
498
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
574
+            				    if ($line[7] == '') {
575
+            				    	$values['date_first_reg'] = null;
576
+            				    } else {
577
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
578
+					    }
499 579
 					    $values['cancel'] = '';
500 580
 					} elseif ($country == 'PP') {
501 581
             				    $values['registration'] = $line[0];
502 582
             				    $values['base'] = null;
503 583
             				    $values['owner'] = $line[4];
504
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
505
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
584
+            				    if ($line[6] == '') {
585
+            				    	$values['date_first_reg'] = null;
586
+            				    } else {
587
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
588
+					    }
506 589
 					    $values['cancel'] = $line[7];
507 590
 					} elseif ($country == 'E7') {
508 591
             				    $values['registration'] = $line[0];
509 592
             				    $values['base'] = null;
510 593
             				    $values['owner'] = $line[4];
511
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
512
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
594
+            				    if ($line[5] == '') {
595
+            				    	$values['date_first_reg'] = null;
596
+            				    } else {
597
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
598
+					    }
513 599
 					    $values['cancel'] = '';
514 600
 					} elseif ($country == '8Q') {
515 601
             				    $values['registration'] = $line[0];
516 602
             				    $values['base'] = null;
517 603
             				    $values['owner'] = $line[3];
518
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
519
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
604
+            				    if ($line[7] == '') {
605
+            				    	$values['date_first_reg'] = null;
606
+            				    } else {
607
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
608
+					    }
520 609
 					    $values['cancel'] = '';
521 610
 					} elseif ($country == 'ZK') {
522 611
             				    $values['registration'] = $line[0];
@@ -561,7 +650,9 @@  discard block
 block discarded – undo
561 650
 						$sth_modes->execute($query_modes_values);
562 651
 					}
563 652
 				}
564
-				if ($globalTransaction) $Connection->db->commit();
653
+				if ($globalTransaction) {
654
+					$Connection->db->commit();
655
+				}
565 656
 			} catch(PDOException $e) {
566 657
 				return "error : ".$e->getMessage();
567 658
 			}
@@ -697,25 +788,45 @@  discard block
 block discarded – undo
697 788
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
698 789
 		$Connection = new Connection();
699 790
 		$sth_dest = $Connection->db->prepare($query_dest);
700
-		if ($globalTransaction) $Connection->db->beginTransaction();
791
+		if ($globalTransaction) {
792
+			$Connection->db->beginTransaction();
793
+		}
701 794
   
702 795
 		$i = 0;
703 796
 		while($row = sparql_fetch_array($result))
704 797
 		{
705 798
 			if ($i >= 1) {
706 799
 			//print_r($row);
707
-			if (!isset($row['iata'])) $row['iata'] = '';
708
-			if (!isset($row['icao'])) $row['icao'] = '';
709
-			if (!isset($row['type'])) $row['type'] = '';
710
-			if (!isset($row['altitude'])) $row['altitude'] = '';
800
+			if (!isset($row['iata'])) {
801
+				$row['iata'] = '';
802
+			}
803
+			if (!isset($row['icao'])) {
804
+				$row['icao'] = '';
805
+			}
806
+			if (!isset($row['type'])) {
807
+				$row['type'] = '';
808
+			}
809
+			if (!isset($row['altitude'])) {
810
+				$row['altitude'] = '';
811
+			}
711 812
 			if (isset($row['city_bis'])) {
712 813
 				$row['city'] = $row['city_bis'];
713 814
 			}
714
-			if (!isset($row['city'])) $row['city'] = '';
715
-			if (!isset($row['country'])) $row['country'] = '';
716
-			if (!isset($row['homepage'])) $row['homepage'] = '';
717
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
718
-			if (!isset($row['name'])) continue;
815
+			if (!isset($row['city'])) {
816
+				$row['city'] = '';
817
+			}
818
+			if (!isset($row['country'])) {
819
+				$row['country'] = '';
820
+			}
821
+			if (!isset($row['homepage'])) {
822
+				$row['homepage'] = '';
823
+			}
824
+			if (!isset($row['wikipedia_page'])) {
825
+				$row['wikipedia_page'] = '';
826
+			}
827
+			if (!isset($row['name'])) {
828
+				continue;
829
+			}
719 830
 			if (!isset($row['image'])) {
720 831
 				$row['image'] = '';
721 832
 				$row['image_thumb'] = '';
@@ -771,7 +882,9 @@  discard block
 block discarded – undo
771 882
 
772 883
 			$i++;
773 884
 		}
774
-		if ($globalTransaction) $Connection->db->commit();
885
+		if ($globalTransaction) {
886
+			$Connection->db->commit();
887
+		}
775 888
 		/*
776 889
 		echo "Delete duplicate rows...\n";
777 890
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
@@ -814,7 +927,9 @@  discard block
 block discarded – undo
814 927
 		$delimiter = ',';
815 928
 		$out_file = $tmp_dir.'airports.csv';
816 929
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
817
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
930
+		if (!file_exists($out_file) || !is_readable($out_file)) {
931
+			return FALSE;
932
+		}
818 933
 		echo "Add data from ourairports.com...\n";
819 934
 
820 935
 		$header = NULL;
@@ -824,8 +939,9 @@  discard block
 block discarded – undo
824 939
 			//$Connection->db->beginTransaction();
825 940
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
826 941
 			{
827
-				if(!$header) $header = $row;
828
-				else {
942
+				if(!$header) {
943
+					$header = $row;
944
+				} else {
829 945
 					$data = array();
830 946
 					$data = array_combine($header, $row);
831 947
 					try {
@@ -866,7 +982,9 @@  discard block
 block discarded – undo
866 982
 		echo "Download data from another free database...\n";
867 983
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
868 984
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
869
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
985
+		if (!file_exists($out_file) || !is_readable($out_file)) {
986
+			return FALSE;
987
+		}
870 988
 		update_db::unzip($out_file);
871 989
 		$header = NULL;
872 990
 		echo "Add data from another free database...\n";
@@ -877,8 +995,9 @@  discard block
 block discarded – undo
877 995
 			//$Connection->db->beginTransaction();
878 996
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
879 997
 			{
880
-				if(!$header) $header = $row;
881
-				else {
998
+				if(!$header) {
999
+					$header = $row;
1000
+				} else {
882 1001
 					$data = $row;
883 1002
 
884 1003
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
@@ -1047,7 +1166,9 @@  discard block
 block discarded – undo
1047 1166
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
1048 1167
 		{
1049 1168
 			$i = 0;
1050
-			if ($globalTransaction) $Connection->db->beginTransaction();
1169
+			if ($globalTransaction) {
1170
+				$Connection->db->beginTransaction();
1171
+			}
1051 1172
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1052 1173
 			{
1053 1174
 				if ($i > 0) {
@@ -1060,7 +1181,9 @@  discard block
 block discarded – undo
1060 1181
 					}
1061 1182
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
1062 1183
 					if (!empty($result_search)) {
1063
-						if ($globalDebug) echo '.';
1184
+						if ($globalDebug) {
1185
+							echo '.';
1186
+						}
1064 1187
 							//if ($globalDBdriver == 'mysql') {
1065 1188
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
1066 1189
 							//} else {
@@ -1082,8 +1205,12 @@  discard block
 block discarded – undo
1082 1205
 						}
1083 1206
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1084 1207
 						if (!empty($result_search_mfr)) {
1085
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1086
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1208
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1209
+								$data[16] = $data[23];
1210
+							}
1211
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1212
+								$data[16] = $data[15];
1213
+							}
1087 1214
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1088 1215
 							try {
1089 1216
 								$sthf = $Connection->db->prepare($queryf);
@@ -1094,7 +1221,9 @@  discard block
 block discarded – undo
1094 1221
 						}
1095 1222
 					}
1096 1223
 					if (strtotime($data[29]) > time()) {
1097
-						if ($globalDebug) echo 'i';
1224
+						if ($globalDebug) {
1225
+							echo 'i';
1226
+						}
1098 1227
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1099 1228
 						try {
1100 1229
 							$sth = $Connection->db->prepare($query);
@@ -1105,13 +1234,19 @@  discard block
 block discarded – undo
1105 1234
 					}
1106 1235
 				}
1107 1236
 				if ($i % 90 == 0) {
1108
-					if ($globalTransaction) $Connection->db->commit();
1109
-					if ($globalTransaction) $Connection->db->beginTransaction();
1237
+					if ($globalTransaction) {
1238
+						$Connection->db->commit();
1239
+					}
1240
+					if ($globalTransaction) {
1241
+						$Connection->db->beginTransaction();
1242
+					}
1110 1243
 				}
1111 1244
 				$i++;
1112 1245
 			}
1113 1246
 			fclose($handle);
1114
-			if ($globalTransaction) $Connection->db->commit();
1247
+			if ($globalTransaction) {
1248
+				$Connection->db->commit();
1249
+			}
1115 1250
 		}
1116 1251
 		return '';
1117 1252
 	}
@@ -1131,11 +1266,15 @@  discard block
 block discarded – undo
1131 1266
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
1132 1267
 		{
1133 1268
 			$i = 0;
1134
-			if ($globalTransaction) $Connection->db->beginTransaction();
1269
+			if ($globalTransaction) {
1270
+				$Connection->db->beginTransaction();
1271
+			}
1135 1272
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1136 1273
 			{
1137 1274
 				if ($i > 0) {
1138
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1275
+					if ($data[1] == 'NULL') {
1276
+						$data[1] = $data[0];
1277
+					}
1139 1278
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1140 1279
 					try {
1141 1280
 						$sth = $Connection->db->prepare($query);
@@ -1147,7 +1286,9 @@  discard block
 block discarded – undo
1147 1286
 				$i++;
1148 1287
 			}
1149 1288
 			fclose($handle);
1150
-			if ($globalTransaction) $Connection->db->commit();
1289
+			if ($globalTransaction) {
1290
+				$Connection->db->commit();
1291
+			}
1151 1292
 		}
1152 1293
 		return '';
1153 1294
 	}
@@ -1179,11 +1320,15 @@  discard block
 block discarded – undo
1179 1320
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
1180 1321
 		{
1181 1322
 			$i = 0;
1182
-			if ($globalTransaction) $Connection->db->beginTransaction();
1323
+			if ($globalTransaction) {
1324
+				$Connection->db->beginTransaction();
1325
+			}
1183 1326
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1184 1327
 			{
1185 1328
 				if ($i > 0) {
1186
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1329
+					if ($data[1] == 'NULL') {
1330
+						$data[1] = $data[0];
1331
+					}
1187 1332
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
1188 1333
 					try {
1189 1334
 						$sth = $Connection->db->prepare($query);
@@ -1195,7 +1340,9 @@  discard block
 block discarded – undo
1195 1340
 				$i++;
1196 1341
 			}
1197 1342
 			fclose($handle);
1198
-			if ($globalTransaction) $Connection->db->commit();
1343
+			if ($globalTransaction) {
1344
+				$Connection->db->commit();
1345
+			}
1199 1346
 		}
1200 1347
 		/*
1201 1348
 		$query = "UNLOCK TABLES";
@@ -1225,7 +1372,9 @@  discard block
 block discarded – undo
1225 1372
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1226 1373
 		{
1227 1374
 			$i = 0;
1228
-			if ($globalTransaction) $Connection->db->beginTransaction();
1375
+			if ($globalTransaction) {
1376
+				$Connection->db->beginTransaction();
1377
+			}
1229 1378
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1230 1379
 			{
1231 1380
 				if ($i > 0) {
@@ -1241,7 +1390,9 @@  discard block
 block discarded – undo
1241 1390
 				$i++;
1242 1391
 			}
1243 1392
 			fclose($handle);
1244
-			if ($globalTransaction) $Connection->db->commit();
1393
+			if ($globalTransaction) {
1394
+				$Connection->db->commit();
1395
+			}
1245 1396
 		}
1246 1397
 		return '';
1247 1398
         }
@@ -1261,7 +1412,9 @@  discard block
 block discarded – undo
1261 1412
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
1262 1413
 		{
1263 1414
 			$i = 0;
1264
-			if ($globalTransaction) $Connection->db->beginTransaction();
1415
+			if ($globalTransaction) {
1416
+				$Connection->db->beginTransaction();
1417
+			}
1265 1418
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1266 1419
 			{
1267 1420
 				if ($i > 0) {
@@ -1270,13 +1423,17 @@  discard block
 block discarded – undo
1270 1423
 						$sth = $Connection->db->prepare($query);
1271 1424
 						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
1272 1425
 					} catch(PDOException $e) {
1273
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1426
+						if ($globalDebug) {
1427
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1428
+						}
1274 1429
 					}
1275 1430
 				}
1276 1431
 				$i++;
1277 1432
 			}
1278 1433
 			fclose($handle);
1279
-			if ($globalTransaction) $Connection->db->commit();
1434
+			if ($globalTransaction) {
1435
+				$Connection->db->commit();
1436
+			}
1280 1437
 		}
1281 1438
 		return '';
1282 1439
         }
@@ -1301,7 +1458,9 @@  discard block
 block discarded – undo
1301 1458
 			$i = 0;
1302 1459
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1303 1460
 			//$Connection->db->beginTransaction();
1304
-			if ($globalTransaction) $Connection->db->beginTransaction();
1461
+			if ($globalTransaction) {
1462
+				$Connection->db->beginTransaction();
1463
+			}
1305 1464
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1306 1465
 			{
1307 1466
 				if ($i > 0) {
@@ -1317,7 +1476,9 @@  discard block
 block discarded – undo
1317 1476
 				$i++;
1318 1477
 			}
1319 1478
 			fclose($handle);
1320
-			if ($globalTransaction) $Connection->db->commit();
1479
+			if ($globalTransaction) {
1480
+				$Connection->db->commit();
1481
+			}
1321 1482
 		}
1322 1483
 		return '';
1323 1484
         }
@@ -1337,7 +1498,9 @@  discard block
 block discarded – undo
1337 1498
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
1338 1499
 		{
1339 1500
 			$i = 0;
1340
-			if ($globalTransaction) $Connection->db->beginTransaction();
1501
+			if ($globalTransaction) {
1502
+				$Connection->db->beginTransaction();
1503
+			}
1341 1504
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1342 1505
 			{
1343 1506
 				if ($i > 0) {
@@ -1354,7 +1517,9 @@  discard block
 block discarded – undo
1354 1517
 				$i++;
1355 1518
 			}
1356 1519
 			fclose($handle);
1357
-			if ($globalTransaction) $Connection->db->commit();
1520
+			if ($globalTransaction) {
1521
+				$Connection->db->commit();
1522
+			}
1358 1523
 		}
1359 1524
 		return '';
1360 1525
 	}
@@ -1373,7 +1538,9 @@  discard block
 block discarded – undo
1373 1538
 		$Connection = new Connection();
1374 1539
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
1375 1540
 		{
1376
-			if ($globalTransaction) $Connection->db->beginTransaction();
1541
+			if ($globalTransaction) {
1542
+				$Connection->db->beginTransaction();
1543
+			}
1377 1544
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
1378 1545
 			{
1379 1546
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
@@ -1388,7 +1555,9 @@  discard block
 block discarded – undo
1388 1555
 				}
1389 1556
 			}
1390 1557
 			fclose($handle);
1391
-			if ($globalTransaction) $Connection->db->commit();
1558
+			if ($globalTransaction) {
1559
+				$Connection->db->commit();
1560
+			}
1392 1561
 		}
1393 1562
 		return '';
1394 1563
         }
@@ -1464,9 +1633,14 @@  discard block
 block discarded – undo
1464 1633
 				if ($i > 0 && $data[0] != '') {
1465 1634
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
1466 1635
 					$period = str_replace(',','',$data[14]);
1467
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
1468
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
1469
-					else $launch_date = NULL;
1636
+					if (!empty($period) && strpos($period,'days')) {
1637
+						$period = str_replace(' days','',$period)*24*60;
1638
+					}
1639
+					if ($data[18] != '') {
1640
+						$launch_date = date('Y-m-d',strtotime($data[18]));
1641
+					} else {
1642
+						$launch_date = NULL;
1643
+					}
1470 1644
 					$data = array_map(function($value) {
1471 1645
 						return trim($value) === '' ? null : $value;
1472 1646
 					}, $data);
@@ -1819,7 +1993,9 @@  discard block
 block discarded – undo
1819 1993
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1820 1994
 		{
1821 1995
 			$i = 0;
1822
-			if ($globalTransaction) $Connection->db->beginTransaction();
1996
+			if ($globalTransaction) {
1997
+				$Connection->db->beginTransaction();
1998
+			}
1823 1999
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1824 2000
 			{
1825 2001
 				$i++;
@@ -1847,7 +2023,9 @@  discard block
 block discarded – undo
1847 2023
 				}
1848 2024
 			}
1849 2025
 			fclose($handle);
1850
-			if ($globalTransaction) $Connection->db->commit();
2026
+			if ($globalTransaction) {
2027
+				$Connection->db->commit();
2028
+			}
1851 2029
 		}
1852 2030
 		return '';
1853 2031
         }
@@ -1870,7 +2048,9 @@  discard block
 block discarded – undo
1870 2048
 		$Connection = new Connection();
1871 2049
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1872 2050
 		{
1873
-			if ($globalTransaction) $Connection->db->beginTransaction();
2051
+			if ($globalTransaction) {
2052
+				$Connection->db->beginTransaction();
2053
+			}
1874 2054
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1875 2055
 			{
1876 2056
 				if(count($row) > 1) {
@@ -1884,7 +2064,9 @@  discard block
 block discarded – undo
1884 2064
 				}
1885 2065
 			}
1886 2066
 			fclose($handle);
1887
-			if ($globalTransaction) $Connection->db->commit();
2067
+			if ($globalTransaction) {
2068
+				$Connection->db->commit();
2069
+			}
1888 2070
 		}
1889 2071
 		return '';
1890 2072
         }
@@ -1904,8 +2086,9 @@  discard block
 block discarded – undo
1904 2086
 	        }
1905 2087
 
1906 2088
 
1907
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1908
-		else {
2089
+		if ($globalDBdriver == 'mysql') {
2090
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
2091
+		} else {
1909 2092
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1910 2093
 			$query = "CREATE EXTENSION postgis";
1911 2094
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
@@ -1924,7 +2107,9 @@  discard block
 block discarded – undo
1924 2107
 		global $tmp_dir, $globalDebug;
1925 2108
 		include_once('class.create_db.php');
1926 2109
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1927
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
2110
+		if ($globalDebug) {
2111
+			echo "NOTAM from FlightAirMap website : Download...";
2112
+		}
1928 2113
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
1929 2114
 		$error = '';
1930 2115
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
@@ -1934,20 +2119,34 @@  discard block
 block discarded – undo
1934 2119
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1935 2120
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
1936 2121
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
1937
-						if ($globalDebug) echo "Gunzip...";
2122
+						if ($globalDebug) {
2123
+							echo "Gunzip...";
2124
+						}
1938 2125
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
1939
-						if ($globalDebug) echo "Add to DB...";
2126
+						if ($globalDebug) {
2127
+							echo "Add to DB...";
2128
+						}
1940 2129
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
1941 2130
 						$NOTAM = new NOTAM();
1942 2131
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
1943 2132
 						update_db::insert_notam_version($notam_md5);
1944
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
1945
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1946
-			} elseif ($globalDebug) echo "No new version.";
1947
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2133
+					} else {
2134
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
2135
+					}
2136
+				} else {
2137
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
2138
+				}
2139
+			} elseif ($globalDebug) {
2140
+				echo "No new version.";
2141
+			}
2142
+		} else {
2143
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2144
+		}
1948 2145
 		if ($error != '') {
1949 2146
 			return $error;
1950
-		} elseif ($globalDebug) echo "Done\n";
2147
+		} elseif ($globalDebug) {
2148
+			echo "Done\n";
2149
+		}
1951 2150
 		return '';
1952 2151
 	}
1953 2152
 
@@ -2002,68 +2201,114 @@  discard block
 block discarded – undo
2002 2201
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
2003 2202
 		if (extension_loaded('zip')) {
2004 2203
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
2005
-				if ($globalDebug) echo "Unzip...";
2204
+				if ($globalDebug) {
2205
+					echo "Unzip...";
2206
+				}
2006 2207
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
2007
-				if ($globalDebug) echo "Add to DB...";
2208
+				if ($globalDebug) {
2209
+					echo "Add to DB...";
2210
+				}
2008 2211
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
2009
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
2212
+				if ($globalDebug) {
2213
+					echo "Copy airlines logos to airlines images directory...";
2214
+				}
2010 2215
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
2011
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
2012
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2013
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2014
-		} else $error = "ZIP module not loaded but required for IVAO.";
2216
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
2217
+						$error = "Failed to copy airlines logo.";
2218
+					}
2219
+				} else {
2220
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2221
+				}
2222
+			} else {
2223
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2224
+			}
2225
+		} else {
2226
+			$error = "ZIP module not loaded but required for IVAO.";
2227
+		}
2015 2228
 		if ($error != '') {
2016 2229
 			return $error;
2017
-		} elseif ($globalDebug) echo "Done\n";
2230
+		} elseif ($globalDebug) {
2231
+			echo "Done\n";
2232
+		}
2018 2233
 		return '';
2019 2234
 	}
2020 2235
 
2021 2236
 	public static function update_routes() {
2022 2237
 		global $tmp_dir, $globalDebug;
2023 2238
 		$error = '';
2024
-		if ($globalDebug) echo "Routes : Download...";
2239
+		if ($globalDebug) {
2240
+			echo "Routes : Download...";
2241
+		}
2025 2242
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
2026 2243
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
2027
-			if ($globalDebug) echo "Gunzip...";
2244
+			if ($globalDebug) {
2245
+				echo "Gunzip...";
2246
+			}
2028 2247
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
2029
-			if ($globalDebug) echo "Add to DB...";
2248
+			if ($globalDebug) {
2249
+				echo "Add to DB...";
2250
+			}
2030 2251
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
2031
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2252
+		} else {
2253
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2254
+		}
2032 2255
 		if ($error != '') {
2033 2256
 			return $error;
2034
-		} elseif ($globalDebug) echo "Done\n";
2257
+		} elseif ($globalDebug) {
2258
+			echo "Done\n";
2259
+		}
2035 2260
 		return '';
2036 2261
 	}
2037 2262
 	public static function update_oneworld() {
2038 2263
 		global $tmp_dir, $globalDebug;
2039 2264
 		$error = '';
2040
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
2265
+		if ($globalDebug) {
2266
+			echo "Schedules Oneworld : Download...";
2267
+		}
2041 2268
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
2042 2269
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
2043
-			if ($globalDebug) echo "Gunzip...";
2270
+			if ($globalDebug) {
2271
+				echo "Gunzip...";
2272
+			}
2044 2273
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
2045
-			if ($globalDebug) echo "Add to DB...";
2274
+			if ($globalDebug) {
2275
+				echo "Add to DB...";
2276
+			}
2046 2277
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
2047
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2278
+		} else {
2279
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2280
+		}
2048 2281
 		if ($error != '') {
2049 2282
 			return $error;
2050
-		} elseif ($globalDebug) echo "Done\n";
2283
+		} elseif ($globalDebug) {
2284
+			echo "Done\n";
2285
+		}
2051 2286
 		return '';
2052 2287
 	}
2053 2288
 	public static function update_skyteam() {
2054 2289
 		global $tmp_dir, $globalDebug;
2055 2290
 		$error = '';
2056
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
2291
+		if ($globalDebug) {
2292
+			echo "Schedules Skyteam : Download...";
2293
+		}
2057 2294
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
2058 2295
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
2059
-			if ($globalDebug) echo "Gunzip...";
2296
+			if ($globalDebug) {
2297
+				echo "Gunzip...";
2298
+			}
2060 2299
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
2061
-			if ($globalDebug) echo "Add to DB...";
2300
+			if ($globalDebug) {
2301
+				echo "Add to DB...";
2302
+			}
2062 2303
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
2063
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2304
+		} else {
2305
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2306
+		}
2064 2307
 		if ($error != '') {
2065 2308
 			return $error;
2066
-		} elseif ($globalDebug) echo "Done\n";
2309
+		} elseif ($globalDebug) {
2310
+			echo "Done\n";
2311
+		}
2067 2312
 		return '';
2068 2313
 	}
2069 2314
 	public static function update_ModeS() {
@@ -2080,337 +2325,587 @@  discard block
 block discarded – undo
2080 2325
 			exit;
2081 2326
 		} elseif ($globalDebug) echo "Done\n";
2082 2327
 */
2083
-		if ($globalDebug) echo "Modes : Download...";
2084
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2328
+		if ($globalDebug) {
2329
+			echo "Modes : Download...";
2330
+		}
2331
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2085 2332
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
2086 2333
 
2087 2334
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
2088 2335
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
2089
-			if ($globalDebug) echo "Unzip...";
2090
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2336
+			if ($globalDebug) {
2337
+				echo "Unzip...";
2338
+			}
2339
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2091 2340
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
2092
-			if ($globalDebug) echo "Add to DB...";
2341
+			if ($globalDebug) {
2342
+				echo "Add to DB...";
2343
+			}
2093 2344
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
2094 2345
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
2095
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2346
+		} else {
2347
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2348
+		}
2096 2349
 		if ($error != '') {
2097 2350
 			return $error;
2098
-		} elseif ($globalDebug) echo "Done\n";
2351
+		} elseif ($globalDebug) {
2352
+			echo "Done\n";
2353
+		}
2099 2354
 		return '';
2100 2355
 	}
2101 2356
 
2102 2357
 	public static function update_ModeS_faa() {
2103 2358
 		global $tmp_dir, $globalDebug;
2104
-		if ($globalDebug) echo "Modes FAA: Download...";
2359
+		if ($globalDebug) {
2360
+			echo "Modes FAA: Download...";
2361
+		}
2105 2362
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
2106 2363
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
2107
-			if ($globalDebug) echo "Unzip...";
2364
+			if ($globalDebug) {
2365
+				echo "Unzip...";
2366
+			}
2108 2367
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
2109
-			if ($globalDebug) echo "Add to DB...";
2368
+			if ($globalDebug) {
2369
+				echo "Add to DB...";
2370
+			}
2110 2371
 			$error = update_db::modes_faa();
2111
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2372
+		} else {
2373
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2374
+		}
2112 2375
 		if ($error != '') {
2113 2376
 			return $error;
2114
-		} elseif ($globalDebug) echo "Done\n";
2377
+		} elseif ($globalDebug) {
2378
+			echo "Done\n";
2379
+		}
2115 2380
 		return '';
2116 2381
 	}
2117 2382
 
2118 2383
 	public static function update_ModeS_flarm() {
2119 2384
 		global $tmp_dir, $globalDebug;
2120
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
2385
+		if ($globalDebug) {
2386
+			echo "Modes Flarmnet: Download...";
2387
+		}
2121 2388
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
2122 2389
 		if (file_exists($tmp_dir.'data.fln')) {
2123
-			if ($globalDebug) echo "Add to DB...";
2390
+			if ($globalDebug) {
2391
+				echo "Add to DB...";
2392
+			}
2124 2393
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
2125
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2394
+		} else {
2395
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2396
+		}
2126 2397
 		if ($error != '') {
2127 2398
 			return $error;
2128
-		} elseif ($globalDebug) echo "Done\n";
2399
+		} elseif ($globalDebug) {
2400
+			echo "Done\n";
2401
+		}
2129 2402
 		return '';
2130 2403
 	}
2131 2404
 
2132 2405
 	public static function update_ModeS_ogn() {
2133 2406
 		global $tmp_dir, $globalDebug;
2134
-		if ($globalDebug) echo "Modes OGN: Download...";
2407
+		if ($globalDebug) {
2408
+			echo "Modes OGN: Download...";
2409
+		}
2135 2410
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
2136 2411
 		if (file_exists($tmp_dir.'ogn.csv')) {
2137
-			if ($globalDebug) echo "Add to DB...";
2412
+			if ($globalDebug) {
2413
+				echo "Add to DB...";
2414
+			}
2138 2415
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
2139
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2416
+		} else {
2417
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2418
+		}
2140 2419
 		if ($error != '') {
2141 2420
 			return $error;
2142
-		} elseif ($globalDebug) echo "Done\n";
2421
+		} elseif ($globalDebug) {
2422
+			echo "Done\n";
2423
+		}
2143 2424
 		return '';
2144 2425
 	}
2145 2426
 
2146 2427
 	public static function update_owner() {
2147 2428
 		global $tmp_dir, $globalDebug, $globalMasterSource;
2148 2429
 		
2149
-		if ($globalDebug) echo "Owner France: Download...";
2430
+		if ($globalDebug) {
2431
+			echo "Owner France: Download...";
2432
+		}
2150 2433
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
2151 2434
 		if (file_exists($tmp_dir.'owner_f.csv')) {
2152
-			if ($globalDebug) echo "Add to DB...";
2435
+			if ($globalDebug) {
2436
+				echo "Add to DB...";
2437
+			}
2153 2438
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
2154
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2439
+		} else {
2440
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2441
+		}
2155 2442
 		if ($error != '') {
2156 2443
 			return $error;
2157
-		} elseif ($globalDebug) echo "Done\n";
2444
+		} elseif ($globalDebug) {
2445
+			echo "Done\n";
2446
+		}
2158 2447
 		
2159
-		if ($globalDebug) echo "Owner Ireland: Download...";
2448
+		if ($globalDebug) {
2449
+			echo "Owner Ireland: Download...";
2450
+		}
2160 2451
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
2161 2452
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
2162
-			if ($globalDebug) echo "Add to DB...";
2453
+			if ($globalDebug) {
2454
+				echo "Add to DB...";
2455
+			}
2163 2456
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
2164
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2457
+		} else {
2458
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2459
+		}
2165 2460
 		if ($error != '') {
2166 2461
 			return $error;
2167
-		} elseif ($globalDebug) echo "Done\n";
2168
-		if ($globalDebug) echo "Owner Switzerland: Download...";
2462
+		} elseif ($globalDebug) {
2463
+			echo "Done\n";
2464
+		}
2465
+		if ($globalDebug) {
2466
+			echo "Owner Switzerland: Download...";
2467
+		}
2169 2468
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
2170 2469
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
2171
-			if ($globalDebug) echo "Add to DB...";
2470
+			if ($globalDebug) {
2471
+				echo "Add to DB...";
2472
+			}
2172 2473
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
2173
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2474
+		} else {
2475
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2476
+		}
2174 2477
 		if ($error != '') {
2175 2478
 			return $error;
2176
-		} elseif ($globalDebug) echo "Done\n";
2177
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
2479
+		} elseif ($globalDebug) {
2480
+			echo "Done\n";
2481
+		}
2482
+		if ($globalDebug) {
2483
+			echo "Owner Czech Republic: Download...";
2484
+		}
2178 2485
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
2179 2486
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
2180
-			if ($globalDebug) echo "Add to DB...";
2487
+			if ($globalDebug) {
2488
+				echo "Add to DB...";
2489
+			}
2181 2490
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
2182
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2491
+		} else {
2492
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2493
+		}
2183 2494
 		if ($error != '') {
2184 2495
 			return $error;
2185
-		} elseif ($globalDebug) echo "Done\n";
2186
-		if ($globalDebug) echo "Owner Australia: Download...";
2496
+		} elseif ($globalDebug) {
2497
+			echo "Done\n";
2498
+		}
2499
+		if ($globalDebug) {
2500
+			echo "Owner Australia: Download...";
2501
+		}
2187 2502
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
2188 2503
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
2189
-			if ($globalDebug) echo "Add to DB...";
2504
+			if ($globalDebug) {
2505
+				echo "Add to DB...";
2506
+			}
2190 2507
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
2191
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2508
+		} else {
2509
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2510
+		}
2192 2511
 		if ($error != '') {
2193 2512
 			return $error;
2194
-		} elseif ($globalDebug) echo "Done\n";
2195
-		if ($globalDebug) echo "Owner Austria: Download...";
2513
+		} elseif ($globalDebug) {
2514
+			echo "Done\n";
2515
+		}
2516
+		if ($globalDebug) {
2517
+			echo "Owner Austria: Download...";
2518
+		}
2196 2519
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
2197 2520
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
2198
-			if ($globalDebug) echo "Add to DB...";
2521
+			if ($globalDebug) {
2522
+				echo "Add to DB...";
2523
+			}
2199 2524
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
2200
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2525
+		} else {
2526
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2527
+		}
2201 2528
 		if ($error != '') {
2202 2529
 			return $error;
2203
-		} elseif ($globalDebug) echo "Done\n";
2204
-		if ($globalDebug) echo "Owner Chile: Download...";
2530
+		} elseif ($globalDebug) {
2531
+			echo "Done\n";
2532
+		}
2533
+		if ($globalDebug) {
2534
+			echo "Owner Chile: Download...";
2535
+		}
2205 2536
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
2206 2537
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
2207
-			if ($globalDebug) echo "Add to DB...";
2538
+			if ($globalDebug) {
2539
+				echo "Add to DB...";
2540
+			}
2208 2541
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
2209
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2542
+		} else {
2543
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2544
+		}
2210 2545
 		if ($error != '') {
2211 2546
 			return $error;
2212
-		} elseif ($globalDebug) echo "Done\n";
2213
-		if ($globalDebug) echo "Owner Colombia: Download...";
2547
+		} elseif ($globalDebug) {
2548
+			echo "Done\n";
2549
+		}
2550
+		if ($globalDebug) {
2551
+			echo "Owner Colombia: Download...";
2552
+		}
2214 2553
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
2215 2554
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
2216
-			if ($globalDebug) echo "Add to DB...";
2555
+			if ($globalDebug) {
2556
+				echo "Add to DB...";
2557
+			}
2217 2558
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
2218
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2559
+		} else {
2560
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2561
+		}
2219 2562
 		if ($error != '') {
2220 2563
 			return $error;
2221
-		} elseif ($globalDebug) echo "Done\n";
2222
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2564
+		} elseif ($globalDebug) {
2565
+			echo "Done\n";
2566
+		}
2567
+		if ($globalDebug) {
2568
+			echo "Owner Bosnia Herzegobina: Download...";
2569
+		}
2223 2570
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
2224 2571
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
2225
-			if ($globalDebug) echo "Add to DB...";
2572
+			if ($globalDebug) {
2573
+				echo "Add to DB...";
2574
+			}
2226 2575
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
2227
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2576
+		} else {
2577
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2578
+		}
2228 2579
 		if ($error != '') {
2229 2580
 			return $error;
2230
-		} elseif ($globalDebug) echo "Done\n";
2231
-		if ($globalDebug) echo "Owner Brazil: Download...";
2581
+		} elseif ($globalDebug) {
2582
+			echo "Done\n";
2583
+		}
2584
+		if ($globalDebug) {
2585
+			echo "Owner Brazil: Download...";
2586
+		}
2232 2587
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
2233 2588
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
2234
-			if ($globalDebug) echo "Add to DB...";
2589
+			if ($globalDebug) {
2590
+				echo "Add to DB...";
2591
+			}
2235 2592
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
2236
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2593
+		} else {
2594
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2595
+		}
2237 2596
 		if ($error != '') {
2238 2597
 			return $error;
2239
-		} elseif ($globalDebug) echo "Done\n";
2240
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2598
+		} elseif ($globalDebug) {
2599
+			echo "Done\n";
2600
+		}
2601
+		if ($globalDebug) {
2602
+			echo "Owner Cayman Islands: Download...";
2603
+		}
2241 2604
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
2242 2605
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
2243
-			if ($globalDebug) echo "Add to DB...";
2606
+			if ($globalDebug) {
2607
+				echo "Add to DB...";
2608
+			}
2244 2609
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
2245
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2610
+		} else {
2611
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2612
+		}
2246 2613
 		if ($error != '') {
2247 2614
 			return $error;
2248
-		} elseif ($globalDebug) echo "Done\n";
2249
-		if ($globalDebug) echo "Owner Croatia: Download...";
2615
+		} elseif ($globalDebug) {
2616
+			echo "Done\n";
2617
+		}
2618
+		if ($globalDebug) {
2619
+			echo "Owner Croatia: Download...";
2620
+		}
2250 2621
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
2251 2622
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
2252
-			if ($globalDebug) echo "Add to DB...";
2623
+			if ($globalDebug) {
2624
+				echo "Add to DB...";
2625
+			}
2253 2626
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
2254
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2627
+		} else {
2628
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2629
+		}
2255 2630
 		if ($error != '') {
2256 2631
 			return $error;
2257
-		} elseif ($globalDebug) echo "Done\n";
2258
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2632
+		} elseif ($globalDebug) {
2633
+			echo "Done\n";
2634
+		}
2635
+		if ($globalDebug) {
2636
+			echo "Owner Luxembourg: Download...";
2637
+		}
2259 2638
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
2260 2639
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
2261
-			if ($globalDebug) echo "Add to DB...";
2640
+			if ($globalDebug) {
2641
+				echo "Add to DB...";
2642
+			}
2262 2643
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
2263
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2644
+		} else {
2645
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2646
+		}
2264 2647
 		if ($error != '') {
2265 2648
 			return $error;
2266
-		} elseif ($globalDebug) echo "Done\n";
2267
-		if ($globalDebug) echo "Owner Maldives: Download...";
2649
+		} elseif ($globalDebug) {
2650
+			echo "Done\n";
2651
+		}
2652
+		if ($globalDebug) {
2653
+			echo "Owner Maldives: Download...";
2654
+		}
2268 2655
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
2269 2656
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
2270
-			if ($globalDebug) echo "Add to DB...";
2657
+			if ($globalDebug) {
2658
+				echo "Add to DB...";
2659
+			}
2271 2660
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
2272
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2661
+		} else {
2662
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2663
+		}
2273 2664
 		if ($error != '') {
2274 2665
 			return $error;
2275
-		} elseif ($globalDebug) echo "Done\n";
2276
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2666
+		} elseif ($globalDebug) {
2667
+			echo "Done\n";
2668
+		}
2669
+		if ($globalDebug) {
2670
+			echo "Owner New Zealand: Download...";
2671
+		}
2277 2672
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
2278 2673
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
2279
-			if ($globalDebug) echo "Add to DB...";
2674
+			if ($globalDebug) {
2675
+				echo "Add to DB...";
2676
+			}
2280 2677
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
2281
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2678
+		} else {
2679
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2680
+		}
2282 2681
 		if ($error != '') {
2283 2682
 			return $error;
2284
-		} elseif ($globalDebug) echo "Done\n";
2285
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2683
+		} elseif ($globalDebug) {
2684
+			echo "Done\n";
2685
+		}
2686
+		if ($globalDebug) {
2687
+			echo "Owner Papua New Guinea: Download...";
2688
+		}
2286 2689
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
2287 2690
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
2288
-			if ($globalDebug) echo "Add to DB...";
2691
+			if ($globalDebug) {
2692
+				echo "Add to DB...";
2693
+			}
2289 2694
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
2290
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2695
+		} else {
2696
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2697
+		}
2291 2698
 		if ($error != '') {
2292 2699
 			return $error;
2293
-		} elseif ($globalDebug) echo "Done\n";
2294
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2700
+		} elseif ($globalDebug) {
2701
+			echo "Done\n";
2702
+		}
2703
+		if ($globalDebug) {
2704
+			echo "Owner Slovakia: Download...";
2705
+		}
2295 2706
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
2296 2707
 		if (file_exists($tmp_dir.'owner_om.csv')) {
2297
-			if ($globalDebug) echo "Add to DB...";
2708
+			if ($globalDebug) {
2709
+				echo "Add to DB...";
2710
+			}
2298 2711
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
2299
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2712
+		} else {
2713
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2714
+		}
2300 2715
 		if ($error != '') {
2301 2716
 			return $error;
2302
-		} elseif ($globalDebug) echo "Done\n";
2303
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2717
+		} elseif ($globalDebug) {
2718
+			echo "Done\n";
2719
+		}
2720
+		if ($globalDebug) {
2721
+			echo "Owner Ecuador: Download...";
2722
+		}
2304 2723
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
2305 2724
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
2306
-			if ($globalDebug) echo "Add to DB...";
2725
+			if ($globalDebug) {
2726
+				echo "Add to DB...";
2727
+			}
2307 2728
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
2308
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2729
+		} else {
2730
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2731
+		}
2309 2732
 		if ($error != '') {
2310 2733
 			return $error;
2311
-		} elseif ($globalDebug) echo "Done\n";
2312
-		if ($globalDebug) echo "Owner Iceland: Download...";
2734
+		} elseif ($globalDebug) {
2735
+			echo "Done\n";
2736
+		}
2737
+		if ($globalDebug) {
2738
+			echo "Owner Iceland: Download...";
2739
+		}
2313 2740
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
2314 2741
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
2315
-			if ($globalDebug) echo "Add to DB...";
2742
+			if ($globalDebug) {
2743
+				echo "Add to DB...";
2744
+			}
2316 2745
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
2317
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2746
+		} else {
2747
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2748
+		}
2318 2749
 		if ($error != '') {
2319 2750
 			return $error;
2320
-		} elseif ($globalDebug) echo "Done\n";
2321
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
2751
+		} elseif ($globalDebug) {
2752
+			echo "Done\n";
2753
+		}
2754
+		if ($globalDebug) {
2755
+			echo "Owner Isle of Man: Download...";
2756
+		}
2322 2757
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
2323 2758
 		if (file_exists($tmp_dir.'owner_m.csv')) {
2324
-			if ($globalDebug) echo "Add to DB...";
2759
+			if ($globalDebug) {
2760
+				echo "Add to DB...";
2761
+			}
2325 2762
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
2326
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2763
+		} else {
2764
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2765
+		}
2327 2766
 		if ($error != '') {
2328 2767
 			return $error;
2329
-		} elseif ($globalDebug) echo "Done\n";
2768
+		} elseif ($globalDebug) {
2769
+			echo "Done\n";
2770
+		}
2330 2771
 		if ($globalMasterSource) {
2331
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
2772
+			if ($globalDebug) {
2773
+				echo "ModeS Netherlands: Download...";
2774
+			}
2332 2775
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
2333 2776
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
2334
-				if ($globalDebug) echo "Add to DB...";
2777
+				if ($globalDebug) {
2778
+					echo "Add to DB...";
2779
+				}
2335 2780
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
2336
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2781
+			} else {
2782
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2783
+			}
2337 2784
 			if ($error != '') {
2338 2785
 				return $error;
2339
-			} elseif ($globalDebug) echo "Done\n";
2340
-			if ($globalDebug) echo "ModeS Denmark: Download...";
2786
+			} elseif ($globalDebug) {
2787
+				echo "Done\n";
2788
+			}
2789
+			if ($globalDebug) {
2790
+				echo "ModeS Denmark: Download...";
2791
+			}
2341 2792
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
2342 2793
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
2343
-				if ($globalDebug) echo "Add to DB...";
2794
+				if ($globalDebug) {
2795
+					echo "Add to DB...";
2796
+				}
2344 2797
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
2345
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2798
+			} else {
2799
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2800
+			}
2346 2801
 			if ($error != '') {
2347 2802
 				return $error;
2348
-			} elseif ($globalDebug) echo "Done\n";
2349
-		} elseif ($globalDebug) echo "Done\n";
2803
+			} elseif ($globalDebug) {
2804
+				echo "Done\n";
2805
+			}
2806
+		} elseif ($globalDebug) {
2807
+			echo "Done\n";
2808
+		}
2350 2809
 		return '';
2351 2810
 	}
2352 2811
 
2353 2812
 	public static function update_translation() {
2354 2813
 		global $tmp_dir, $globalDebug;
2355 2814
 		$error = '';
2356
-		if ($globalDebug) echo "Translation : Download...";
2815
+		if ($globalDebug) {
2816
+			echo "Translation : Download...";
2817
+		}
2357 2818
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
2358 2819
 		if (file_exists($tmp_dir.'translation.zip')) {
2359
-			if ($globalDebug) echo "Unzip...";
2820
+			if ($globalDebug) {
2821
+				echo "Unzip...";
2822
+			}
2360 2823
 			update_db::unzip($tmp_dir.'translation.zip');
2361
-			if ($globalDebug) echo "Add to DB...";
2824
+			if ($globalDebug) {
2825
+				echo "Add to DB...";
2826
+			}
2362 2827
 			$error = update_db::translation();
2363
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2828
+		} else {
2829
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2830
+		}
2364 2831
 		if ($error != '') {
2365 2832
 			return $error;
2366
-		} elseif ($globalDebug) echo "Done\n";
2833
+		} elseif ($globalDebug) {
2834
+			echo "Done\n";
2835
+		}
2367 2836
 		return '';
2368 2837
 	}
2369 2838
 
2370 2839
 	public static function update_translation_fam() {
2371 2840
 		global $tmp_dir, $globalDebug;
2372
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2841
+		if ($globalDebug) {
2842
+			echo "Translation from FlightAirMap website : Download...";
2843
+		}
2373 2844
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
2374 2845
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
2375 2846
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
2376 2847
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
2377 2848
 			$translation_md5 = $translation_md5_file[0];
2378 2849
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
2379
-				if ($globalDebug) echo "Gunzip...";
2850
+				if ($globalDebug) {
2851
+					echo "Gunzip...";
2852
+				}
2380 2853
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
2381
-				if ($globalDebug) echo "Add to DB...";
2854
+				if ($globalDebug) {
2855
+					echo "Add to DB...";
2856
+				}
2382 2857
 				$error = update_db::translation_fam();
2383
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2384
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2858
+			} else {
2859
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2860
+			}
2861
+		} else {
2862
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2863
+		}
2385 2864
 		if ($error != '') {
2386 2865
 			return $error;
2387
-		} elseif ($globalDebug) echo "Done\n";
2866
+		} elseif ($globalDebug) {
2867
+			echo "Done\n";
2868
+		}
2388 2869
 		return '';
2389 2870
 	}
2390 2871
 	public static function update_ModeS_fam() {
2391 2872
 		global $tmp_dir, $globalDebug;
2392
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2873
+		if ($globalDebug) {
2874
+			echo "ModeS from FlightAirMap website : Download...";
2875
+		}
2393 2876
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
2394 2877
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
2395 2878
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
2396 2879
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
2397 2880
 			$modes_md5 = $modes_md5_file[0];
2398 2881
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
2399
-				if ($globalDebug) echo "Gunzip...";
2882
+				if ($globalDebug) {
2883
+					echo "Gunzip...";
2884
+				}
2400 2885
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
2401
-				if ($globalDebug) echo "Add to DB...";
2886
+				if ($globalDebug) {
2887
+					echo "Add to DB...";
2888
+				}
2402 2889
 				$error = update_db::modes_fam();
2403
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2404
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2890
+			} else {
2891
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2892
+			}
2893
+		} else {
2894
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2895
+		}
2405 2896
 		if ($error != '') {
2406 2897
 			return $error;
2407
-		} elseif ($globalDebug) echo "Done\n";
2898
+		} elseif ($globalDebug) {
2899
+			echo "Done\n";
2900
+		}
2408 2901
 		return '';
2409 2902
 	}
2410 2903
 
2411 2904
 	public static function update_airlines_fam() {
2412 2905
 		global $tmp_dir, $globalDebug;
2413
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
2906
+		if ($globalDebug) {
2907
+			echo "Airlines from FlightAirMap website : Download...";
2908
+		}
2414 2909
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
2415 2910
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
2416 2911
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
@@ -2419,26 +2914,42 @@  discard block
 block discarded – undo
2419 2914
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
2420 2915
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
2421 2916
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
2422
-						if ($globalDebug) echo "Gunzip...";
2917
+						if ($globalDebug) {
2918
+							echo "Gunzip...";
2919
+						}
2423 2920
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
2424
-						if ($globalDebug) echo "Add to DB...";
2921
+						if ($globalDebug) {
2922
+							echo "Add to DB...";
2923
+						}
2425 2924
 						$error = update_db::airlines_fam();
2426 2925
 						update_db::insert_airlines_version($airlines_md5);
2427
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2428
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2429
-			} elseif ($globalDebug) echo "No update";
2430
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2926
+					} else {
2927
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2928
+					}
2929
+			    } else {
2930
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2931
+			    }
2932
+			} elseif ($globalDebug) {
2933
+				echo "No update";
2934
+			}
2935
+		} else {
2936
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2937
+		}
2431 2938
 		if ($error != '') {
2432 2939
 			return $error;
2433 2940
 		} else {
2434
-			if ($globalDebug) echo "Done\n";
2941
+			if ($globalDebug) {
2942
+				echo "Done\n";
2943
+			}
2435 2944
 		}
2436 2945
 		return '';
2437 2946
 	}
2438 2947
 
2439 2948
 	public static function update_owner_fam() {
2440 2949
 		global $tmp_dir, $globalDebug, $globalOwner;
2441
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2950
+		if ($globalDebug) {
2951
+			echo "owner from FlightAirMap website : Download...";
2952
+		}
2442 2953
 		$error = '';
2443 2954
 		if ($globalOwner === TRUE) {
2444 2955
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
@@ -2451,35 +2962,57 @@  discard block
 block discarded – undo
2451 2962
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
2452 2963
 			$owners_md5 = $owners_md5_file[0];
2453 2964
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
2454
-				if ($globalDebug) echo "Gunzip...";
2965
+				if ($globalDebug) {
2966
+					echo "Gunzip...";
2967
+				}
2455 2968
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
2456
-				if ($globalDebug) echo "Add to DB...";
2969
+				if ($globalDebug) {
2970
+					echo "Add to DB...";
2971
+				}
2457 2972
 				$error = update_db::owner_fam();
2458
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
2459
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2973
+			} else {
2974
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
2975
+			}
2976
+		} else {
2977
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2978
+		}
2460 2979
 		if ($error != '') {
2461 2980
 			return $error;
2462
-		} elseif ($globalDebug) echo "Done\n";
2981
+		} elseif ($globalDebug) {
2982
+			echo "Done\n";
2983
+		}
2463 2984
 		return '';
2464 2985
 	}
2465 2986
 	public static function update_routes_fam() {
2466 2987
 		global $tmp_dir, $globalDebug;
2467
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
2988
+		if ($globalDebug) {
2989
+			echo "Routes from FlightAirMap website : Download...";
2990
+		}
2468 2991
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
2469 2992
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
2470 2993
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
2471 2994
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
2472 2995
 			$routes_md5 = $routes_md5_file[0];
2473 2996
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
2474
-				if ($globalDebug) echo "Gunzip...";
2997
+				if ($globalDebug) {
2998
+					echo "Gunzip...";
2999
+				}
2475 3000
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
2476
-				if ($globalDebug) echo "Add to DB...";
3001
+				if ($globalDebug) {
3002
+					echo "Add to DB...";
3003
+				}
2477 3004
 				$error = update_db::routes_fam();
2478
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
2479
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3005
+			} else {
3006
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
3007
+			}
3008
+		} else {
3009
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3010
+		}
2480 3011
 		if ($error != '') {
2481 3012
 			return $error;
2482
-		} elseif ($globalDebug) echo "Done\n";
3013
+		} elseif ($globalDebug) {
3014
+			echo "Done\n";
3015
+		}
2483 3016
 		return '';
2484 3017
 	}
2485 3018
 	public static function update_marine_identity_fam() {
@@ -2489,21 +3022,33 @@  discard block
 block discarded – undo
2489 3022
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2490 3023
 			$marine_identity_md5 = $marine_identity_md5_file[0];
2491 3024
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
2492
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
3025
+				if ($globalDebug) {
3026
+					echo "Marine identity from FlightAirMap website : Download...";
3027
+				}
2493 3028
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
2494 3029
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
2495 3030
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
2496
-						if ($globalDebug) echo "Gunzip...";
3031
+						if ($globalDebug) {
3032
+							echo "Gunzip...";
3033
+						}
2497 3034
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
2498
-						if ($globalDebug) echo "Add to DB...";
3035
+						if ($globalDebug) {
3036
+							echo "Add to DB...";
3037
+						}
2499 3038
 						$error = update_db::marine_identity_fam();
2500
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
2501
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3039
+					} else {
3040
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
3041
+					}
3042
+				} else {
3043
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3044
+				}
2502 3045
 				if ($error != '') {
2503 3046
 					return $error;
2504 3047
 				} else {
2505 3048
 					update_db::insert_marine_identity_version($marine_identity_md5);
2506
-					if ($globalDebug) echo "Done\n";
3049
+					if ($globalDebug) {
3050
+						echo "Done\n";
3051
+					}
2507 3052
 				}
2508 3053
 			}
2509 3054
 		}
@@ -2517,21 +3062,33 @@  discard block
 block discarded – undo
2517 3062
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
2518 3063
 			$satellite_md5 = $satellite_md5_file[0];
2519 3064
 			if (!update_db::check_satellite_version($satellite_md5)) {
2520
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
3065
+				if ($globalDebug) {
3066
+					echo "Satellite from FlightAirMap website : Download...";
3067
+				}
2521 3068
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
2522 3069
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
2523 3070
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
2524
-						if ($globalDebug) echo "Gunzip...";
3071
+						if ($globalDebug) {
3072
+							echo "Gunzip...";
3073
+						}
2525 3074
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
2526
-						if ($globalDebug) echo "Add to DB...";
3075
+						if ($globalDebug) {
3076
+							echo "Add to DB...";
3077
+						}
2527 3078
 						$error = update_db::satellite_fam();
2528
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
2529
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3079
+					} else {
3080
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
3081
+					}
3082
+				} else {
3083
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3084
+				}
2530 3085
 				if ($error != '') {
2531 3086
 					return $error;
2532 3087
 				} else {
2533 3088
 					update_db::insert_satellite_version($satellite_md5);
2534
-					if ($globalDebug) echo "Done\n";
3089
+					if ($globalDebug) {
3090
+						echo "Done\n";
3091
+					}
2535 3092
 				}
2536 3093
 			}
2537 3094
 		}
@@ -2539,17 +3096,25 @@  discard block
 block discarded – undo
2539 3096
 	}
2540 3097
 	public static function update_banned_fam() {
2541 3098
 		global $tmp_dir, $globalDebug;
2542
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
3099
+		if ($globalDebug) {
3100
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
3101
+		}
2543 3102
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
2544 3103
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
2545 3104
 			//if ($globalDebug) echo "Gunzip...";
2546 3105
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
2547
-			if ($globalDebug) echo "Add to DB...";
3106
+			if ($globalDebug) {
3107
+				echo "Add to DB...";
3108
+			}
2548 3109
 			$error = update_db::banned_fam();
2549
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3110
+		} else {
3111
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3112
+		}
2550 3113
 		if ($error != '') {
2551 3114
 			return $error;
2552
-		} elseif ($globalDebug) echo "Done\n";
3115
+		} elseif ($globalDebug) {
3116
+			echo "Done\n";
3117
+		}
2553 3118
 		return '';
2554 3119
 	}
2555 3120
 
@@ -2557,7 +3122,9 @@  discard block
 block discarded – undo
2557 3122
 		global $tmp_dir, $globalDebug, $globalDBdriver;
2558 3123
 		include_once('class.create_db.php');
2559 3124
 		$error = '';
2560
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
3125
+		if ($globalDebug) {
3126
+			echo "Airspace from FlightAirMap website : Download...";
3127
+		}
2561 3128
 		if ($globalDBdriver == 'mysql') {
2562 3129
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2563 3130
 		} else {
@@ -2574,9 +3141,13 @@  discard block
 block discarded – undo
2574 3141
 				}
2575 3142
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2576 3143
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
2577
-						if ($globalDebug) echo "Gunzip...";
3144
+						if ($globalDebug) {
3145
+							echo "Gunzip...";
3146
+						}
2578 3147
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
2579
-						if ($globalDebug) echo "Add to DB...";
3148
+						if ($globalDebug) {
3149
+							echo "Add to DB...";
3150
+						}
2580 3151
 						$Connection = new Connection();
2581 3152
 						if ($Connection->tableExists('airspace')) {
2582 3153
 							$query = 'DROP TABLE airspace';
@@ -2589,20 +3160,30 @@  discard block
 block discarded – undo
2589 3160
 						}
2590 3161
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
2591 3162
 						update_db::insert_airspace_version($airspace_md5);
2592
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
2593
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3163
+					} else {
3164
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
3165
+					}
3166
+				} else {
3167
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3168
+				}
2594 3169
 			}
2595
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3170
+		} else {
3171
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3172
+		}
2596 3173
 		if ($error != '') {
2597 3174
 			return $error;
2598
-		} elseif ($globalDebug) echo "Done\n";
3175
+		} elseif ($globalDebug) {
3176
+			echo "Done\n";
3177
+		}
2599 3178
 		return '';
2600 3179
 	}
2601 3180
 
2602 3181
 	public static function update_geoid_fam() {
2603 3182
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
2604 3183
 		$error = '';
2605
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
3184
+		if ($globalDebug) {
3185
+			echo "Geoid from FlightAirMap website : Download...";
3186
+		}
2606 3187
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
2607 3188
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
2608 3189
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
@@ -2611,76 +3192,116 @@  discard block
 block discarded – undo
2611 3192
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
2612 3193
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
2613 3194
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
2614
-						if ($globalDebug) echo "Gunzip...";
3195
+						if ($globalDebug) {
3196
+							echo "Gunzip...";
3197
+						}
2615 3198
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
2616 3199
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
2617 3200
 							update_db::insert_geoid_version($geoid_md5);
2618 3201
 						}
2619
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
2620
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3202
+					} else {
3203
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
3204
+					}
3205
+				} else {
3206
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3207
+				}
2621 3208
 			}
2622
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3209
+		} else {
3210
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3211
+		}
2623 3212
 		if ($error != '') {
2624 3213
 			return $error;
2625
-		} elseif ($globalDebug) echo "Done\n";
3214
+		} elseif ($globalDebug) {
3215
+			echo "Done\n";
3216
+		}
2626 3217
 		return '';
2627 3218
 	}
2628 3219
 
2629 3220
 	public static function update_tle() {
2630 3221
 		global $tmp_dir, $globalDebug;
2631
-		if ($globalDebug) echo "Download TLE : Download...";
3222
+		if ($globalDebug) {
3223
+			echo "Download TLE : Download...";
3224
+		}
2632 3225
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2633 3226
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2634 3227
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
2635 3228
 		foreach ($alltle as $filename) {
2636
-			if ($globalDebug) echo "downloading ".$filename.'...';
3229
+			if ($globalDebug) {
3230
+				echo "downloading ".$filename.'...';
3231
+			}
2637 3232
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2638 3233
 			if (file_exists($tmp_dir.$filename)) {
2639
-				if ($globalDebug) echo "Add to DB ".$filename."...";
3234
+				if ($globalDebug) {
3235
+					echo "Add to DB ".$filename."...";
3236
+				}
2640 3237
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2641
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3238
+			} else {
3239
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3240
+			}
2642 3241
 			if ($error != '') {
2643 3242
 				echo $error."\n";
2644
-			} elseif ($globalDebug) echo "Done\n";
3243
+			} elseif ($globalDebug) {
3244
+				echo "Done\n";
3245
+			}
2645 3246
 		}
2646 3247
 		return '';
2647 3248
 	}
2648 3249
 
2649 3250
 	public static function update_ucsdb() {
2650 3251
 		global $tmp_dir, $globalDebug;
2651
-		if ($globalDebug) echo "Download UCS DB : Download...";
3252
+		if ($globalDebug) {
3253
+			echo "Download UCS DB : Download...";
3254
+		}
2652 3255
 		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2653 3256
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
2654
-			if ($globalDebug) echo "Add to DB...";
3257
+			if ($globalDebug) {
3258
+				echo "Add to DB...";
3259
+			}
2655 3260
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2656
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3261
+		} else {
3262
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3263
+		}
2657 3264
 		if ($error != '') {
2658 3265
 			echo $error."\n";
2659
-		} elseif ($globalDebug) echo "Done\n";
3266
+		} elseif ($globalDebug) {
3267
+			echo "Done\n";
3268
+		}
2660 3269
 		return '';
2661 3270
 	}
2662 3271
 
2663 3272
 	public static function update_celestrak() {
2664 3273
 		global $tmp_dir, $globalDebug;
2665
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
3274
+		if ($globalDebug) {
3275
+			echo "Download Celestrak DB : Download...";
3276
+		}
2666 3277
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
2667 3278
 		if (file_exists($tmp_dir.'satcat.txt')) {
2668
-			if ($globalDebug) echo "Add to DB...";
3279
+			if ($globalDebug) {
3280
+				echo "Add to DB...";
3281
+			}
2669 3282
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
2670
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3283
+		} else {
3284
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3285
+		}
2671 3286
 		if ($error != '') {
2672 3287
 			echo $error."\n";
2673
-		} elseif ($globalDebug) echo "Done\n";
3288
+		} elseif ($globalDebug) {
3289
+			echo "Done\n";
3290
+		}
2674 3291
 		return '';
2675 3292
 	}
2676 3293
 
2677 3294
 	public static function update_models() {
2678 3295
 		global $tmp_dir, $globalDebug;
2679 3296
 		$error = '';
2680
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
3297
+		if ($globalDebug) {
3298
+			echo "Models from FlightAirMap website : Download...";
3299
+		}
2681 3300
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2682 3301
 		if (file_exists($tmp_dir.'models.md5sum')) {
2683
-			if ($globalDebug) echo "Check files...\n";
3302
+			if ($globalDebug) {
3303
+				echo "Check files...\n";
3304
+			}
2684 3305
 			$newmodelsdb = array();
2685 3306
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2686 3307
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2699,25 +3320,35 @@  discard block
 block discarded – undo
2699 3320
 			}
2700 3321
 			$diff = array_diff($newmodelsdb,$modelsdb);
2701 3322
 			foreach ($diff as $key => $value) {
2702
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
3323
+				if ($globalDebug) {
3324
+					echo 'Downloading model '.$key.' ...'."\n";
3325
+				}
2703 3326
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2704 3327
 				
2705 3328
 			}
2706 3329
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2707
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3330
+		} else {
3331
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3332
+		}
2708 3333
 		if ($error != '') {
2709 3334
 			return $error;
2710
-		} elseif ($globalDebug) echo "Done\n";
3335
+		} elseif ($globalDebug) {
3336
+			echo "Done\n";
3337
+		}
2711 3338
 		return '';
2712 3339
 	}
2713 3340
 
2714 3341
 	public static function update_space_models() {
2715 3342
 		global $tmp_dir, $globalDebug;
2716 3343
 		$error = '';
2717
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
3344
+		if ($globalDebug) {
3345
+			echo "Space models from FlightAirMap website : Download...";
3346
+		}
2718 3347
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2719 3348
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2720
-			if ($globalDebug) echo "Check files...\n";
3349
+			if ($globalDebug) {
3350
+				echo "Check files...\n";
3351
+			}
2721 3352
 			$newmodelsdb = array();
2722 3353
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2723 3354
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2736,25 +3367,35 @@  discard block
 block discarded – undo
2736 3367
 			}
2737 3368
 			$diff = array_diff($newmodelsdb,$modelsdb);
2738 3369
 			foreach ($diff as $key => $value) {
2739
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
3370
+				if ($globalDebug) {
3371
+					echo 'Downloading space model '.$key.' ...'."\n";
3372
+				}
2740 3373
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2741 3374
 				
2742 3375
 			}
2743 3376
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2744
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3377
+		} else {
3378
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3379
+		}
2745 3380
 		if ($error != '') {
2746 3381
 			return $error;
2747
-		} elseif ($globalDebug) echo "Done\n";
3382
+		} elseif ($globalDebug) {
3383
+			echo "Done\n";
3384
+		}
2748 3385
 		return '';
2749 3386
 	}
2750 3387
 
2751 3388
 	public static function update_vehicules_models() {
2752 3389
 		global $tmp_dir, $globalDebug;
2753 3390
 		$error = '';
2754
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
3391
+		if ($globalDebug) {
3392
+			echo "Vehicules models from FlightAirMap website : Download...";
3393
+		}
2755 3394
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
2756 3395
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
2757
-			if ($globalDebug) echo "Check files...\n";
3396
+			if ($globalDebug) {
3397
+				echo "Check files...\n";
3398
+			}
2758 3399
 			$newmodelsdb = array();
2759 3400
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
2760 3401
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2773,15 +3414,21 @@  discard block
 block discarded – undo
2773 3414
 			}
2774 3415
 			$diff = array_diff($newmodelsdb,$modelsdb);
2775 3416
 			foreach ($diff as $key => $value) {
2776
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
3417
+				if ($globalDebug) {
3418
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
3419
+				}
2777 3420
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
2778 3421
 				
2779 3422
 			}
2780 3423
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2781
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3424
+		} else {
3425
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3426
+		}
2782 3427
 		if ($error != '') {
2783 3428
 			return $error;
2784
-		} elseif ($globalDebug) echo "Done\n";
3429
+		} elseif ($globalDebug) {
3430
+			echo "Done\n";
3431
+		}
2785 3432
 		return '';
2786 3433
 	}
2787 3434
 
@@ -2824,7 +3471,9 @@  discard block
 block discarded – undo
2824 3471
                 }
2825 3472
 
2826 3473
 		$error = '';
2827
-		if ($globalDebug) echo "Notam : Download...";
3474
+		if ($globalDebug) {
3475
+			echo "Notam : Download...";
3476
+		}
2828 3477
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2829 3478
 		if (file_exists($tmp_dir.'notam.rss')) {
2830 3479
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
@@ -2839,14 +3488,30 @@  discard block
 block discarded – undo
2839 3488
 				$data['fir'] = $q[0];
2840 3489
 				$data['code'] = $q[1];
2841 3490
 				$ifrvfr = $q[2];
2842
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
2843
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
2844
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
2845
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
2846
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
2847
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
2848
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
2849
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
3491
+				if ($ifrvfr == 'IV') {
3492
+					$data['rules'] = 'IFR/VFR';
3493
+				}
3494
+				if ($ifrvfr == 'I') {
3495
+					$data['rules'] = 'IFR';
3496
+				}
3497
+				if ($ifrvfr == 'V') {
3498
+					$data['rules'] = 'VFR';
3499
+				}
3500
+				if ($q[4] == 'A') {
3501
+					$data['scope'] = 'Airport warning';
3502
+				}
3503
+				if ($q[4] == 'E') {
3504
+					$data['scope'] = 'Enroute warning';
3505
+				}
3506
+				if ($q[4] == 'W') {
3507
+					$data['scope'] = 'Navigation warning';
3508
+				}
3509
+				if ($q[4] == 'AE') {
3510
+					$data['scope'] = 'Airport/Enroute warning';
3511
+				}
3512
+				if ($q[4] == 'AW') {
3513
+					$data['scope'] = 'Airport/Navigation warning';
3514
+				}
2850 3515
 				//$data['scope'] = $q[4];
2851 3516
 				$data['lower_limit'] = $q[5];
2852 3517
 				$data['upper_limit'] = $q[6];
@@ -2854,8 +3519,12 @@  discard block
 block discarded – undo
2854 3519
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2855 3520
 				$latitude = $Common->convertDec($las,'latitude');
2856 3521
 				$longitude = $Common->convertDec($lns,'longitude');
2857
-				if ($lac == 'S') $latitude = '-'.$latitude;
2858
-				if ($lnc == 'W') $longitude = '-'.$longitude;
3522
+				if ($lac == 'S') {
3523
+					$latitude = '-'.$latitude;
3524
+				}
3525
+				if ($lnc == 'W') {
3526
+					$longitude = '-'.$longitude;
3527
+				}
2859 3528
 				$data['center_latitude'] = $latitude;
2860 3529
 				$data['center_longitude'] = $longitude;
2861 3530
 				$data['radius'] = intval($radius);
@@ -2885,10 +3554,14 @@  discard block
 block discarded – undo
2885 3554
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2886 3555
 				unset($data);
2887 3556
 			} 
2888
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3557
+		} else {
3558
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3559
+		}
2889 3560
 		if ($error != '') {
2890 3561
 			return $error;
2891
-		} elseif ($globalDebug) echo "Done\n";
3562
+		} elseif ($globalDebug) {
3563
+			echo "Done\n";
3564
+		}
2892 3565
 		return '';
2893 3566
 	}
2894 3567
 	
@@ -2913,7 +3586,9 @@  discard block
 block discarded – undo
2913 3586
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
2914 3587
 		$airspace_json = json_decode($airspace_lst,true);
2915 3588
 		foreach ($airspace_json['records'] as $airspace) {
2916
-			if ($globalDebug) echo $airspace['name']."...\n";
3589
+			if ($globalDebug) {
3590
+				echo $airspace['name']."...\n";
3591
+			}
2917 3592
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
2918 3593
 			if (file_exists($tmp_dir.$airspace['name'])) {
2919 3594
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
@@ -2957,8 +3632,11 @@  discard block
 block discarded – undo
2957 3632
                         return "error : ".$e->getMessage();
2958 3633
                 }
2959 3634
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2960
-                if ($row['nb'] > 0) return false;
2961
-                else return true;
3635
+                if ($row['nb'] > 0) {
3636
+                	return false;
3637
+                } else {
3638
+                	return true;
3639
+                }
2962 3640
 	}
2963 3641
 
2964 3642
 	public static function insert_last_update() {
@@ -2983,8 +3661,11 @@  discard block
 block discarded – undo
2983 3661
                         return "error : ".$e->getMessage();
2984 3662
                 }
2985 3663
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2986
-                if ($row['nb'] > 0) return true;
2987
-                else return false;
3664
+                if ($row['nb'] > 0) {
3665
+                	return true;
3666
+                } else {
3667
+                	return false;
3668
+                }
2988 3669
 	}
2989 3670
 
2990 3671
 	public static function check_geoid_version($version) {
@@ -2997,8 +3678,11 @@  discard block
 block discarded – undo
2997 3678
                         return "error : ".$e->getMessage();
2998 3679
                 }
2999 3680
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3000
-                if ($row['nb'] > 0) return true;
3001
-                else return false;
3681
+                if ($row['nb'] > 0) {
3682
+                	return true;
3683
+                } else {
3684
+                	return false;
3685
+                }
3002 3686
 	}
3003 3687
 
3004 3688
 	public static function check_marine_identity_version($version) {
@@ -3011,8 +3695,11 @@  discard block
 block discarded – undo
3011 3695
 			return "error : ".$e->getMessage();
3012 3696
 		}
3013 3697
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3014
-		if ($row['nb'] > 0) return true;
3015
-		else return false;
3698
+		if ($row['nb'] > 0) {
3699
+			return true;
3700
+		} else {
3701
+			return false;
3702
+		}
3016 3703
 	}
3017 3704
 
3018 3705
 	public static function check_satellite_version($version) {
@@ -3025,8 +3712,11 @@  discard block
 block discarded – undo
3025 3712
 			return "error : ".$e->getMessage();
3026 3713
 		}
3027 3714
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3028
-		if ($row['nb'] > 0) return true;
3029
-		else return false;
3715
+		if ($row['nb'] > 0) {
3716
+			return true;
3717
+		} else {
3718
+			return false;
3719
+		}
3030 3720
 	}
3031 3721
 
3032 3722
 	public static function check_airlines_version($version) {
@@ -3039,8 +3729,11 @@  discard block
 block discarded – undo
3039 3729
 			return "error : ".$e->getMessage();
3040 3730
 		}
3041 3731
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3042
-		if ($row['nb'] > 0) return true;
3043
-		else return false;
3732
+		if ($row['nb'] > 0) {
3733
+			return true;
3734
+		} else {
3735
+			return false;
3736
+		}
3044 3737
 	}
3045 3738
 
3046 3739
 	public static function check_notam_version($version) {
@@ -3053,8 +3746,11 @@  discard block
 block discarded – undo
3053 3746
 			return "error : ".$e->getMessage();
3054 3747
 		}
3055 3748
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3056
-		if ($row['nb'] > 0) return true;
3057
-		else return false;
3749
+		if ($row['nb'] > 0) {
3750
+			return true;
3751
+		} else {
3752
+			return false;
3753
+		}
3058 3754
 	}
3059 3755
 
3060 3756
 	public static function insert_airlines_version($version) {
@@ -3144,8 +3840,11 @@  discard block
 block discarded – undo
3144 3840
                         return "error : ".$e->getMessage();
3145 3841
                 }
3146 3842
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3147
-                if ($row['nb'] > 0) return false;
3148
-                else return true;
3843
+                if ($row['nb'] > 0) {
3844
+                	return false;
3845
+                } else {
3846
+                	return true;
3847
+                }
3149 3848
 	}
3150 3849
 
3151 3850
 	public static function insert_last_notam_update() {
@@ -3175,8 +3874,11 @@  discard block
 block discarded – undo
3175 3874
                         return "error : ".$e->getMessage();
3176 3875
                 }
3177 3876
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3178
-                if ($row['nb'] > 0) return false;
3179
-                else return true;
3877
+                if ($row['nb'] > 0) {
3878
+                	return false;
3879
+                } else {
3880
+                	return true;
3881
+                }
3180 3882
 	}
3181 3883
 
3182 3884
 	public static function insert_last_airspace_update() {
@@ -3206,8 +3908,11 @@  discard block
 block discarded – undo
3206 3908
                         return "error : ".$e->getMessage();
3207 3909
                 }
3208 3910
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3209
-                if ($row['nb'] > 0) return false;
3210
-                else return true;
3911
+                if ($row['nb'] > 0) {
3912
+                	return false;
3913
+                } else {
3914
+                	return true;
3915
+                }
3211 3916
 	}
3212 3917
 
3213 3918
 	public static function insert_last_geoid_update() {
@@ -3237,8 +3942,11 @@  discard block
 block discarded – undo
3237 3942
 			return "error : ".$e->getMessage();
3238 3943
 		}
3239 3944
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3240
-		if ($row['nb'] > 0) return false;
3241
-		else return true;
3945
+		if ($row['nb'] > 0) {
3946
+			return false;
3947
+		} else {
3948
+			return true;
3949
+		}
3242 3950
 	}
3243 3951
 
3244 3952
 	public static function insert_last_owner_update() {
@@ -3268,8 +3976,11 @@  discard block
 block discarded – undo
3268 3976
 			return "error : ".$e->getMessage();
3269 3977
 		}
3270 3978
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3271
-		if ($row['nb'] > 0) return false;
3272
-		else return true;
3979
+		if ($row['nb'] > 0) {
3980
+			return false;
3981
+		} else {
3982
+			return true;
3983
+		}
3273 3984
 	}
3274 3985
 
3275 3986
 	public static function insert_last_airlines_update() {
@@ -3299,8 +4010,11 @@  discard block
 block discarded – undo
3299 4010
                         return "error : ".$e->getMessage();
3300 4011
                 }
3301 4012
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3302
-                if ($row['nb'] > 0) return false;
3303
-                else return true;
4013
+                if ($row['nb'] > 0) {
4014
+                	return false;
4015
+                } else {
4016
+                	return true;
4017
+                }
3304 4018
 	}
3305 4019
 
3306 4020
 	public static function insert_last_schedules_update() {
@@ -3330,8 +4044,11 @@  discard block
 block discarded – undo
3330 4044
 			return "error : ".$e->getMessage();
3331 4045
 		}
3332 4046
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3333
-		if ($row['nb'] > 0) return false;
3334
-		else return true;
4047
+		if ($row['nb'] > 0) {
4048
+			return false;
4049
+		} else {
4050
+			return true;
4051
+		}
3335 4052
 	}
3336 4053
 
3337 4054
 	public static function insert_last_tle_update() {
@@ -3361,8 +4078,11 @@  discard block
 block discarded – undo
3361 4078
 			return "error : ".$e->getMessage();
3362 4079
 		}
3363 4080
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3364
-		if ($row['nb'] > 0) return false;
3365
-		else return true;
4081
+		if ($row['nb'] > 0) {
4082
+			return false;
4083
+		} else {
4084
+			return true;
4085
+		}
3366 4086
 	}
3367 4087
 
3368 4088
 	public static function insert_last_ucsdb_update() {
@@ -3392,8 +4112,11 @@  discard block
 block discarded – undo
3392 4112
 			return "error : ".$e->getMessage();
3393 4113
 		}
3394 4114
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3395
-		if ($row['nb'] > 0) return false;
3396
-		else return true;
4115
+		if ($row['nb'] > 0) {
4116
+			return false;
4117
+		} else {
4118
+			return true;
4119
+		}
3397 4120
 	}
3398 4121
 
3399 4122
 	public static function insert_last_celestrak_update() {
@@ -3423,8 +4146,11 @@  discard block
 block discarded – undo
3423 4146
 			return "error : ".$e->getMessage();
3424 4147
 		}
3425 4148
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3426
-		if ($row['nb'] > 0) return false;
3427
-		else return true;
4149
+		if ($row['nb'] > 0) {
4150
+			return false;
4151
+		} else {
4152
+			return true;
4153
+		}
3428 4154
 	}
3429 4155
 
3430 4156
 	public static function check_last_satellite_update() {
@@ -3442,8 +4168,11 @@  discard block
 block discarded – undo
3442 4168
 			return "error : ".$e->getMessage();
3443 4169
 		}
3444 4170
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3445
-		if ($row['nb'] > 0) return false;
3446
-		else return true;
4171
+		if ($row['nb'] > 0) {
4172
+			return false;
4173
+		} else {
4174
+			return true;
4175
+		}
3447 4176
 	}
3448 4177
 
3449 4178
 	public static function insert_last_marine_identity_update() {
Please login to merge, or discard this patch.