@@ -26,7 +26,9 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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); |
@@ -1827,7 +2001,9 @@ discard block |
||
1827 | 2001 | if (($handle = fopen($filename, 'r')) !== FALSE) |
1828 | 2002 | { |
1829 | 2003 | $i = 0; |
1830 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
2004 | + if ($globalTransaction) { |
|
2005 | + $Connection->db->beginTransaction(); |
|
2006 | + } |
|
1831 | 2007 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1832 | 2008 | { |
1833 | 2009 | $i++; |
@@ -1855,7 +2031,9 @@ discard block |
||
1855 | 2031 | } |
1856 | 2032 | } |
1857 | 2033 | fclose($handle); |
1858 | - if ($globalTransaction) $Connection->db->commit(); |
|
2034 | + if ($globalTransaction) { |
|
2035 | + $Connection->db->commit(); |
|
2036 | + } |
|
1859 | 2037 | } |
1860 | 2038 | return ''; |
1861 | 2039 | } |
@@ -1878,7 +2056,9 @@ discard block |
||
1878 | 2056 | $Connection = new Connection(); |
1879 | 2057 | if (($handle = fopen($filename, 'r')) !== FALSE) |
1880 | 2058 | { |
1881 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
2059 | + if ($globalTransaction) { |
|
2060 | + $Connection->db->beginTransaction(); |
|
2061 | + } |
|
1882 | 2062 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1883 | 2063 | { |
1884 | 2064 | if(count($row) > 1) { |
@@ -1892,7 +2072,9 @@ discard block |
||
1892 | 2072 | } |
1893 | 2073 | } |
1894 | 2074 | fclose($handle); |
1895 | - if ($globalTransaction) $Connection->db->commit(); |
|
2075 | + if ($globalTransaction) { |
|
2076 | + $Connection->db->commit(); |
|
2077 | + } |
|
1896 | 2078 | } |
1897 | 2079 | return ''; |
1898 | 2080 | } |
@@ -1912,8 +2094,9 @@ discard block |
||
1912 | 2094 | } |
1913 | 2095 | |
1914 | 2096 | |
1915 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
1916 | - else { |
|
2097 | + if ($globalDBdriver == 'mysql') { |
|
2098 | + update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
2099 | + } else { |
|
1917 | 2100 | update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
1918 | 2101 | $query = "CREATE EXTENSION postgis"; |
1919 | 2102 | $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
@@ -1932,7 +2115,9 @@ discard block |
||
1932 | 2115 | global $tmp_dir, $globalDebug; |
1933 | 2116 | include_once('class.create_db.php'); |
1934 | 2117 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
1935 | - if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
|
2118 | + if ($globalDebug) { |
|
2119 | + echo "NOTAM from FlightAirMap website : Download..."; |
|
2120 | + } |
|
1936 | 2121 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5'); |
1937 | 2122 | $error = ''; |
1938 | 2123 | if (file_exists($tmp_dir.'notam.txt.gz.md5')) { |
@@ -1942,20 +2127,34 @@ discard block |
||
1942 | 2127 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
1943 | 2128 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
1944 | 2129 | if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) { |
1945 | - if ($globalDebug) echo "Gunzip..."; |
|
2130 | + if ($globalDebug) { |
|
2131 | + echo "Gunzip..."; |
|
2132 | + } |
|
1946 | 2133 | update_db::gunzip($tmp_dir.'notam.txt.gz'); |
1947 | - if ($globalDebug) echo "Add to DB..."; |
|
2134 | + if ($globalDebug) { |
|
2135 | + echo "Add to DB..."; |
|
2136 | + } |
|
1948 | 2137 | //$error = create_db::import_file($tmp_dir.'notam.sql'); |
1949 | 2138 | $NOTAM = new NOTAM(); |
1950 | 2139 | $NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt'); |
1951 | 2140 | update_db::insert_notam_version($notam_md5); |
1952 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed."; |
|
1953 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
1954 | - } elseif ($globalDebug) echo "No new version."; |
|
1955 | - } else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed."; |
|
2141 | + } else { |
|
2142 | + $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed."; |
|
2143 | + } |
|
2144 | + } else { |
|
2145 | + $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
2146 | + } |
|
2147 | + } elseif ($globalDebug) { |
|
2148 | + echo "No new version."; |
|
2149 | + } |
|
2150 | + } else { |
|
2151 | + $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed."; |
|
2152 | + } |
|
1956 | 2153 | if ($error != '') { |
1957 | 2154 | return $error; |
1958 | - } elseif ($globalDebug) echo "Done\n"; |
|
2155 | + } elseif ($globalDebug) { |
|
2156 | + echo "Done\n"; |
|
2157 | + } |
|
1959 | 2158 | return ''; |
1960 | 2159 | } |
1961 | 2160 | |
@@ -2010,68 +2209,114 @@ discard block |
||
2010 | 2209 | //update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip'); |
2011 | 2210 | if (extension_loaded('zip')) { |
2012 | 2211 | if (file_exists($tmp_dir.'ivae_feb2013.zip')) { |
2013 | - if ($globalDebug) echo "Unzip..."; |
|
2212 | + if ($globalDebug) { |
|
2213 | + echo "Unzip..."; |
|
2214 | + } |
|
2014 | 2215 | update_db::unzip($tmp_dir.'ivae_feb2013.zip'); |
2015 | - if ($globalDebug) echo "Add to DB..."; |
|
2216 | + if ($globalDebug) { |
|
2217 | + echo "Add to DB..."; |
|
2218 | + } |
|
2016 | 2219 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
2017 | - if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
|
2220 | + if ($globalDebug) { |
|
2221 | + echo "Copy airlines logos to airlines images directory..."; |
|
2222 | + } |
|
2018 | 2223 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
2019 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
2020 | - } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
2021 | - } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
2022 | - } else $error = "ZIP module not loaded but required for IVAO."; |
|
2224 | + if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) { |
|
2225 | + $error = "Failed to copy airlines logo."; |
|
2226 | + } |
|
2227 | + } else { |
|
2228 | + $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
2229 | + } |
|
2230 | + } else { |
|
2231 | + $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
2232 | + } |
|
2233 | + } else { |
|
2234 | + $error = "ZIP module not loaded but required for IVAO."; |
|
2235 | + } |
|
2023 | 2236 | if ($error != '') { |
2024 | 2237 | return $error; |
2025 | - } elseif ($globalDebug) echo "Done\n"; |
|
2238 | + } elseif ($globalDebug) { |
|
2239 | + echo "Done\n"; |
|
2240 | + } |
|
2026 | 2241 | return ''; |
2027 | 2242 | } |
2028 | 2243 | |
2029 | 2244 | public static function update_routes() { |
2030 | 2245 | global $tmp_dir, $globalDebug; |
2031 | 2246 | $error = ''; |
2032 | - if ($globalDebug) echo "Routes : Download..."; |
|
2247 | + if ($globalDebug) { |
|
2248 | + echo "Routes : Download..."; |
|
2249 | + } |
|
2033 | 2250 | update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
2034 | 2251 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
2035 | - if ($globalDebug) echo "Gunzip..."; |
|
2252 | + if ($globalDebug) { |
|
2253 | + echo "Gunzip..."; |
|
2254 | + } |
|
2036 | 2255 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
2037 | - if ($globalDebug) echo "Add to DB..."; |
|
2256 | + if ($globalDebug) { |
|
2257 | + echo "Add to DB..."; |
|
2258 | + } |
|
2038 | 2259 | $error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb'); |
2039 | - } else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
2260 | + } else { |
|
2261 | + $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
2262 | + } |
|
2040 | 2263 | if ($error != '') { |
2041 | 2264 | return $error; |
2042 | - } elseif ($globalDebug) echo "Done\n"; |
|
2265 | + } elseif ($globalDebug) { |
|
2266 | + echo "Done\n"; |
|
2267 | + } |
|
2043 | 2268 | return ''; |
2044 | 2269 | } |
2045 | 2270 | public static function update_oneworld() { |
2046 | 2271 | global $tmp_dir, $globalDebug; |
2047 | 2272 | $error = ''; |
2048 | - if ($globalDebug) echo "Schedules Oneworld : Download..."; |
|
2273 | + if ($globalDebug) { |
|
2274 | + echo "Schedules Oneworld : Download..."; |
|
2275 | + } |
|
2049 | 2276 | update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
2050 | 2277 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
2051 | - if ($globalDebug) echo "Gunzip..."; |
|
2278 | + if ($globalDebug) { |
|
2279 | + echo "Gunzip..."; |
|
2280 | + } |
|
2052 | 2281 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
2053 | - if ($globalDebug) echo "Add to DB..."; |
|
2282 | + if ($globalDebug) { |
|
2283 | + echo "Add to DB..."; |
|
2284 | + } |
|
2054 | 2285 | $error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv'); |
2055 | - } else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
2286 | + } else { |
|
2287 | + $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
2288 | + } |
|
2056 | 2289 | if ($error != '') { |
2057 | 2290 | return $error; |
2058 | - } elseif ($globalDebug) echo "Done\n"; |
|
2291 | + } elseif ($globalDebug) { |
|
2292 | + echo "Done\n"; |
|
2293 | + } |
|
2059 | 2294 | return ''; |
2060 | 2295 | } |
2061 | 2296 | public static function update_skyteam() { |
2062 | 2297 | global $tmp_dir, $globalDebug; |
2063 | 2298 | $error = ''; |
2064 | - if ($globalDebug) echo "Schedules Skyteam : Download..."; |
|
2299 | + if ($globalDebug) { |
|
2300 | + echo "Schedules Skyteam : Download..."; |
|
2301 | + } |
|
2065 | 2302 | update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
2066 | 2303 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
2067 | - if ($globalDebug) echo "Gunzip..."; |
|
2304 | + if ($globalDebug) { |
|
2305 | + echo "Gunzip..."; |
|
2306 | + } |
|
2068 | 2307 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
2069 | - if ($globalDebug) echo "Add to DB..."; |
|
2308 | + if ($globalDebug) { |
|
2309 | + echo "Add to DB..."; |
|
2310 | + } |
|
2070 | 2311 | $error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv'); |
2071 | - } else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
2312 | + } else { |
|
2313 | + $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
2314 | + } |
|
2072 | 2315 | if ($error != '') { |
2073 | 2316 | return $error; |
2074 | - } elseif ($globalDebug) echo "Done\n"; |
|
2317 | + } elseif ($globalDebug) { |
|
2318 | + echo "Done\n"; |
|
2319 | + } |
|
2075 | 2320 | return ''; |
2076 | 2321 | } |
2077 | 2322 | public static function update_ModeS() { |
@@ -2088,340 +2333,590 @@ discard block |
||
2088 | 2333 | exit; |
2089 | 2334 | } elseif ($globalDebug) echo "Done\n"; |
2090 | 2335 | */ |
2091 | - if ($globalDebug) echo "Modes : Download..."; |
|
2092 | -// update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
2336 | + if ($globalDebug) { |
|
2337 | + echo "Modes : Download..."; |
|
2338 | + } |
|
2339 | + // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
2093 | 2340 | update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
2094 | 2341 | |
2095 | 2342 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
2096 | 2343 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
2097 | - if ($globalDebug) echo "Unzip..."; |
|
2098 | -// update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
2344 | + if ($globalDebug) { |
|
2345 | + echo "Unzip..."; |
|
2346 | + } |
|
2347 | + // update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
2099 | 2348 | update_db::gunzip($tmp_dir.'BaseStation.sqb.gz'); |
2100 | - if ($globalDebug) echo "Add to DB..."; |
|
2349 | + if ($globalDebug) { |
|
2350 | + echo "Add to DB..."; |
|
2351 | + } |
|
2101 | 2352 | $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb'); |
2102 | 2353 | // $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb'); |
2103 | - } else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
2354 | + } else { |
|
2355 | + $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
2356 | + } |
|
2104 | 2357 | if ($error != '') { |
2105 | 2358 | return $error; |
2106 | - } elseif ($globalDebug) echo "Done\n"; |
|
2359 | + } elseif ($globalDebug) { |
|
2360 | + echo "Done\n"; |
|
2361 | + } |
|
2107 | 2362 | return ''; |
2108 | 2363 | } |
2109 | 2364 | |
2110 | 2365 | public static function update_ModeS_faa() { |
2111 | 2366 | global $tmp_dir, $globalDebug; |
2112 | - if ($globalDebug) echo "Modes FAA: Download..."; |
|
2367 | + if ($globalDebug) { |
|
2368 | + echo "Modes FAA: Download..."; |
|
2369 | + } |
|
2113 | 2370 | update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
2114 | 2371 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
2115 | - if ($globalDebug) echo "Unzip..."; |
|
2372 | + if ($globalDebug) { |
|
2373 | + echo "Unzip..."; |
|
2374 | + } |
|
2116 | 2375 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
2117 | - if ($globalDebug) echo "Add to DB..."; |
|
2376 | + if ($globalDebug) { |
|
2377 | + echo "Add to DB..."; |
|
2378 | + } |
|
2118 | 2379 | $error = update_db::modes_faa(); |
2119 | - } else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
2380 | + } else { |
|
2381 | + $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
2382 | + } |
|
2120 | 2383 | if ($error != '') { |
2121 | 2384 | return $error; |
2122 | - } elseif ($globalDebug) echo "Done\n"; |
|
2385 | + } elseif ($globalDebug) { |
|
2386 | + echo "Done\n"; |
|
2387 | + } |
|
2123 | 2388 | return ''; |
2124 | 2389 | } |
2125 | 2390 | |
2126 | 2391 | public static function update_ModeS_flarm() { |
2127 | 2392 | global $tmp_dir, $globalDebug; |
2128 | - if ($globalDebug) echo "Modes Flarmnet: Download..."; |
|
2393 | + if ($globalDebug) { |
|
2394 | + echo "Modes Flarmnet: Download..."; |
|
2395 | + } |
|
2129 | 2396 | update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
2130 | 2397 | if (file_exists($tmp_dir.'data.fln')) { |
2131 | - if ($globalDebug) echo "Add to DB..."; |
|
2398 | + if ($globalDebug) { |
|
2399 | + echo "Add to DB..."; |
|
2400 | + } |
|
2132 | 2401 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
2133 | - } else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
2402 | + } else { |
|
2403 | + $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
2404 | + } |
|
2134 | 2405 | if ($error != '') { |
2135 | 2406 | return $error; |
2136 | - } elseif ($globalDebug) echo "Done\n"; |
|
2407 | + } elseif ($globalDebug) { |
|
2408 | + echo "Done\n"; |
|
2409 | + } |
|
2137 | 2410 | return ''; |
2138 | 2411 | } |
2139 | 2412 | |
2140 | 2413 | public static function update_ModeS_ogn() { |
2141 | 2414 | global $tmp_dir, $globalDebug; |
2142 | - if ($globalDebug) echo "Modes OGN: Download..."; |
|
2415 | + if ($globalDebug) { |
|
2416 | + echo "Modes OGN: Download..."; |
|
2417 | + } |
|
2143 | 2418 | update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
2144 | 2419 | if (file_exists($tmp_dir.'ogn.csv')) { |
2145 | - if ($globalDebug) echo "Add to DB..."; |
|
2420 | + if ($globalDebug) { |
|
2421 | + echo "Add to DB..."; |
|
2422 | + } |
|
2146 | 2423 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
2147 | - } else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
2424 | + } else { |
|
2425 | + $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
2426 | + } |
|
2148 | 2427 | if ($error != '') { |
2149 | 2428 | return $error; |
2150 | - } elseif ($globalDebug) echo "Done\n"; |
|
2429 | + } elseif ($globalDebug) { |
|
2430 | + echo "Done\n"; |
|
2431 | + } |
|
2151 | 2432 | return ''; |
2152 | 2433 | } |
2153 | 2434 | |
2154 | 2435 | public static function update_owner() { |
2155 | 2436 | global $tmp_dir, $globalDebug, $globalMasterSource; |
2156 | 2437 | |
2157 | - if ($globalDebug) echo "Owner France: Download..."; |
|
2438 | + if ($globalDebug) { |
|
2439 | + echo "Owner France: Download..."; |
|
2440 | + } |
|
2158 | 2441 | update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
2159 | 2442 | if (file_exists($tmp_dir.'owner_f.csv')) { |
2160 | - if ($globalDebug) echo "Add to DB..."; |
|
2443 | + if ($globalDebug) { |
|
2444 | + echo "Add to DB..."; |
|
2445 | + } |
|
2161 | 2446 | $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
2162 | - } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
2447 | + } else { |
|
2448 | + $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
2449 | + } |
|
2163 | 2450 | if ($error != '') { |
2164 | 2451 | return $error; |
2165 | - } elseif ($globalDebug) echo "Done\n"; |
|
2452 | + } elseif ($globalDebug) { |
|
2453 | + echo "Done\n"; |
|
2454 | + } |
|
2166 | 2455 | |
2167 | - if ($globalDebug) echo "Owner Ireland: Download..."; |
|
2456 | + if ($globalDebug) { |
|
2457 | + echo "Owner Ireland: Download..."; |
|
2458 | + } |
|
2168 | 2459 | update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
2169 | 2460 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
2170 | - if ($globalDebug) echo "Add to DB..."; |
|
2461 | + if ($globalDebug) { |
|
2462 | + echo "Add to DB..."; |
|
2463 | + } |
|
2171 | 2464 | $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
2172 | - } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
2465 | + } else { |
|
2466 | + $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
2467 | + } |
|
2173 | 2468 | if ($error != '') { |
2174 | 2469 | return $error; |
2175 | - } elseif ($globalDebug) echo "Done\n"; |
|
2176 | - if ($globalDebug) echo "Owner Switzerland: Download..."; |
|
2470 | + } elseif ($globalDebug) { |
|
2471 | + echo "Done\n"; |
|
2472 | + } |
|
2473 | + if ($globalDebug) { |
|
2474 | + echo "Owner Switzerland: Download..."; |
|
2475 | + } |
|
2177 | 2476 | update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
2178 | 2477 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
2179 | - if ($globalDebug) echo "Add to DB..."; |
|
2478 | + if ($globalDebug) { |
|
2479 | + echo "Add to DB..."; |
|
2480 | + } |
|
2180 | 2481 | $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
2181 | - } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
2482 | + } else { |
|
2483 | + $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
2484 | + } |
|
2182 | 2485 | if ($error != '') { |
2183 | 2486 | return $error; |
2184 | - } elseif ($globalDebug) echo "Done\n"; |
|
2185 | - if ($globalDebug) echo "Owner Czech Republic: Download..."; |
|
2487 | + } elseif ($globalDebug) { |
|
2488 | + echo "Done\n"; |
|
2489 | + } |
|
2490 | + if ($globalDebug) { |
|
2491 | + echo "Owner Czech Republic: Download..."; |
|
2492 | + } |
|
2186 | 2493 | update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
2187 | 2494 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
2188 | - if ($globalDebug) echo "Add to DB..."; |
|
2495 | + if ($globalDebug) { |
|
2496 | + echo "Add to DB..."; |
|
2497 | + } |
|
2189 | 2498 | $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
2190 | - } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
2499 | + } else { |
|
2500 | + $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
2501 | + } |
|
2191 | 2502 | if ($error != '') { |
2192 | 2503 | return $error; |
2193 | - } elseif ($globalDebug) echo "Done\n"; |
|
2194 | - if ($globalDebug) echo "Owner Australia: Download..."; |
|
2504 | + } elseif ($globalDebug) { |
|
2505 | + echo "Done\n"; |
|
2506 | + } |
|
2507 | + if ($globalDebug) { |
|
2508 | + echo "Owner Australia: Download..."; |
|
2509 | + } |
|
2195 | 2510 | update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
2196 | 2511 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
2197 | - if ($globalDebug) echo "Add to DB..."; |
|
2512 | + if ($globalDebug) { |
|
2513 | + echo "Add to DB..."; |
|
2514 | + } |
|
2198 | 2515 | $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
2199 | - } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
2516 | + } else { |
|
2517 | + $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
2518 | + } |
|
2200 | 2519 | if ($error != '') { |
2201 | 2520 | return $error; |
2202 | - } elseif ($globalDebug) echo "Done\n"; |
|
2203 | - if ($globalDebug) echo "Owner Austria: Download..."; |
|
2521 | + } elseif ($globalDebug) { |
|
2522 | + echo "Done\n"; |
|
2523 | + } |
|
2524 | + if ($globalDebug) { |
|
2525 | + echo "Owner Austria: Download..."; |
|
2526 | + } |
|
2204 | 2527 | update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
2205 | 2528 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
2206 | - if ($globalDebug) echo "Add to DB..."; |
|
2529 | + if ($globalDebug) { |
|
2530 | + echo "Add to DB..."; |
|
2531 | + } |
|
2207 | 2532 | $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
2208 | - } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
2533 | + } else { |
|
2534 | + $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
2535 | + } |
|
2209 | 2536 | if ($error != '') { |
2210 | 2537 | return $error; |
2211 | - } elseif ($globalDebug) echo "Done\n"; |
|
2212 | - if ($globalDebug) echo "Owner Chile: Download..."; |
|
2538 | + } elseif ($globalDebug) { |
|
2539 | + echo "Done\n"; |
|
2540 | + } |
|
2541 | + if ($globalDebug) { |
|
2542 | + echo "Owner Chile: Download..."; |
|
2543 | + } |
|
2213 | 2544 | update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
2214 | 2545 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
2215 | - if ($globalDebug) echo "Add to DB..."; |
|
2546 | + if ($globalDebug) { |
|
2547 | + echo "Add to DB..."; |
|
2548 | + } |
|
2216 | 2549 | $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
2217 | - } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
2550 | + } else { |
|
2551 | + $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
2552 | + } |
|
2218 | 2553 | if ($error != '') { |
2219 | 2554 | return $error; |
2220 | - } elseif ($globalDebug) echo "Done\n"; |
|
2221 | - if ($globalDebug) echo "Owner Colombia: Download..."; |
|
2555 | + } elseif ($globalDebug) { |
|
2556 | + echo "Done\n"; |
|
2557 | + } |
|
2558 | + if ($globalDebug) { |
|
2559 | + echo "Owner Colombia: Download..."; |
|
2560 | + } |
|
2222 | 2561 | update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
2223 | 2562 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
2224 | - if ($globalDebug) echo "Add to DB..."; |
|
2563 | + if ($globalDebug) { |
|
2564 | + echo "Add to DB..."; |
|
2565 | + } |
|
2225 | 2566 | $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
2226 | - } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
2567 | + } else { |
|
2568 | + $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
2569 | + } |
|
2227 | 2570 | if ($error != '') { |
2228 | 2571 | return $error; |
2229 | - } elseif ($globalDebug) echo "Done\n"; |
|
2230 | - if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
|
2572 | + } elseif ($globalDebug) { |
|
2573 | + echo "Done\n"; |
|
2574 | + } |
|
2575 | + if ($globalDebug) { |
|
2576 | + echo "Owner Bosnia Herzegobina: Download..."; |
|
2577 | + } |
|
2231 | 2578 | update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
2232 | 2579 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
2233 | - if ($globalDebug) echo "Add to DB..."; |
|
2580 | + if ($globalDebug) { |
|
2581 | + echo "Add to DB..."; |
|
2582 | + } |
|
2234 | 2583 | $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
2235 | - } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
2584 | + } else { |
|
2585 | + $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
2586 | + } |
|
2236 | 2587 | if ($error != '') { |
2237 | 2588 | return $error; |
2238 | - } elseif ($globalDebug) echo "Done\n"; |
|
2239 | - if ($globalDebug) echo "Owner Brazil: Download..."; |
|
2589 | + } elseif ($globalDebug) { |
|
2590 | + echo "Done\n"; |
|
2591 | + } |
|
2592 | + if ($globalDebug) { |
|
2593 | + echo "Owner Brazil: Download..."; |
|
2594 | + } |
|
2240 | 2595 | update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
2241 | 2596 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
2242 | - if ($globalDebug) echo "Add to DB..."; |
|
2597 | + if ($globalDebug) { |
|
2598 | + echo "Add to DB..."; |
|
2599 | + } |
|
2243 | 2600 | $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
2244 | - } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
2601 | + } else { |
|
2602 | + $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
2603 | + } |
|
2245 | 2604 | if ($error != '') { |
2246 | 2605 | return $error; |
2247 | - } elseif ($globalDebug) echo "Done\n"; |
|
2248 | - if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
|
2606 | + } elseif ($globalDebug) { |
|
2607 | + echo "Done\n"; |
|
2608 | + } |
|
2609 | + if ($globalDebug) { |
|
2610 | + echo "Owner Cayman Islands: Download..."; |
|
2611 | + } |
|
2249 | 2612 | update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
2250 | 2613 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
2251 | - if ($globalDebug) echo "Add to DB..."; |
|
2614 | + if ($globalDebug) { |
|
2615 | + echo "Add to DB..."; |
|
2616 | + } |
|
2252 | 2617 | $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
2253 | - } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
2618 | + } else { |
|
2619 | + $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
2620 | + } |
|
2254 | 2621 | if ($error != '') { |
2255 | 2622 | return $error; |
2256 | - } elseif ($globalDebug) echo "Done\n"; |
|
2257 | - if ($globalDebug) echo "Owner Croatia: Download..."; |
|
2623 | + } elseif ($globalDebug) { |
|
2624 | + echo "Done\n"; |
|
2625 | + } |
|
2626 | + if ($globalDebug) { |
|
2627 | + echo "Owner Croatia: Download..."; |
|
2628 | + } |
|
2258 | 2629 | update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
2259 | 2630 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
2260 | - if ($globalDebug) echo "Add to DB..."; |
|
2631 | + if ($globalDebug) { |
|
2632 | + echo "Add to DB..."; |
|
2633 | + } |
|
2261 | 2634 | $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
2262 | - } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
2635 | + } else { |
|
2636 | + $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
2637 | + } |
|
2263 | 2638 | if ($error != '') { |
2264 | 2639 | return $error; |
2265 | - } elseif ($globalDebug) echo "Done\n"; |
|
2266 | - if ($globalDebug) echo "Owner Luxembourg: Download..."; |
|
2640 | + } elseif ($globalDebug) { |
|
2641 | + echo "Done\n"; |
|
2642 | + } |
|
2643 | + if ($globalDebug) { |
|
2644 | + echo "Owner Luxembourg: Download..."; |
|
2645 | + } |
|
2267 | 2646 | update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
2268 | 2647 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
2269 | - if ($globalDebug) echo "Add to DB..."; |
|
2648 | + if ($globalDebug) { |
|
2649 | + echo "Add to DB..."; |
|
2650 | + } |
|
2270 | 2651 | $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
2271 | - } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
2652 | + } else { |
|
2653 | + $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
2654 | + } |
|
2272 | 2655 | if ($error != '') { |
2273 | 2656 | return $error; |
2274 | - } elseif ($globalDebug) echo "Done\n"; |
|
2275 | - if ($globalDebug) echo "Owner Maldives: Download..."; |
|
2657 | + } elseif ($globalDebug) { |
|
2658 | + echo "Done\n"; |
|
2659 | + } |
|
2660 | + if ($globalDebug) { |
|
2661 | + echo "Owner Maldives: Download..."; |
|
2662 | + } |
|
2276 | 2663 | update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
2277 | 2664 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
2278 | - if ($globalDebug) echo "Add to DB..."; |
|
2665 | + if ($globalDebug) { |
|
2666 | + echo "Add to DB..."; |
|
2667 | + } |
|
2279 | 2668 | $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
2280 | - } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
2669 | + } else { |
|
2670 | + $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
2671 | + } |
|
2281 | 2672 | if ($error != '') { |
2282 | 2673 | return $error; |
2283 | - } elseif ($globalDebug) echo "Done\n"; |
|
2284 | - if ($globalDebug) echo "Owner New Zealand: Download..."; |
|
2674 | + } elseif ($globalDebug) { |
|
2675 | + echo "Done\n"; |
|
2676 | + } |
|
2677 | + if ($globalDebug) { |
|
2678 | + echo "Owner New Zealand: Download..."; |
|
2679 | + } |
|
2285 | 2680 | update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
2286 | 2681 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
2287 | - if ($globalDebug) echo "Add to DB..."; |
|
2682 | + if ($globalDebug) { |
|
2683 | + echo "Add to DB..."; |
|
2684 | + } |
|
2288 | 2685 | $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
2289 | - } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
2686 | + } else { |
|
2687 | + $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
2688 | + } |
|
2290 | 2689 | if ($error != '') { |
2291 | 2690 | return $error; |
2292 | - } elseif ($globalDebug) echo "Done\n"; |
|
2293 | - if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
|
2691 | + } elseif ($globalDebug) { |
|
2692 | + echo "Done\n"; |
|
2693 | + } |
|
2694 | + if ($globalDebug) { |
|
2695 | + echo "Owner Papua New Guinea: Download..."; |
|
2696 | + } |
|
2294 | 2697 | update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
2295 | 2698 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
2296 | - if ($globalDebug) echo "Add to DB..."; |
|
2699 | + if ($globalDebug) { |
|
2700 | + echo "Add to DB..."; |
|
2701 | + } |
|
2297 | 2702 | $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
2298 | - } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
2703 | + } else { |
|
2704 | + $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
2705 | + } |
|
2299 | 2706 | if ($error != '') { |
2300 | 2707 | return $error; |
2301 | - } elseif ($globalDebug) echo "Done\n"; |
|
2302 | - if ($globalDebug) echo "Owner Slovakia: Download..."; |
|
2708 | + } elseif ($globalDebug) { |
|
2709 | + echo "Done\n"; |
|
2710 | + } |
|
2711 | + if ($globalDebug) { |
|
2712 | + echo "Owner Slovakia: Download..."; |
|
2713 | + } |
|
2303 | 2714 | update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
2304 | 2715 | if (file_exists($tmp_dir.'owner_om.csv')) { |
2305 | - if ($globalDebug) echo "Add to DB..."; |
|
2716 | + if ($globalDebug) { |
|
2717 | + echo "Add to DB..."; |
|
2718 | + } |
|
2306 | 2719 | $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
2307 | - } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
2720 | + } else { |
|
2721 | + $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
2722 | + } |
|
2308 | 2723 | if ($error != '') { |
2309 | 2724 | return $error; |
2310 | - } elseif ($globalDebug) echo "Done\n"; |
|
2311 | - if ($globalDebug) echo "Owner Ecuador: Download..."; |
|
2725 | + } elseif ($globalDebug) { |
|
2726 | + echo "Done\n"; |
|
2727 | + } |
|
2728 | + if ($globalDebug) { |
|
2729 | + echo "Owner Ecuador: Download..."; |
|
2730 | + } |
|
2312 | 2731 | update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
2313 | 2732 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
2314 | - if ($globalDebug) echo "Add to DB..."; |
|
2733 | + if ($globalDebug) { |
|
2734 | + echo "Add to DB..."; |
|
2735 | + } |
|
2315 | 2736 | $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
2316 | - } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
2737 | + } else { |
|
2738 | + $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
2739 | + } |
|
2317 | 2740 | if ($error != '') { |
2318 | 2741 | return $error; |
2319 | - } elseif ($globalDebug) echo "Done\n"; |
|
2320 | - if ($globalDebug) echo "Owner Iceland: Download..."; |
|
2742 | + } elseif ($globalDebug) { |
|
2743 | + echo "Done\n"; |
|
2744 | + } |
|
2745 | + if ($globalDebug) { |
|
2746 | + echo "Owner Iceland: Download..."; |
|
2747 | + } |
|
2321 | 2748 | update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
2322 | 2749 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
2323 | - if ($globalDebug) echo "Add to DB..."; |
|
2750 | + if ($globalDebug) { |
|
2751 | + echo "Add to DB..."; |
|
2752 | + } |
|
2324 | 2753 | $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
2325 | - } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
2754 | + } else { |
|
2755 | + $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
2756 | + } |
|
2326 | 2757 | if ($error != '') { |
2327 | 2758 | return $error; |
2328 | - } elseif ($globalDebug) echo "Done\n"; |
|
2329 | - if ($globalDebug) echo "Owner Isle of Man: Download..."; |
|
2759 | + } elseif ($globalDebug) { |
|
2760 | + echo "Done\n"; |
|
2761 | + } |
|
2762 | + if ($globalDebug) { |
|
2763 | + echo "Owner Isle of Man: Download..."; |
|
2764 | + } |
|
2330 | 2765 | update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
2331 | 2766 | if (file_exists($tmp_dir.'owner_m.csv')) { |
2332 | - if ($globalDebug) echo "Add to DB..."; |
|
2767 | + if ($globalDebug) { |
|
2768 | + echo "Add to DB..."; |
|
2769 | + } |
|
2333 | 2770 | $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
2334 | - } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
2771 | + } else { |
|
2772 | + $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
2773 | + } |
|
2335 | 2774 | if ($error != '') { |
2336 | 2775 | return $error; |
2337 | - } elseif ($globalDebug) echo "Done\n"; |
|
2776 | + } elseif ($globalDebug) { |
|
2777 | + echo "Done\n"; |
|
2778 | + } |
|
2338 | 2779 | if ($globalMasterSource) { |
2339 | - if ($globalDebug) echo "ModeS Netherlands: Download..."; |
|
2780 | + if ($globalDebug) { |
|
2781 | + echo "ModeS Netherlands: Download..."; |
|
2782 | + } |
|
2340 | 2783 | update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
2341 | 2784 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
2342 | - if ($globalDebug) echo "Add to DB..."; |
|
2785 | + if ($globalDebug) { |
|
2786 | + echo "Add to DB..."; |
|
2787 | + } |
|
2343 | 2788 | $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
2344 | - } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
2789 | + } else { |
|
2790 | + $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
2791 | + } |
|
2345 | 2792 | if ($error != '') { |
2346 | 2793 | return $error; |
2347 | - } elseif ($globalDebug) echo "Done\n"; |
|
2348 | - if ($globalDebug) echo "ModeS Denmark: Download..."; |
|
2794 | + } elseif ($globalDebug) { |
|
2795 | + echo "Done\n"; |
|
2796 | + } |
|
2797 | + if ($globalDebug) { |
|
2798 | + echo "ModeS Denmark: Download..."; |
|
2799 | + } |
|
2349 | 2800 | update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
2350 | 2801 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
2351 | - if ($globalDebug) echo "Add to DB..."; |
|
2802 | + if ($globalDebug) { |
|
2803 | + echo "Add to DB..."; |
|
2804 | + } |
|
2352 | 2805 | $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
2353 | - } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
2806 | + } else { |
|
2807 | + $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
2808 | + } |
|
2354 | 2809 | if ($error != '') { |
2355 | 2810 | return $error; |
2356 | - } elseif ($globalDebug) echo "Done\n"; |
|
2357 | - } elseif ($globalDebug) echo "Done\n"; |
|
2811 | + } elseif ($globalDebug) { |
|
2812 | + echo "Done\n"; |
|
2813 | + } |
|
2814 | + } elseif ($globalDebug) { |
|
2815 | + echo "Done\n"; |
|
2816 | + } |
|
2358 | 2817 | return ''; |
2359 | 2818 | } |
2360 | 2819 | |
2361 | 2820 | public static function update_translation() { |
2362 | 2821 | global $tmp_dir, $globalDebug; |
2363 | 2822 | $error = ''; |
2364 | - if ($globalDebug) echo "Translation : Download..."; |
|
2823 | + if ($globalDebug) { |
|
2824 | + echo "Translation : Download..."; |
|
2825 | + } |
|
2365 | 2826 | update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
2366 | 2827 | if (file_exists($tmp_dir.'translation.zip')) { |
2367 | - if ($globalDebug) echo "Unzip..."; |
|
2828 | + if ($globalDebug) { |
|
2829 | + echo "Unzip..."; |
|
2830 | + } |
|
2368 | 2831 | update_db::unzip($tmp_dir.'translation.zip'); |
2369 | - if ($globalDebug) echo "Add to DB..."; |
|
2832 | + if ($globalDebug) { |
|
2833 | + echo "Add to DB..."; |
|
2834 | + } |
|
2370 | 2835 | $error = update_db::translation(); |
2371 | - } else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
2836 | + } else { |
|
2837 | + $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
2838 | + } |
|
2372 | 2839 | if ($error != '') { |
2373 | 2840 | return $error; |
2374 | - } elseif ($globalDebug) echo "Done\n"; |
|
2841 | + } elseif ($globalDebug) { |
|
2842 | + echo "Done\n"; |
|
2843 | + } |
|
2375 | 2844 | return ''; |
2376 | 2845 | } |
2377 | 2846 | |
2378 | 2847 | public static function update_translation_fam() { |
2379 | 2848 | global $tmp_dir, $globalDebug; |
2380 | 2849 | $error = ''; |
2381 | - if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
|
2850 | + if ($globalDebug) { |
|
2851 | + echo "Translation from FlightAirMap website : Download..."; |
|
2852 | + } |
|
2382 | 2853 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
2383 | 2854 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5'); |
2384 | 2855 | if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) { |
2385 | 2856 | $translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
2386 | 2857 | $translation_md5 = $translation_md5_file[0]; |
2387 | 2858 | if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) { |
2388 | - if ($globalDebug) echo "Gunzip..."; |
|
2859 | + if ($globalDebug) { |
|
2860 | + echo "Gunzip..."; |
|
2861 | + } |
|
2389 | 2862 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
2390 | - if ($globalDebug) echo "Add to DB..."; |
|
2863 | + if ($globalDebug) { |
|
2864 | + echo "Add to DB..."; |
|
2865 | + } |
|
2391 | 2866 | $error = update_db::translation_fam(); |
2392 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed."; |
|
2393 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
2867 | + } else { |
|
2868 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed."; |
|
2869 | + } |
|
2870 | + } else { |
|
2871 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
2872 | + } |
|
2394 | 2873 | if ($error != '') { |
2395 | 2874 | return $error; |
2396 | - } elseif ($globalDebug) echo "Done\n"; |
|
2875 | + } elseif ($globalDebug) { |
|
2876 | + echo "Done\n"; |
|
2877 | + } |
|
2397 | 2878 | return ''; |
2398 | 2879 | } |
2399 | 2880 | public static function update_ModeS_fam() { |
2400 | 2881 | global $tmp_dir, $globalDebug; |
2401 | 2882 | $error = ''; |
2402 | - if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
|
2883 | + if ($globalDebug) { |
|
2884 | + echo "ModeS from FlightAirMap website : Download..."; |
|
2885 | + } |
|
2403 | 2886 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
2404 | 2887 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5'); |
2405 | 2888 | if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) { |
2406 | 2889 | $modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
2407 | 2890 | $modes_md5 = $modes_md5_file[0]; |
2408 | 2891 | if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) { |
2409 | - if ($globalDebug) echo "Gunzip..."; |
|
2892 | + if ($globalDebug) { |
|
2893 | + echo "Gunzip..."; |
|
2894 | + } |
|
2410 | 2895 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
2411 | - if ($globalDebug) echo "Add to DB..."; |
|
2896 | + if ($globalDebug) { |
|
2897 | + echo "Add to DB..."; |
|
2898 | + } |
|
2412 | 2899 | $error = update_db::modes_fam(); |
2413 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed."; |
|
2414 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
2900 | + } else { |
|
2901 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed."; |
|
2902 | + } |
|
2903 | + } else { |
|
2904 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
2905 | + } |
|
2415 | 2906 | if ($error != '') { |
2416 | 2907 | return $error; |
2417 | - } elseif ($globalDebug) echo "Done\n"; |
|
2908 | + } elseif ($globalDebug) { |
|
2909 | + echo "Done\n"; |
|
2910 | + } |
|
2418 | 2911 | return ''; |
2419 | 2912 | } |
2420 | 2913 | |
2421 | 2914 | public static function update_airlines_fam() { |
2422 | 2915 | global $tmp_dir, $globalDebug; |
2423 | 2916 | $error = ''; |
2424 | - if ($globalDebug) echo "Airlines from FlightAirMap website : Download..."; |
|
2917 | + if ($globalDebug) { |
|
2918 | + echo "Airlines from FlightAirMap website : Download..."; |
|
2919 | + } |
|
2425 | 2920 | update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5'); |
2426 | 2921 | if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) { |
2427 | 2922 | $airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
@@ -2430,26 +2925,42 @@ discard block |
||
2430 | 2925 | update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz'); |
2431 | 2926 | if (file_exists($tmp_dir.'airlines.tsv.gz')) { |
2432 | 2927 | if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) { |
2433 | - if ($globalDebug) echo "Gunzip..."; |
|
2928 | + if ($globalDebug) { |
|
2929 | + echo "Gunzip..."; |
|
2930 | + } |
|
2434 | 2931 | update_db::gunzip($tmp_dir.'airlines.tsv.gz'); |
2435 | - if ($globalDebug) echo "Add to DB..."; |
|
2932 | + if ($globalDebug) { |
|
2933 | + echo "Add to DB..."; |
|
2934 | + } |
|
2436 | 2935 | $error = update_db::airlines_fam(); |
2437 | 2936 | update_db::insert_airlines_version($airlines_md5); |
2438 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
|
2439 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
2440 | - } elseif ($globalDebug) echo "No update."; |
|
2441 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
|
2937 | + } else { |
|
2938 | + $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
|
2939 | + } |
|
2940 | + } else { |
|
2941 | + $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
2942 | + } |
|
2943 | + } elseif ($globalDebug) { |
|
2944 | + echo "No update."; |
|
2945 | + } |
|
2946 | + } else { |
|
2947 | + $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
|
2948 | + } |
|
2442 | 2949 | if ($error != '') { |
2443 | 2950 | return $error; |
2444 | 2951 | } else { |
2445 | - if ($globalDebug) echo "Done\n"; |
|
2952 | + if ($globalDebug) { |
|
2953 | + echo "Done\n"; |
|
2954 | + } |
|
2446 | 2955 | } |
2447 | 2956 | return ''; |
2448 | 2957 | } |
2449 | 2958 | |
2450 | 2959 | public static function update_owner_fam() { |
2451 | 2960 | global $tmp_dir, $globalDebug, $globalOwner; |
2452 | - if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
|
2961 | + if ($globalDebug) { |
|
2962 | + echo "owner from FlightAirMap website : Download..."; |
|
2963 | + } |
|
2453 | 2964 | $error = ''; |
2454 | 2965 | if ($globalOwner === TRUE) { |
2455 | 2966 | update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
@@ -2462,35 +2973,57 @@ discard block |
||
2462 | 2973 | $owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
2463 | 2974 | $owners_md5 = $owners_md5_file[0]; |
2464 | 2975 | if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) { |
2465 | - if ($globalDebug) echo "Gunzip..."; |
|
2976 | + if ($globalDebug) { |
|
2977 | + echo "Gunzip..."; |
|
2978 | + } |
|
2466 | 2979 | update_db::gunzip($tmp_dir.'owners.tsv.gz'); |
2467 | - if ($globalDebug) echo "Add to DB..."; |
|
2980 | + if ($globalDebug) { |
|
2981 | + echo "Add to DB..."; |
|
2982 | + } |
|
2468 | 2983 | $error = update_db::owner_fam(); |
2469 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed."; |
|
2470 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
2984 | + } else { |
|
2985 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed."; |
|
2986 | + } |
|
2987 | + } else { |
|
2988 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
2989 | + } |
|
2471 | 2990 | if ($error != '') { |
2472 | 2991 | return $error; |
2473 | - } elseif ($globalDebug) echo "Done\n"; |
|
2992 | + } elseif ($globalDebug) { |
|
2993 | + echo "Done\n"; |
|
2994 | + } |
|
2474 | 2995 | return ''; |
2475 | 2996 | } |
2476 | 2997 | public static function update_routes_fam() { |
2477 | 2998 | global $tmp_dir, $globalDebug; |
2478 | - if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
|
2999 | + if ($globalDebug) { |
|
3000 | + echo "Routes from FlightAirMap website : Download..."; |
|
3001 | + } |
|
2479 | 3002 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
2480 | 3003 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5'); |
2481 | 3004 | if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) { |
2482 | 3005 | $routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
2483 | 3006 | $routes_md5 = $routes_md5_file[0]; |
2484 | 3007 | if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) { |
2485 | - if ($globalDebug) echo "Gunzip..."; |
|
3008 | + if ($globalDebug) { |
|
3009 | + echo "Gunzip..."; |
|
3010 | + } |
|
2486 | 3011 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
2487 | - if ($globalDebug) echo "Add to DB..."; |
|
3012 | + if ($globalDebug) { |
|
3013 | + echo "Add to DB..."; |
|
3014 | + } |
|
2488 | 3015 | $error = update_db::routes_fam(); |
2489 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed."; |
|
2490 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
3016 | + } else { |
|
3017 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed."; |
|
3018 | + } |
|
3019 | + } else { |
|
3020 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
3021 | + } |
|
2491 | 3022 | if ($error != '') { |
2492 | 3023 | return $error; |
2493 | - } elseif ($globalDebug) echo "Done\n"; |
|
3024 | + } elseif ($globalDebug) { |
|
3025 | + echo "Done\n"; |
|
3026 | + } |
|
2494 | 3027 | return ''; |
2495 | 3028 | } |
2496 | 3029 | public static function update_marine_identity_fam() { |
@@ -2500,21 +3033,33 @@ discard block |
||
2500 | 3033 | $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
2501 | 3034 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
2502 | 3035 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
2503 | - if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
|
3036 | + if ($globalDebug) { |
|
3037 | + echo "Marine identity from FlightAirMap website : Download..."; |
|
3038 | + } |
|
2504 | 3039 | update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
2505 | 3040 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
2506 | 3041 | if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) { |
2507 | - if ($globalDebug) echo "Gunzip..."; |
|
3042 | + if ($globalDebug) { |
|
3043 | + echo "Gunzip..."; |
|
3044 | + } |
|
2508 | 3045 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
2509 | - if ($globalDebug) echo "Add to DB..."; |
|
3046 | + if ($globalDebug) { |
|
3047 | + echo "Add to DB..."; |
|
3048 | + } |
|
2510 | 3049 | $error = update_db::marine_identity_fam(); |
2511 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed."; |
|
2512 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
3050 | + } else { |
|
3051 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed."; |
|
3052 | + } |
|
3053 | + } else { |
|
3054 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
3055 | + } |
|
2513 | 3056 | if ($error != '') { |
2514 | 3057 | return $error; |
2515 | 3058 | } else { |
2516 | 3059 | update_db::insert_marine_identity_version($marine_identity_md5); |
2517 | - if ($globalDebug) echo "Done\n"; |
|
3060 | + if ($globalDebug) { |
|
3061 | + echo "Done\n"; |
|
3062 | + } |
|
2518 | 3063 | } |
2519 | 3064 | } |
2520 | 3065 | } |
@@ -2528,21 +3073,33 @@ discard block |
||
2528 | 3073 | $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
2529 | 3074 | $satellite_md5 = $satellite_md5_file[0]; |
2530 | 3075 | if (!update_db::check_satellite_version($satellite_md5)) { |
2531 | - if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
|
3076 | + if ($globalDebug) { |
|
3077 | + echo "Satellite from FlightAirMap website : Download..."; |
|
3078 | + } |
|
2532 | 3079 | update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
2533 | 3080 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
2534 | 3081 | if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) { |
2535 | - if ($globalDebug) echo "Gunzip..."; |
|
3082 | + if ($globalDebug) { |
|
3083 | + echo "Gunzip..."; |
|
3084 | + } |
|
2536 | 3085 | update_db::gunzip($tmp_dir.'satellite.tsv.gz'); |
2537 | - if ($globalDebug) echo "Add to DB..."; |
|
3086 | + if ($globalDebug) { |
|
3087 | + echo "Add to DB..."; |
|
3088 | + } |
|
2538 | 3089 | $error = update_db::satellite_fam(); |
2539 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed."; |
|
2540 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
3090 | + } else { |
|
3091 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed."; |
|
3092 | + } |
|
3093 | + } else { |
|
3094 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
3095 | + } |
|
2541 | 3096 | if ($error != '') { |
2542 | 3097 | return $error; |
2543 | 3098 | } else { |
2544 | 3099 | update_db::insert_satellite_version($satellite_md5); |
2545 | - if ($globalDebug) echo "Done\n"; |
|
3100 | + if ($globalDebug) { |
|
3101 | + echo "Done\n"; |
|
3102 | + } |
|
2546 | 3103 | } |
2547 | 3104 | } |
2548 | 3105 | } |
@@ -2550,17 +3107,25 @@ discard block |
||
2550 | 3107 | } |
2551 | 3108 | public static function update_banned_fam() { |
2552 | 3109 | global $tmp_dir, $globalDebug; |
2553 | - if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
3110 | + if ($globalDebug) { |
|
3111 | + echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
3112 | + } |
|
2554 | 3113 | update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
2555 | 3114 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
2556 | 3115 | //if ($globalDebug) echo "Gunzip..."; |
2557 | 3116 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
2558 | - if ($globalDebug) echo "Add to DB..."; |
|
3117 | + if ($globalDebug) { |
|
3118 | + echo "Add to DB..."; |
|
3119 | + } |
|
2559 | 3120 | $error = update_db::banned_fam(); |
2560 | - } else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
3121 | + } else { |
|
3122 | + $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
3123 | + } |
|
2561 | 3124 | if ($error != '') { |
2562 | 3125 | return $error; |
2563 | - } elseif ($globalDebug) echo "Done\n"; |
|
3126 | + } elseif ($globalDebug) { |
|
3127 | + echo "Done\n"; |
|
3128 | + } |
|
2564 | 3129 | return ''; |
2565 | 3130 | } |
2566 | 3131 | |
@@ -2568,7 +3133,9 @@ discard block |
||
2568 | 3133 | global $tmp_dir, $globalDebug, $globalDBdriver; |
2569 | 3134 | include_once('class.create_db.php'); |
2570 | 3135 | $error = ''; |
2571 | - if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
|
3136 | + if ($globalDebug) { |
|
3137 | + echo "Airspace from FlightAirMap website : Download..."; |
|
3138 | + } |
|
2572 | 3139 | if ($globalDBdriver == 'mysql') { |
2573 | 3140 | update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
2574 | 3141 | } else { |
@@ -2585,9 +3152,13 @@ discard block |
||
2585 | 3152 | } |
2586 | 3153 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
2587 | 3154 | if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) { |
2588 | - if ($globalDebug) echo "Gunzip..."; |
|
3155 | + if ($globalDebug) { |
|
3156 | + echo "Gunzip..."; |
|
3157 | + } |
|
2589 | 3158 | update_db::gunzip($tmp_dir.'airspace.sql.gz'); |
2590 | - if ($globalDebug) echo "Add to DB..."; |
|
3159 | + if ($globalDebug) { |
|
3160 | + echo "Add to DB..."; |
|
3161 | + } |
|
2591 | 3162 | $Connection = new Connection(); |
2592 | 3163 | if ($Connection->tableExists('airspace')) { |
2593 | 3164 | $query = 'DROP TABLE airspace'; |
@@ -2600,20 +3171,30 @@ discard block |
||
2600 | 3171 | } |
2601 | 3172 | $error = create_db::import_file($tmp_dir.'airspace.sql'); |
2602 | 3173 | update_db::insert_airspace_version($airspace_md5); |
2603 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed."; |
|
2604 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
3174 | + } else { |
|
3175 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed."; |
|
3176 | + } |
|
3177 | + } else { |
|
3178 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
3179 | + } |
|
2605 | 3180 | } |
2606 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
3181 | + } else { |
|
3182 | + $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
3183 | + } |
|
2607 | 3184 | if ($error != '') { |
2608 | 3185 | return $error; |
2609 | - } elseif ($globalDebug) echo "Done\n"; |
|
3186 | + } elseif ($globalDebug) { |
|
3187 | + echo "Done\n"; |
|
3188 | + } |
|
2610 | 3189 | return ''; |
2611 | 3190 | } |
2612 | 3191 | |
2613 | 3192 | public static function update_geoid_fam() { |
2614 | 3193 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
2615 | 3194 | $error = ''; |
2616 | - if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
|
3195 | + if ($globalDebug) { |
|
3196 | + echo "Geoid from FlightAirMap website : Download..."; |
|
3197 | + } |
|
2617 | 3198 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
2618 | 3199 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
2619 | 3200 | $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
@@ -2622,76 +3203,116 @@ discard block |
||
2622 | 3203 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
2623 | 3204 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
2624 | 3205 | if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) { |
2625 | - if ($globalDebug) echo "Gunzip..."; |
|
3206 | + if ($globalDebug) { |
|
3207 | + echo "Gunzip..."; |
|
3208 | + } |
|
2626 | 3209 | update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
2627 | 3210 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
2628 | 3211 | update_db::insert_geoid_version($geoid_md5); |
2629 | 3212 | } |
2630 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed."; |
|
2631 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
3213 | + } else { |
|
3214 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed."; |
|
3215 | + } |
|
3216 | + } else { |
|
3217 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
3218 | + } |
|
2632 | 3219 | } |
2633 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
3220 | + } else { |
|
3221 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
3222 | + } |
|
2634 | 3223 | if ($error != '') { |
2635 | 3224 | return $error; |
2636 | - } elseif ($globalDebug) echo "Done\n"; |
|
3225 | + } elseif ($globalDebug) { |
|
3226 | + echo "Done\n"; |
|
3227 | + } |
|
2637 | 3228 | return ''; |
2638 | 3229 | } |
2639 | 3230 | |
2640 | 3231 | public static function update_tle() { |
2641 | 3232 | global $tmp_dir, $globalDebug; |
2642 | - if ($globalDebug) echo "Download TLE : Download..."; |
|
3233 | + if ($globalDebug) { |
|
3234 | + echo "Download TLE : Download..."; |
|
3235 | + } |
|
2643 | 3236 | $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', |
2644 | 3237 | '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', |
2645 | 3238 | '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'); |
2646 | 3239 | foreach ($alltle as $filename) { |
2647 | - if ($globalDebug) echo "downloading ".$filename.'...'; |
|
3240 | + if ($globalDebug) { |
|
3241 | + echo "downloading ".$filename.'...'; |
|
3242 | + } |
|
2648 | 3243 | update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
2649 | 3244 | if (file_exists($tmp_dir.$filename)) { |
2650 | - if ($globalDebug) echo "Add to DB ".$filename."..."; |
|
3245 | + if ($globalDebug) { |
|
3246 | + echo "Add to DB ".$filename."..."; |
|
3247 | + } |
|
2651 | 3248 | $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
2652 | - } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
3249 | + } else { |
|
3250 | + $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
3251 | + } |
|
2653 | 3252 | if ($error != '') { |
2654 | 3253 | echo $error."\n"; |
2655 | - } elseif ($globalDebug) echo "Done\n"; |
|
3254 | + } elseif ($globalDebug) { |
|
3255 | + echo "Done\n"; |
|
3256 | + } |
|
2656 | 3257 | } |
2657 | 3258 | return ''; |
2658 | 3259 | } |
2659 | 3260 | |
2660 | 3261 | public static function update_ucsdb() { |
2661 | 3262 | global $tmp_dir, $globalDebug; |
2662 | - if ($globalDebug) echo "Download UCS DB : Download..."; |
|
3263 | + if ($globalDebug) { |
|
3264 | + echo "Download UCS DB : Download..."; |
|
3265 | + } |
|
2663 | 3266 | 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'); |
2664 | 3267 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
2665 | - if ($globalDebug) echo "Add to DB..."; |
|
3268 | + if ($globalDebug) { |
|
3269 | + echo "Add to DB..."; |
|
3270 | + } |
|
2666 | 3271 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
2667 | - } else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
3272 | + } else { |
|
3273 | + $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
3274 | + } |
|
2668 | 3275 | if ($error != '') { |
2669 | 3276 | echo $error."\n"; |
2670 | - } elseif ($globalDebug) echo "Done\n"; |
|
3277 | + } elseif ($globalDebug) { |
|
3278 | + echo "Done\n"; |
|
3279 | + } |
|
2671 | 3280 | return ''; |
2672 | 3281 | } |
2673 | 3282 | |
2674 | 3283 | public static function update_celestrak() { |
2675 | 3284 | global $tmp_dir, $globalDebug; |
2676 | - if ($globalDebug) echo "Download Celestrak DB : Download..."; |
|
3285 | + if ($globalDebug) { |
|
3286 | + echo "Download Celestrak DB : Download..."; |
|
3287 | + } |
|
2677 | 3288 | update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
2678 | 3289 | if (file_exists($tmp_dir.'satcat.txt')) { |
2679 | - if ($globalDebug) echo "Add to DB..."; |
|
3290 | + if ($globalDebug) { |
|
3291 | + echo "Add to DB..."; |
|
3292 | + } |
|
2680 | 3293 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
2681 | - } else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
3294 | + } else { |
|
3295 | + $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
3296 | + } |
|
2682 | 3297 | if ($error != '') { |
2683 | 3298 | echo $error."\n"; |
2684 | - } elseif ($globalDebug) echo "Done\n"; |
|
3299 | + } elseif ($globalDebug) { |
|
3300 | + echo "Done\n"; |
|
3301 | + } |
|
2685 | 3302 | return ''; |
2686 | 3303 | } |
2687 | 3304 | |
2688 | 3305 | public static function update_models() { |
2689 | 3306 | global $tmp_dir, $globalDebug; |
2690 | 3307 | $error = ''; |
2691 | - if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
|
3308 | + if ($globalDebug) { |
|
3309 | + echo "Models from FlightAirMap website : Download..."; |
|
3310 | + } |
|
2692 | 3311 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
2693 | 3312 | if (file_exists($tmp_dir.'models.md5sum')) { |
2694 | - if ($globalDebug) echo "Check files...\n"; |
|
3313 | + if ($globalDebug) { |
|
3314 | + echo "Check files...\n"; |
|
3315 | + } |
|
2695 | 3316 | $newmodelsdb = array(); |
2696 | 3317 | if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
2697 | 3318 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2710,25 +3331,35 @@ discard block |
||
2710 | 3331 | } |
2711 | 3332 | $diff = array_diff($newmodelsdb,$modelsdb); |
2712 | 3333 | foreach ($diff as $key => $value) { |
2713 | - if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
|
3334 | + if ($globalDebug) { |
|
3335 | + echo 'Downloading model '.$key.' ...'."\n"; |
|
3336 | + } |
|
2714 | 3337 | update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
2715 | 3338 | |
2716 | 3339 | } |
2717 | 3340 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
2718 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3341 | + } else { |
|
3342 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3343 | + } |
|
2719 | 3344 | if ($error != '') { |
2720 | 3345 | return $error; |
2721 | - } elseif ($globalDebug) echo "Done\n"; |
|
3346 | + } elseif ($globalDebug) { |
|
3347 | + echo "Done\n"; |
|
3348 | + } |
|
2722 | 3349 | return ''; |
2723 | 3350 | } |
2724 | 3351 | |
2725 | 3352 | public static function update_space_models() { |
2726 | 3353 | global $tmp_dir, $globalDebug; |
2727 | 3354 | $error = ''; |
2728 | - if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
|
3355 | + if ($globalDebug) { |
|
3356 | + echo "Space models from FlightAirMap website : Download..."; |
|
3357 | + } |
|
2729 | 3358 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
2730 | 3359 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
2731 | - if ($globalDebug) echo "Check files...\n"; |
|
3360 | + if ($globalDebug) { |
|
3361 | + echo "Check files...\n"; |
|
3362 | + } |
|
2732 | 3363 | $newmodelsdb = array(); |
2733 | 3364 | if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
2734 | 3365 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2747,25 +3378,35 @@ discard block |
||
2747 | 3378 | } |
2748 | 3379 | $diff = array_diff($newmodelsdb,$modelsdb); |
2749 | 3380 | foreach ($diff as $key => $value) { |
2750 | - if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
|
3381 | + if ($globalDebug) { |
|
3382 | + echo 'Downloading space model '.$key.' ...'."\n"; |
|
3383 | + } |
|
2751 | 3384 | update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
2752 | 3385 | |
2753 | 3386 | } |
2754 | 3387 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
2755 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3388 | + } else { |
|
3389 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3390 | + } |
|
2756 | 3391 | if ($error != '') { |
2757 | 3392 | return $error; |
2758 | - } elseif ($globalDebug) echo "Done\n"; |
|
3393 | + } elseif ($globalDebug) { |
|
3394 | + echo "Done\n"; |
|
3395 | + } |
|
2759 | 3396 | return ''; |
2760 | 3397 | } |
2761 | 3398 | |
2762 | 3399 | public static function update_vehicules_models() { |
2763 | 3400 | global $tmp_dir, $globalDebug; |
2764 | 3401 | $error = ''; |
2765 | - if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
|
3402 | + if ($globalDebug) { |
|
3403 | + echo "Vehicules models from FlightAirMap website : Download..."; |
|
3404 | + } |
|
2766 | 3405 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
2767 | 3406 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
2768 | - if ($globalDebug) echo "Check files...\n"; |
|
3407 | + if ($globalDebug) { |
|
3408 | + echo "Check files...\n"; |
|
3409 | + } |
|
2769 | 3410 | $newmodelsdb = array(); |
2770 | 3411 | if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
2771 | 3412 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2784,15 +3425,21 @@ discard block |
||
2784 | 3425 | } |
2785 | 3426 | $diff = array_diff($newmodelsdb,$modelsdb); |
2786 | 3427 | foreach ($diff as $key => $value) { |
2787 | - if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
3428 | + if ($globalDebug) { |
|
3429 | + echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
3430 | + } |
|
2788 | 3431 | update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
2789 | 3432 | |
2790 | 3433 | } |
2791 | 3434 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
2792 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3435 | + } else { |
|
3436 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3437 | + } |
|
2793 | 3438 | if ($error != '') { |
2794 | 3439 | return $error; |
2795 | - } elseif ($globalDebug) echo "Done\n"; |
|
3440 | + } elseif ($globalDebug) { |
|
3441 | + echo "Done\n"; |
|
3442 | + } |
|
2796 | 3443 | return ''; |
2797 | 3444 | } |
2798 | 3445 | |
@@ -2835,7 +3482,9 @@ discard block |
||
2835 | 3482 | } |
2836 | 3483 | |
2837 | 3484 | $error = ''; |
2838 | - if ($globalDebug) echo "Notam : Download..."; |
|
3485 | + if ($globalDebug) { |
|
3486 | + echo "Notam : Download..."; |
|
3487 | + } |
|
2839 | 3488 | update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
2840 | 3489 | if (file_exists($tmp_dir.'notam.rss')) { |
2841 | 3490 | $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
@@ -2850,14 +3499,30 @@ discard block |
||
2850 | 3499 | $data['fir'] = $q[0]; |
2851 | 3500 | $data['code'] = $q[1]; |
2852 | 3501 | $ifrvfr = $q[2]; |
2853 | - if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR'; |
|
2854 | - if ($ifrvfr == 'I') $data['rules'] = 'IFR'; |
|
2855 | - if ($ifrvfr == 'V') $data['rules'] = 'VFR'; |
|
2856 | - if ($q[4] == 'A') $data['scope'] = 'Airport warning'; |
|
2857 | - if ($q[4] == 'E') $data['scope'] = 'Enroute warning'; |
|
2858 | - if ($q[4] == 'W') $data['scope'] = 'Navigation warning'; |
|
2859 | - if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning'; |
|
2860 | - if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning'; |
|
3502 | + if ($ifrvfr == 'IV') { |
|
3503 | + $data['rules'] = 'IFR/VFR'; |
|
3504 | + } |
|
3505 | + if ($ifrvfr == 'I') { |
|
3506 | + $data['rules'] = 'IFR'; |
|
3507 | + } |
|
3508 | + if ($ifrvfr == 'V') { |
|
3509 | + $data['rules'] = 'VFR'; |
|
3510 | + } |
|
3511 | + if ($q[4] == 'A') { |
|
3512 | + $data['scope'] = 'Airport warning'; |
|
3513 | + } |
|
3514 | + if ($q[4] == 'E') { |
|
3515 | + $data['scope'] = 'Enroute warning'; |
|
3516 | + } |
|
3517 | + if ($q[4] == 'W') { |
|
3518 | + $data['scope'] = 'Navigation warning'; |
|
3519 | + } |
|
3520 | + if ($q[4] == 'AE') { |
|
3521 | + $data['scope'] = 'Airport/Enroute warning'; |
|
3522 | + } |
|
3523 | + if ($q[4] == 'AW') { |
|
3524 | + $data['scope'] = 'Airport/Navigation warning'; |
|
3525 | + } |
|
2861 | 3526 | //$data['scope'] = $q[4]; |
2862 | 3527 | $data['lower_limit'] = $q[5]; |
2863 | 3528 | $data['upper_limit'] = $q[6]; |
@@ -2865,8 +3530,12 @@ discard block |
||
2865 | 3530 | sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
2866 | 3531 | $latitude = $Common->convertDec($las,'latitude'); |
2867 | 3532 | $longitude = $Common->convertDec($lns,'longitude'); |
2868 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
2869 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
3533 | + if ($lac == 'S') { |
|
3534 | + $latitude = '-'.$latitude; |
|
3535 | + } |
|
3536 | + if ($lnc == 'W') { |
|
3537 | + $longitude = '-'.$longitude; |
|
3538 | + } |
|
2870 | 3539 | $data['center_latitude'] = $latitude; |
2871 | 3540 | $data['center_longitude'] = $longitude; |
2872 | 3541 | $data['radius'] = intval($radius); |
@@ -2896,10 +3565,14 @@ discard block |
||
2896 | 3565 | $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']); |
2897 | 3566 | unset($data); |
2898 | 3567 | } |
2899 | - } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
3568 | + } else { |
|
3569 | + $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
3570 | + } |
|
2900 | 3571 | if ($error != '') { |
2901 | 3572 | return $error; |
2902 | - } elseif ($globalDebug) echo "Done\n"; |
|
3573 | + } elseif ($globalDebug) { |
|
3574 | + echo "Done\n"; |
|
3575 | + } |
|
2903 | 3576 | return ''; |
2904 | 3577 | } |
2905 | 3578 | |
@@ -2924,7 +3597,9 @@ discard block |
||
2924 | 3597 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
2925 | 3598 | $airspace_json = json_decode($airspace_lst,true); |
2926 | 3599 | foreach ($airspace_json['records'] as $airspace) { |
2927 | - if ($globalDebug) echo $airspace['name']."...\n"; |
|
3600 | + if ($globalDebug) { |
|
3601 | + echo $airspace['name']."...\n"; |
|
3602 | + } |
|
2928 | 3603 | update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
2929 | 3604 | if (file_exists($tmp_dir.$airspace['name'])) { |
2930 | 3605 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
@@ -2968,8 +3643,11 @@ discard block |
||
2968 | 3643 | return "error : ".$e->getMessage(); |
2969 | 3644 | } |
2970 | 3645 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2971 | - if ($row['nb'] > 0) return false; |
|
2972 | - else return true; |
|
3646 | + if ($row['nb'] > 0) { |
|
3647 | + return false; |
|
3648 | + } else { |
|
3649 | + return true; |
|
3650 | + } |
|
2973 | 3651 | } |
2974 | 3652 | |
2975 | 3653 | public static function insert_last_update() { |
@@ -2994,8 +3672,11 @@ discard block |
||
2994 | 3672 | return "error : ".$e->getMessage(); |
2995 | 3673 | } |
2996 | 3674 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2997 | - if ($row['nb'] > 0) return true; |
|
2998 | - else return false; |
|
3675 | + if ($row['nb'] > 0) { |
|
3676 | + return true; |
|
3677 | + } else { |
|
3678 | + return false; |
|
3679 | + } |
|
2999 | 3680 | } |
3000 | 3681 | |
3001 | 3682 | public static function check_geoid_version($version) { |
@@ -3008,8 +3689,11 @@ discard block |
||
3008 | 3689 | return "error : ".$e->getMessage(); |
3009 | 3690 | } |
3010 | 3691 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3011 | - if ($row['nb'] > 0) return true; |
|
3012 | - else return false; |
|
3692 | + if ($row['nb'] > 0) { |
|
3693 | + return true; |
|
3694 | + } else { |
|
3695 | + return false; |
|
3696 | + } |
|
3013 | 3697 | } |
3014 | 3698 | |
3015 | 3699 | public static function check_marine_identity_version($version) { |
@@ -3022,8 +3706,11 @@ discard block |
||
3022 | 3706 | return "error : ".$e->getMessage(); |
3023 | 3707 | } |
3024 | 3708 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3025 | - if ($row['nb'] > 0) return true; |
|
3026 | - else return false; |
|
3709 | + if ($row['nb'] > 0) { |
|
3710 | + return true; |
|
3711 | + } else { |
|
3712 | + return false; |
|
3713 | + } |
|
3027 | 3714 | } |
3028 | 3715 | |
3029 | 3716 | public static function check_satellite_version($version) { |
@@ -3036,8 +3723,11 @@ discard block |
||
3036 | 3723 | return "error : ".$e->getMessage(); |
3037 | 3724 | } |
3038 | 3725 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3039 | - if ($row['nb'] > 0) return true; |
|
3040 | - else return false; |
|
3726 | + if ($row['nb'] > 0) { |
|
3727 | + return true; |
|
3728 | + } else { |
|
3729 | + return false; |
|
3730 | + } |
|
3041 | 3731 | } |
3042 | 3732 | |
3043 | 3733 | public static function check_airlines_version($version) { |
@@ -3050,8 +3740,11 @@ discard block |
||
3050 | 3740 | return "error : ".$e->getMessage(); |
3051 | 3741 | } |
3052 | 3742 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3053 | - if ($row['nb'] > 0) return true; |
|
3054 | - else return false; |
|
3743 | + if ($row['nb'] > 0) { |
|
3744 | + return true; |
|
3745 | + } else { |
|
3746 | + return false; |
|
3747 | + } |
|
3055 | 3748 | } |
3056 | 3749 | |
3057 | 3750 | public static function check_notam_version($version) { |
@@ -3064,8 +3757,11 @@ discard block |
||
3064 | 3757 | return "error : ".$e->getMessage(); |
3065 | 3758 | } |
3066 | 3759 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3067 | - if ($row['nb'] > 0) return true; |
|
3068 | - else return false; |
|
3760 | + if ($row['nb'] > 0) { |
|
3761 | + return true; |
|
3762 | + } else { |
|
3763 | + return false; |
|
3764 | + } |
|
3069 | 3765 | } |
3070 | 3766 | |
3071 | 3767 | public static function insert_airlines_version($version) { |
@@ -3155,8 +3851,11 @@ discard block |
||
3155 | 3851 | return "error : ".$e->getMessage(); |
3156 | 3852 | } |
3157 | 3853 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3158 | - if ($row['nb'] > 0) return false; |
|
3159 | - else return true; |
|
3854 | + if ($row['nb'] > 0) { |
|
3855 | + return false; |
|
3856 | + } else { |
|
3857 | + return true; |
|
3858 | + } |
|
3160 | 3859 | } |
3161 | 3860 | |
3162 | 3861 | public static function insert_last_notam_update() { |
@@ -3186,8 +3885,11 @@ discard block |
||
3186 | 3885 | return "error : ".$e->getMessage(); |
3187 | 3886 | } |
3188 | 3887 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3189 | - if ($row['nb'] > 0) return false; |
|
3190 | - else return true; |
|
3888 | + if ($row['nb'] > 0) { |
|
3889 | + return false; |
|
3890 | + } else { |
|
3891 | + return true; |
|
3892 | + } |
|
3191 | 3893 | } |
3192 | 3894 | |
3193 | 3895 | public static function insert_last_airspace_update() { |
@@ -3217,8 +3919,11 @@ discard block |
||
3217 | 3919 | return "error : ".$e->getMessage(); |
3218 | 3920 | } |
3219 | 3921 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3220 | - if ($row['nb'] > 0) return false; |
|
3221 | - else return true; |
|
3922 | + if ($row['nb'] > 0) { |
|
3923 | + return false; |
|
3924 | + } else { |
|
3925 | + return true; |
|
3926 | + } |
|
3222 | 3927 | } |
3223 | 3928 | |
3224 | 3929 | public static function insert_last_geoid_update() { |
@@ -3248,8 +3953,11 @@ discard block |
||
3248 | 3953 | return "error : ".$e->getMessage(); |
3249 | 3954 | } |
3250 | 3955 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3251 | - if ($row['nb'] > 0) return false; |
|
3252 | - else return true; |
|
3956 | + if ($row['nb'] > 0) { |
|
3957 | + return false; |
|
3958 | + } else { |
|
3959 | + return true; |
|
3960 | + } |
|
3253 | 3961 | } |
3254 | 3962 | |
3255 | 3963 | public static function insert_last_owner_update() { |
@@ -3279,8 +3987,11 @@ discard block |
||
3279 | 3987 | return "error : ".$e->getMessage(); |
3280 | 3988 | } |
3281 | 3989 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3282 | - if ($row['nb'] > 0) return false; |
|
3283 | - else return true; |
|
3990 | + if ($row['nb'] > 0) { |
|
3991 | + return false; |
|
3992 | + } else { |
|
3993 | + return true; |
|
3994 | + } |
|
3284 | 3995 | } |
3285 | 3996 | |
3286 | 3997 | public static function insert_last_airlines_update() { |
@@ -3310,8 +4021,11 @@ discard block |
||
3310 | 4021 | return "error : ".$e->getMessage(); |
3311 | 4022 | } |
3312 | 4023 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3313 | - if ($row['nb'] > 0) return false; |
|
3314 | - else return true; |
|
4024 | + if ($row['nb'] > 0) { |
|
4025 | + return false; |
|
4026 | + } else { |
|
4027 | + return true; |
|
4028 | + } |
|
3315 | 4029 | } |
3316 | 4030 | |
3317 | 4031 | public static function insert_last_schedules_update() { |
@@ -3341,8 +4055,11 @@ discard block |
||
3341 | 4055 | return "error : ".$e->getMessage(); |
3342 | 4056 | } |
3343 | 4057 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3344 | - if ($row['nb'] > 0) return false; |
|
3345 | - else return true; |
|
4058 | + if ($row['nb'] > 0) { |
|
4059 | + return false; |
|
4060 | + } else { |
|
4061 | + return true; |
|
4062 | + } |
|
3346 | 4063 | } |
3347 | 4064 | |
3348 | 4065 | public static function insert_last_tle_update() { |
@@ -3372,8 +4089,11 @@ discard block |
||
3372 | 4089 | return "error : ".$e->getMessage(); |
3373 | 4090 | } |
3374 | 4091 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3375 | - if ($row['nb'] > 0) return false; |
|
3376 | - else return true; |
|
4092 | + if ($row['nb'] > 0) { |
|
4093 | + return false; |
|
4094 | + } else { |
|
4095 | + return true; |
|
4096 | + } |
|
3377 | 4097 | } |
3378 | 4098 | |
3379 | 4099 | public static function insert_last_ucsdb_update() { |
@@ -3403,8 +4123,11 @@ discard block |
||
3403 | 4123 | return "error : ".$e->getMessage(); |
3404 | 4124 | } |
3405 | 4125 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3406 | - if ($row['nb'] > 0) return false; |
|
3407 | - else return true; |
|
4126 | + if ($row['nb'] > 0) { |
|
4127 | + return false; |
|
4128 | + } else { |
|
4129 | + return true; |
|
4130 | + } |
|
3408 | 4131 | } |
3409 | 4132 | |
3410 | 4133 | public static function insert_last_celestrak_update() { |
@@ -3434,8 +4157,11 @@ discard block |
||
3434 | 4157 | return "error : ".$e->getMessage(); |
3435 | 4158 | } |
3436 | 4159 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3437 | - if ($row['nb'] > 0) return false; |
|
3438 | - else return true; |
|
4160 | + if ($row['nb'] > 0) { |
|
4161 | + return false; |
|
4162 | + } else { |
|
4163 | + return true; |
|
4164 | + } |
|
3439 | 4165 | } |
3440 | 4166 | |
3441 | 4167 | public static function check_last_satellite_update() { |
@@ -3453,8 +4179,11 @@ discard block |
||
3453 | 4179 | return "error : ".$e->getMessage(); |
3454 | 4180 | } |
3455 | 4181 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3456 | - if ($row['nb'] > 0) return false; |
|
3457 | - else return true; |
|
4182 | + if ($row['nb'] > 0) { |
|
4183 | + return false; |
|
4184 | + } else { |
|
4185 | + return true; |
|
4186 | + } |
|
3458 | 4187 | } |
3459 | 4188 | |
3460 | 4189 | public static function insert_last_marine_identity_update() { |