@@ -10,6 +10,9 @@ discard block |
||
10 | 10 | class update_db { |
11 | 11 | public static $db_sqlite; |
12 | 12 | |
13 | + /** |
|
14 | + * @param string $file |
|
15 | + */ |
|
13 | 16 | public static function download($url, $file, $referer = '') { |
14 | 17 | global $globalProxy, $globalForceIPv4; |
15 | 18 | $fp = fopen($file, 'w'); |
@@ -34,6 +37,9 @@ discard block |
||
34 | 37 | fclose($fp); |
35 | 38 | } |
36 | 39 | |
40 | + /** |
|
41 | + * @param string $in_file |
|
42 | + */ |
|
37 | 43 | public static function gunzip($in_file,$out_file_name = '') { |
38 | 44 | //echo $in_file.' -> '.$out_file_name."\n"; |
39 | 45 | $buffer_size = 4096; // read 4kb at a time |
@@ -55,6 +61,9 @@ discard block |
||
55 | 61 | } |
56 | 62 | } |
57 | 63 | |
64 | + /** |
|
65 | + * @param string $in_file |
|
66 | + */ |
|
58 | 67 | public static function unzip($in_file) { |
59 | 68 | if ($in_file != '' && file_exists($in_file)) { |
60 | 69 | $path = pathinfo(realpath($in_file), PATHINFO_DIRNAME); |
@@ -76,6 +85,9 @@ discard block |
||
76 | 85 | } |
77 | 86 | } |
78 | 87 | |
88 | + /** |
|
89 | + * @param string $database_file |
|
90 | + */ |
|
79 | 91 | public static function retrieve_route_sqlite_to_dest($database_file) { |
80 | 92 | global $globalDebug, $globalTransaction; |
81 | 93 | //$query = 'TRUNCATE TABLE routes'; |
@@ -118,6 +130,10 @@ discard block |
||
118 | 130 | } |
119 | 131 | return ''; |
120 | 132 | } |
133 | + |
|
134 | + /** |
|
135 | + * @param string $database_file |
|
136 | + */ |
|
121 | 137 | public static function retrieve_route_oneworld($database_file) { |
122 | 138 | global $globalDebug, $globalTransaction; |
123 | 139 | //$query = 'TRUNCATE TABLE routes'; |
@@ -159,6 +175,9 @@ discard block |
||
159 | 175 | return ''; |
160 | 176 | } |
161 | 177 | |
178 | + /** |
|
179 | + * @param string $database_file |
|
180 | + */ |
|
162 | 181 | public static function retrieve_route_skyteam($database_file) { |
163 | 182 | global $globalDebug, $globalTransaction; |
164 | 183 | //$query = 'TRUNCATE TABLE routes'; |
@@ -201,6 +220,10 @@ discard block |
||
201 | 220 | } |
202 | 221 | return ''; |
203 | 222 | } |
223 | + |
|
224 | + /** |
|
225 | + * @param string $database_file |
|
226 | + */ |
|
204 | 227 | public static function retrieve_modes_sqlite_to_dest($database_file) { |
205 | 228 | global $globalTransaction; |
206 | 229 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
@@ -267,6 +290,9 @@ discard block |
||
267 | 290 | return ''; |
268 | 291 | } |
269 | 292 | |
293 | + /** |
|
294 | + * @param string $database_file |
|
295 | + */ |
|
270 | 296 | public static function retrieve_modes_flarmnet($database_file) { |
271 | 297 | global $globalTransaction; |
272 | 298 | $Common = new Common(); |
@@ -337,6 +363,9 @@ discard block |
||
337 | 363 | return ''; |
338 | 364 | } |
339 | 365 | |
366 | + /** |
|
367 | + * @param string $database_file |
|
368 | + */ |
|
340 | 369 | public static function retrieve_modes_ogn($database_file) { |
341 | 370 | global $globalTransaction; |
342 | 371 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
@@ -406,6 +435,9 @@ discard block |
||
406 | 435 | return ''; |
407 | 436 | } |
408 | 437 | |
438 | + /** |
|
439 | + * @param string $database_file |
|
440 | + */ |
|
409 | 441 | public static function retrieve_owner($database_file,$country = 'F') { |
410 | 442 | global $globalTransaction, $globalMasterSource; |
411 | 443 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
@@ -1341,6 +1373,10 @@ discard block |
||
1341 | 1373 | return ''; |
1342 | 1374 | } |
1343 | 1375 | |
1376 | + /** |
|
1377 | + * @param string $filename |
|
1378 | + * @param string $tletype |
|
1379 | + */ |
|
1344 | 1380 | public static function tle($filename,$tletype) { |
1345 | 1381 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
1346 | 1382 | global $tmp_dir, $globalTransaction; |
@@ -1390,6 +1426,9 @@ discard block |
||
1390 | 1426 | return ''; |
1391 | 1427 | } |
1392 | 1428 | |
1429 | + /** |
|
1430 | + * @param string $filename |
|
1431 | + */ |
|
1393 | 1432 | public static function satellite_ucsdb($filename) { |
1394 | 1433 | global $tmp_dir, $globalTransaction; |
1395 | 1434 | $query = "DELETE FROM satellite"; |
@@ -1436,6 +1475,9 @@ discard block |
||
1436 | 1475 | return ''; |
1437 | 1476 | } |
1438 | 1477 | |
1478 | + /** |
|
1479 | + * @param string $filename |
|
1480 | + */ |
|
1439 | 1481 | public static function satellite_celestrak($filename) { |
1440 | 1482 | global $tmp_dir, $globalTransaction; |
1441 | 1483 | $satcat_sources = array( |
@@ -1753,6 +1795,9 @@ discard block |
||
1753 | 1795 | |
1754 | 1796 | } |
1755 | 1797 | */ |
1798 | + /** |
|
1799 | + * @param string $filename |
|
1800 | + */ |
|
1756 | 1801 | public static function waypoints($filename) { |
1757 | 1802 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
1758 | 1803 | global $tmp_dir, $globalTransaction; |
@@ -1800,6 +1845,9 @@ discard block |
||
1800 | 1845 | return ''; |
1801 | 1846 | } |
1802 | 1847 | |
1848 | + /** |
|
1849 | + * @param string $filename |
|
1850 | + */ |
|
1803 | 1851 | public static function ivao_airlines($filename) { |
1804 | 1852 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
1805 | 1853 | global $tmp_dir, $globalTransaction; |
@@ -85,38 +85,38 @@ discard block |
||
85 | 85 | try { |
86 | 86 | //$Connection = new Connection(); |
87 | 87 | $sth = $Connection->db->prepare($query); |
88 | - $sth->execute(array(':source' => $database_file)); |
|
89 | - } catch(PDOException $e) { |
|
90 | - return "error : ".$e->getMessage(); |
|
91 | - } |
|
88 | + $sth->execute(array(':source' => $database_file)); |
|
89 | + } catch(PDOException $e) { |
|
90 | + return "error : ".$e->getMessage(); |
|
91 | + } |
|
92 | 92 | |
93 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
94 | - update_db::connect_sqlite($database_file); |
|
93 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
94 | + update_db::connect_sqlite($database_file); |
|
95 | 95 | //$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 | 96 | $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"; |
97 | 97 | try { |
98 | - $sth = update_db::$db_sqlite->prepare($query); |
|
99 | - $sth->execute(); |
|
100 | - } catch(PDOException $e) { |
|
101 | - return "error : ".$e->getMessage(); |
|
102 | - } |
|
98 | + $sth = update_db::$db_sqlite->prepare($query); |
|
99 | + $sth->execute(); |
|
100 | + } catch(PDOException $e) { |
|
101 | + return "error : ".$e->getMessage(); |
|
102 | + } |
|
103 | 103 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
104 | 104 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
105 | 105 | $Connection = new Connection(); |
106 | 106 | $sth_dest = $Connection->db->prepare($query_dest); |
107 | 107 | try { |
108 | 108 | if ($globalTransaction) $Connection->db->beginTransaction(); |
109 | - while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
109 | + while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
110 | 110 | //$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 | 111 | $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 | 112 | $sth_dest->execute($query_dest_values); |
113 | - } |
|
113 | + } |
|
114 | 114 | if ($globalTransaction) $Connection->db->commit(); |
115 | 115 | } catch(PDOException $e) { |
116 | 116 | if ($globalTransaction) $Connection->db->rollBack(); |
117 | 117 | return "error : ".$e->getMessage(); |
118 | 118 | } |
119 | - return ''; |
|
119 | + return ''; |
|
120 | 120 | } |
121 | 121 | public static function retrieve_route_oneworld($database_file) { |
122 | 122 | global $globalDebug, $globalTransaction; |
@@ -127,12 +127,12 @@ discard block |
||
127 | 127 | try { |
128 | 128 | //$Connection = new Connection(); |
129 | 129 | $sth = $Connection->db->prepare($query); |
130 | - $sth->execute(array(':source' => 'oneworld')); |
|
131 | - } catch(PDOException $e) { |
|
132 | - return "error : ".$e->getMessage(); |
|
133 | - } |
|
130 | + $sth->execute(array(':source' => 'oneworld')); |
|
131 | + } catch(PDOException $e) { |
|
132 | + return "error : ".$e->getMessage(); |
|
133 | + } |
|
134 | 134 | |
135 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
135 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
136 | 136 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
137 | 137 | $Spotter = new Spotter(); |
138 | 138 | if ($fh = fopen($database_file,"r")) { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | } |
157 | 157 | if ($globalTransaction) $Connection->db->commit(); |
158 | 158 | } |
159 | - return ''; |
|
159 | + return ''; |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | public static function retrieve_route_skyteam($database_file) { |
@@ -168,12 +168,12 @@ discard block |
||
168 | 168 | try { |
169 | 169 | //$Connection = new Connection(); |
170 | 170 | $sth = $Connection->db->prepare($query); |
171 | - $sth->execute(array(':source' => 'skyteam')); |
|
172 | - } catch(PDOException $e) { |
|
173 | - return "error : ".$e->getMessage(); |
|
174 | - } |
|
171 | + $sth->execute(array(':source' => 'skyteam')); |
|
172 | + } catch(PDOException $e) { |
|
173 | + return "error : ".$e->getMessage(); |
|
174 | + } |
|
175 | 175 | |
176 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
176 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
177 | 177 | |
178 | 178 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
179 | 179 | $Spotter = new Spotter(); |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | return "error : ".$e->getMessage(); |
200 | 200 | } |
201 | 201 | } |
202 | - return ''; |
|
202 | + return ''; |
|
203 | 203 | } |
204 | 204 | public static function retrieve_modes_sqlite_to_dest($database_file) { |
205 | 205 | global $globalTransaction; |
@@ -208,27 +208,27 @@ discard block |
||
208 | 208 | try { |
209 | 209 | $Connection = new Connection(); |
210 | 210 | $sth = $Connection->db->prepare($query); |
211 | - $sth->execute(array(':source' => $database_file)); |
|
212 | - } catch(PDOException $e) { |
|
213 | - return "error : ".$e->getMessage(); |
|
214 | - } |
|
211 | + $sth->execute(array(':source' => $database_file)); |
|
212 | + } catch(PDOException $e) { |
|
213 | + return "error : ".$e->getMessage(); |
|
214 | + } |
|
215 | 215 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
216 | 216 | try { |
217 | 217 | $Connection = new Connection(); |
218 | 218 | $sth = $Connection->db->prepare($query); |
219 | - $sth->execute(array(':source' => $database_file)); |
|
220 | - } catch(PDOException $e) { |
|
221 | - return "error : ".$e->getMessage(); |
|
222 | - } |
|
219 | + $sth->execute(array(':source' => $database_file)); |
|
220 | + } catch(PDOException $e) { |
|
221 | + return "error : ".$e->getMessage(); |
|
222 | + } |
|
223 | 223 | |
224 | - update_db::connect_sqlite($database_file); |
|
224 | + update_db::connect_sqlite($database_file); |
|
225 | 225 | $query = 'select * from Aircraft'; |
226 | 226 | try { |
227 | - $sth = update_db::$db_sqlite->prepare($query); |
|
228 | - $sth->execute(); |
|
229 | - } catch(PDOException $e) { |
|
230 | - return "error : ".$e->getMessage(); |
|
231 | - } |
|
227 | + $sth = update_db::$db_sqlite->prepare($query); |
|
228 | + $sth->execute(); |
|
229 | + } catch(PDOException $e) { |
|
230 | + return "error : ".$e->getMessage(); |
|
231 | + } |
|
232 | 232 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
233 | 233 | $query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)'; |
234 | 234 | |
@@ -239,17 +239,17 @@ discard block |
||
239 | 239 | $sth_dest_owner = $Connection->db->prepare($query_dest_owner); |
240 | 240 | try { |
241 | 241 | if ($globalTransaction) $Connection->db->beginTransaction(); |
242 | - while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
242 | + while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
243 | 243 | //$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 | 244 | if ($values['UserString4'] == 'M') $type = 'military'; |
245 | 245 | else $type = null; |
246 | 246 | $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 | 247 | $sth_dest->execute($query_dest_values); |
248 | 248 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
249 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
250 | - $sth_dest_owner->execute($query_dest_owner_values); |
|
249 | + $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
250 | + $sth_dest_owner->execute($query_dest_owner_values); |
|
251 | 251 | } |
252 | - } |
|
252 | + } |
|
253 | 253 | if ($globalTransaction) $Connection->db->commit(); |
254 | 254 | } catch(PDOException $e) { |
255 | 255 | return "error : ".$e->getMessage(); |
@@ -260,10 +260,10 @@ discard block |
||
260 | 260 | try { |
261 | 261 | $Connection = new Connection(); |
262 | 262 | $sth = $Connection->db->prepare($query); |
263 | - $sth->execute(array(':source' => $database_file)); |
|
264 | - } catch(PDOException $e) { |
|
265 | - return "error : ".$e->getMessage(); |
|
266 | - } |
|
263 | + $sth->execute(array(':source' => $database_file)); |
|
264 | + } catch(PDOException $e) { |
|
265 | + return "error : ".$e->getMessage(); |
|
266 | + } |
|
267 | 267 | return ''; |
268 | 268 | } |
269 | 269 | |
@@ -275,10 +275,10 @@ discard block |
||
275 | 275 | try { |
276 | 276 | $Connection = new Connection(); |
277 | 277 | $sth = $Connection->db->prepare($query); |
278 | - $sth->execute(array(':source' => $database_file)); |
|
279 | - } catch(PDOException $e) { |
|
280 | - return "error : ".$e->getMessage(); |
|
281 | - } |
|
278 | + $sth->execute(array(':source' => $database_file)); |
|
279 | + } catch(PDOException $e) { |
|
280 | + return "error : ".$e->getMessage(); |
|
281 | + } |
|
282 | 282 | |
283 | 283 | if ($fh = fopen($database_file,"r")) { |
284 | 284 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -288,26 +288,26 @@ discard block |
||
288 | 288 | $sth_dest = $Connection->db->prepare($query_dest); |
289 | 289 | try { |
290 | 290 | if ($globalTransaction) $Connection->db->beginTransaction(); |
291 | - while (!feof($fh)) { |
|
292 | - $values = array(); |
|
293 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
291 | + while (!feof($fh)) { |
|
292 | + $values = array(); |
|
293 | + $line = $Common->hex2str(fgets($fh,9999)); |
|
294 | 294 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
295 | - $values['ModeS'] = substr($line,0,6); |
|
296 | - $values['Registration'] = trim(substr($line,69,6)); |
|
297 | - $aircraft_name = trim(substr($line,48,6)); |
|
298 | - // Check if we can find ICAO, else set it to GLID |
|
299 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
300 | - $search_more = ''; |
|
301 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
302 | - $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
303 | - $sth_search = $Connection->db->prepare($query_search); |
|
295 | + $values['ModeS'] = substr($line,0,6); |
|
296 | + $values['Registration'] = trim(substr($line,69,6)); |
|
297 | + $aircraft_name = trim(substr($line,48,6)); |
|
298 | + // Check if we can find ICAO, else set it to GLID |
|
299 | + $aircraft_name_split = explode(' ',$aircraft_name); |
|
300 | + $search_more = ''; |
|
301 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
302 | + $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
303 | + $sth_search = $Connection->db->prepare($query_search); |
|
304 | 304 | try { |
305 | - $sth_search->execute(); |
|
306 | - $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
307 | - //if (count($result) > 0) { |
|
308 | - if (isset($result['icao']) && $result['icao'] != '') { |
|
309 | - $values['ICAOTypeCode'] = $result['icao']; |
|
310 | - } |
|
305 | + $sth_search->execute(); |
|
306 | + $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
307 | + //if (count($result) > 0) { |
|
308 | + if (isset($result['icao']) && $result['icao'] != '') { |
|
309 | + $values['ICAOTypeCode'] = $result['icao']; |
|
310 | + } |
|
311 | 311 | } catch(PDOException $e) { |
312 | 312 | return "error : ".$e->getMessage(); |
313 | 313 | } |
@@ -330,10 +330,10 @@ discard block |
||
330 | 330 | try { |
331 | 331 | $Connection = new Connection(); |
332 | 332 | $sth = $Connection->db->prepare($query); |
333 | - $sth->execute(array(':source' => $database_file)); |
|
334 | - } catch(PDOException $e) { |
|
335 | - return "error : ".$e->getMessage(); |
|
336 | - } |
|
333 | + $sth->execute(array(':source' => $database_file)); |
|
334 | + } catch(PDOException $e) { |
|
335 | + return "error : ".$e->getMessage(); |
|
336 | + } |
|
337 | 337 | return ''; |
338 | 338 | } |
339 | 339 | |
@@ -344,10 +344,10 @@ discard block |
||
344 | 344 | try { |
345 | 345 | $Connection = new Connection(); |
346 | 346 | $sth = $Connection->db->prepare($query); |
347 | - $sth->execute(array(':source' => $database_file)); |
|
348 | - } catch(PDOException $e) { |
|
349 | - return "error : ".$e->getMessage(); |
|
350 | - } |
|
347 | + $sth->execute(array(':source' => $database_file)); |
|
348 | + } catch(PDOException $e) { |
|
349 | + return "error : ".$e->getMessage(); |
|
350 | + } |
|
351 | 351 | |
352 | 352 | if ($fh = fopen($database_file,"r")) { |
353 | 353 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -358,25 +358,25 @@ discard block |
||
358 | 358 | try { |
359 | 359 | if ($globalTransaction) $Connection->db->beginTransaction(); |
360 | 360 | $tmp = fgetcsv($fh,9999,',',"'"); |
361 | - while (!feof($fh)) { |
|
362 | - $line = fgetcsv($fh,9999,',',"'"); |
|
361 | + while (!feof($fh)) { |
|
362 | + $line = fgetcsv($fh,9999,',',"'"); |
|
363 | 363 | |
364 | 364 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
365 | 365 | //print_r($line); |
366 | - $values['ModeS'] = $line[1]; |
|
367 | - $values['Registration'] = $line[3]; |
|
368 | - $values['ICAOTypeCode'] = ''; |
|
369 | - $aircraft_name = $line[2]; |
|
370 | - // Check if we can find ICAO, else set it to GLID |
|
371 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
372 | - $search_more = ''; |
|
373 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
374 | - $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
375 | - $sth_search = $Connection->db->prepare($query_search); |
|
366 | + $values['ModeS'] = $line[1]; |
|
367 | + $values['Registration'] = $line[3]; |
|
368 | + $values['ICAOTypeCode'] = ''; |
|
369 | + $aircraft_name = $line[2]; |
|
370 | + // Check if we can find ICAO, else set it to GLID |
|
371 | + $aircraft_name_split = explode(' ',$aircraft_name); |
|
372 | + $search_more = ''; |
|
373 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
374 | + $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
375 | + $sth_search = $Connection->db->prepare($query_search); |
|
376 | 376 | try { |
377 | - $sth_search->execute(); |
|
378 | - $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
379 | - if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
377 | + $sth_search->execute(); |
|
378 | + $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
379 | + if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
380 | 380 | } catch(PDOException $e) { |
381 | 381 | return "error : ".$e->getMessage(); |
382 | 382 | } |
@@ -399,10 +399,10 @@ discard block |
||
399 | 399 | try { |
400 | 400 | $Connection = new Connection(); |
401 | 401 | $sth = $Connection->db->prepare($query); |
402 | - $sth->execute(array(':source' => $database_file)); |
|
403 | - } catch(PDOException $e) { |
|
404 | - return "error : ".$e->getMessage(); |
|
405 | - } |
|
402 | + $sth->execute(array(':source' => $database_file)); |
|
403 | + } catch(PDOException $e) { |
|
404 | + return "error : ".$e->getMessage(); |
|
405 | + } |
|
406 | 406 | return ''; |
407 | 407 | } |
408 | 408 | |
@@ -413,16 +413,16 @@ discard block |
||
413 | 413 | try { |
414 | 414 | $Connection = new Connection(); |
415 | 415 | $sth = $Connection->db->prepare($query); |
416 | - $sth->execute(array(':source' => $database_file)); |
|
417 | - } catch(PDOException $e) { |
|
418 | - return "error : ".$e->getMessage(); |
|
419 | - } |
|
416 | + $sth->execute(array(':source' => $database_file)); |
|
417 | + } catch(PDOException $e) { |
|
418 | + return "error : ".$e->getMessage(); |
|
419 | + } |
|
420 | 420 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
421 | 421 | $Spotter = new Spotter(); |
422 | 422 | if ($fh = fopen($database_file,"r")) { |
423 | 423 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
424 | 424 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
425 | - $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
|
425 | + $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
|
426 | 426 | |
427 | 427 | $Connection = new Connection(); |
428 | 428 | $sth_dest = $Connection->db->prepare($query_dest); |
@@ -430,126 +430,126 @@ discard block |
||
430 | 430 | try { |
431 | 431 | if ($globalTransaction) $Connection->db->beginTransaction(); |
432 | 432 | $tmp = fgetcsv($fh,9999,',','"'); |
433 | - while (!feof($fh)) { |
|
434 | - $line = fgetcsv($fh,9999,',','"'); |
|
435 | - $values = array(); |
|
436 | - //print_r($line); |
|
437 | - if ($country == 'F') { |
|
438 | - $values['registration'] = $line[0]; |
|
439 | - $values['base'] = $line[4]; |
|
440 | - $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])); |
|
443 | - $values['cancel'] = $line[7]; |
|
433 | + while (!feof($fh)) { |
|
434 | + $line = fgetcsv($fh,9999,',','"'); |
|
435 | + $values = array(); |
|
436 | + //print_r($line); |
|
437 | + if ($country == 'F') { |
|
438 | + $values['registration'] = $line[0]; |
|
439 | + $values['base'] = $line[4]; |
|
440 | + $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])); |
|
443 | + $values['cancel'] = $line[7]; |
|
444 | 444 | } elseif ($country == 'EI') { |
445 | - // TODO : add modeS & reg to aircraft_modes |
|
446 | - $values['registration'] = $line[0]; |
|
447 | - $values['base'] = $line[3]; |
|
448 | - $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])); |
|
451 | - $values['cancel'] = ''; |
|
452 | - $values['modes'] = $line[7]; |
|
453 | - $values['icao'] = $line[8]; |
|
445 | + // TODO : add modeS & reg to aircraft_modes |
|
446 | + $values['registration'] = $line[0]; |
|
447 | + $values['base'] = $line[3]; |
|
448 | + $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])); |
|
451 | + $values['cancel'] = ''; |
|
452 | + $values['modes'] = $line[7]; |
|
453 | + $values['icao'] = $line[8]; |
|
454 | 454 | |
455 | 455 | } elseif ($country == 'HB') { |
456 | - // TODO : add modeS & reg to aircraft_modes |
|
457 | - $values['registration'] = $line[0]; |
|
458 | - $values['base'] = null; |
|
459 | - $values['owner'] = $line[5]; |
|
460 | - $values['date_first_reg'] = null; |
|
461 | - $values['cancel'] = ''; |
|
462 | - $values['modes'] = $line[4]; |
|
463 | - $values['icao'] = $line[7]; |
|
456 | + // TODO : add modeS & reg to aircraft_modes |
|
457 | + $values['registration'] = $line[0]; |
|
458 | + $values['base'] = null; |
|
459 | + $values['owner'] = $line[5]; |
|
460 | + $values['date_first_reg'] = null; |
|
461 | + $values['cancel'] = ''; |
|
462 | + $values['modes'] = $line[4]; |
|
463 | + $values['icao'] = $line[7]; |
|
464 | 464 | } elseif ($country == 'OK') { |
465 | - // TODO : add modeS & reg to aircraft_modes |
|
466 | - $values['registration'] = $line[3]; |
|
467 | - $values['base'] = null; |
|
468 | - $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])); |
|
471 | - $values['cancel'] = ''; |
|
465 | + // TODO : add modeS & reg to aircraft_modes |
|
466 | + $values['registration'] = $line[3]; |
|
467 | + $values['base'] = null; |
|
468 | + $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])); |
|
471 | + $values['cancel'] = ''; |
|
472 | 472 | } elseif ($country == 'VH') { |
473 | - // TODO : add modeS & reg to aircraft_modes |
|
474 | - $values['registration'] = $line[0]; |
|
475 | - $values['base'] = null; |
|
476 | - $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])); |
|
479 | - |
|
480 | - $values['cancel'] = $line[39]; |
|
473 | + // TODO : add modeS & reg to aircraft_modes |
|
474 | + $values['registration'] = $line[0]; |
|
475 | + $values['base'] = null; |
|
476 | + $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])); |
|
479 | + |
|
480 | + $values['cancel'] = $line[39]; |
|
481 | 481 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
482 | - $values['registration'] = $line[0]; |
|
483 | - $values['base'] = null; |
|
484 | - $values['owner'] = $line[4]; |
|
485 | - $values['date_first_reg'] = null; |
|
486 | - $values['cancel'] = ''; |
|
482 | + $values['registration'] = $line[0]; |
|
483 | + $values['base'] = null; |
|
484 | + $values['owner'] = $line[4]; |
|
485 | + $values['date_first_reg'] = null; |
|
486 | + $values['cancel'] = ''; |
|
487 | 487 | } elseif ($country == 'CC') { |
488 | - $values['registration'] = $line[0]; |
|
489 | - $values['base'] = null; |
|
490 | - $values['owner'] = $line[6]; |
|
491 | - $values['date_first_reg'] = null; |
|
492 | - $values['cancel'] = ''; |
|
488 | + $values['registration'] = $line[0]; |
|
489 | + $values['base'] = null; |
|
490 | + $values['owner'] = $line[6]; |
|
491 | + $values['date_first_reg'] = null; |
|
492 | + $values['cancel'] = ''; |
|
493 | 493 | } elseif ($country == 'HJ') { |
494 | - $values['registration'] = $line[0]; |
|
495 | - $values['base'] = null; |
|
496 | - $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])); |
|
499 | - $values['cancel'] = ''; |
|
494 | + $values['registration'] = $line[0]; |
|
495 | + $values['base'] = null; |
|
496 | + $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])); |
|
499 | + $values['cancel'] = ''; |
|
500 | 500 | } elseif ($country == 'PP') { |
501 | - $values['registration'] = $line[0]; |
|
502 | - $values['base'] = null; |
|
503 | - $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])); |
|
506 | - $values['cancel'] = $line[7]; |
|
501 | + $values['registration'] = $line[0]; |
|
502 | + $values['base'] = null; |
|
503 | + $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])); |
|
506 | + $values['cancel'] = $line[7]; |
|
507 | 507 | } elseif ($country == 'E7') { |
508 | - $values['registration'] = $line[0]; |
|
509 | - $values['base'] = null; |
|
510 | - $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])); |
|
513 | - $values['cancel'] = ''; |
|
508 | + $values['registration'] = $line[0]; |
|
509 | + $values['base'] = null; |
|
510 | + $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])); |
|
513 | + $values['cancel'] = ''; |
|
514 | 514 | } elseif ($country == '8Q') { |
515 | - $values['registration'] = $line[0]; |
|
516 | - $values['base'] = null; |
|
517 | - $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])); |
|
520 | - $values['cancel'] = ''; |
|
515 | + $values['registration'] = $line[0]; |
|
516 | + $values['base'] = null; |
|
517 | + $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])); |
|
520 | + $values['cancel'] = ''; |
|
521 | 521 | } elseif ($country == 'ZK') { |
522 | - $values['registration'] = $line[0]; |
|
523 | - $values['base'] = null; |
|
524 | - $values['owner'] = $line[3]; |
|
525 | - $values['date_first_reg'] = null; |
|
526 | - $values['cancel'] = ''; |
|
527 | - $values['modes'] = $line[5]; |
|
528 | - $values['icao'] = $line[9]; |
|
522 | + $values['registration'] = $line[0]; |
|
523 | + $values['base'] = null; |
|
524 | + $values['owner'] = $line[3]; |
|
525 | + $values['date_first_reg'] = null; |
|
526 | + $values['cancel'] = ''; |
|
527 | + $values['modes'] = $line[5]; |
|
528 | + $values['icao'] = $line[9]; |
|
529 | 529 | } elseif ($country == 'M') { |
530 | - $values['registration'] = $line[0]; |
|
531 | - $values['base'] = null; |
|
532 | - $values['owner'] = $line[6]; |
|
533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
534 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
535 | - $values['modes'] = $line[4]; |
|
536 | - $values['icao'] = $line[10]; |
|
530 | + $values['registration'] = $line[0]; |
|
531 | + $values['base'] = null; |
|
532 | + $values['owner'] = $line[6]; |
|
533 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
534 | + $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
535 | + $values['modes'] = $line[4]; |
|
536 | + $values['icao'] = $line[10]; |
|
537 | 537 | } elseif ($country == 'OY') { |
538 | - $values['registration'] = $line[0]; |
|
539 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
540 | - $values['modes'] = $line[5]; |
|
541 | - $values['icao'] = $line[6]; |
|
538 | + $values['registration'] = $line[0]; |
|
539 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
540 | + $values['modes'] = $line[5]; |
|
541 | + $values['icao'] = $line[6]; |
|
542 | 542 | } elseif ($country == 'PH') { |
543 | - $values['registration'] = $line[0]; |
|
544 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
545 | - $values['modes'] = $line[4]; |
|
546 | - $values['icao'] = $line[5]; |
|
543 | + $values['registration'] = $line[0]; |
|
544 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
545 | + $values['modes'] = $line[4]; |
|
546 | + $values['icao'] = $line[5]; |
|
547 | 547 | } elseif ($country == 'OM' || $country == 'TF') { |
548 | - $values['registration'] = $line[0]; |
|
549 | - $values['base'] = null; |
|
550 | - $values['owner'] = $line[3]; |
|
551 | - $values['date_first_reg'] = null; |
|
552 | - $values['cancel'] = ''; |
|
548 | + $values['registration'] = $line[0]; |
|
549 | + $values['base'] = null; |
|
550 | + $values['owner'] = $line[3]; |
|
551 | + $values['date_first_reg'] = null; |
|
552 | + $values['cancel'] = ''; |
|
553 | 553 | } |
554 | 554 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
555 | 555 | $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
@@ -682,7 +682,7 @@ discard block |
||
682 | 682 | return "error : ".$e->getMessage(); |
683 | 683 | } |
684 | 684 | */ |
685 | - /* |
|
685 | + /* |
|
686 | 686 | $query = 'ALTER TABLE airport DROP INDEX icaoidx'; |
687 | 687 | try { |
688 | 688 | $Connection = new Connection(); |
@@ -927,10 +927,10 @@ discard block |
||
927 | 927 | try { |
928 | 928 | $Connection = new Connection(); |
929 | 929 | $sth = $Connection->db->prepare($query); |
930 | - $sth->execute(array(':source' => 'translation.csv')); |
|
931 | - } catch(PDOException $e) { |
|
932 | - return "error : ".$e->getMessage(); |
|
933 | - } |
|
930 | + $sth->execute(array(':source' => 'translation.csv')); |
|
931 | + } catch(PDOException $e) { |
|
932 | + return "error : ".$e->getMessage(); |
|
933 | + } |
|
934 | 934 | |
935 | 935 | |
936 | 936 | //update_db::unzip($out_file); |
@@ -949,21 +949,21 @@ discard block |
||
949 | 949 | $data = $row; |
950 | 950 | $operator = $data[2]; |
951 | 951 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
952 | - $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2)); |
|
953 | - //echo substr($operator, 0, 2)."\n";; |
|
954 | - if (count($airline_array) > 0) { |
|
952 | + $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2)); |
|
953 | + //echo substr($operator, 0, 2)."\n";; |
|
954 | + if (count($airline_array) > 0) { |
|
955 | 955 | //print_r($airline_array); |
956 | 956 | $operator = $airline_array[0]['icao'].substr($operator,2); |
957 | - } |
|
958 | - } |
|
957 | + } |
|
958 | + } |
|
959 | 959 | |
960 | 960 | $operator_correct = $data[3]; |
961 | 961 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
962 | - $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
|
963 | - if (count($airline_array) > 0) { |
|
964 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
965 | - } |
|
966 | - } |
|
962 | + $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
|
963 | + if (count($airline_array) > 0) { |
|
964 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
965 | + } |
|
966 | + } |
|
967 | 967 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
968 | 968 | try { |
969 | 969 | $sth = $Connection->db->prepare($query); |
@@ -977,7 +977,7 @@ discard block |
||
977 | 977 | //$Connection->db->commit(); |
978 | 978 | } |
979 | 979 | return ''; |
980 | - } |
|
980 | + } |
|
981 | 981 | |
982 | 982 | public static function translation_fam() { |
983 | 983 | global $tmp_dir, $globalTransaction; |
@@ -1015,7 +1015,7 @@ discard block |
||
1015 | 1015 | //$Connection->db->commit(); |
1016 | 1016 | } |
1017 | 1017 | return ''; |
1018 | - } |
|
1018 | + } |
|
1019 | 1019 | |
1020 | 1020 | /* |
1021 | 1021 | * This function use FAA public data. |
@@ -1027,19 +1027,19 @@ discard block |
||
1027 | 1027 | try { |
1028 | 1028 | $Connection = new Connection(); |
1029 | 1029 | $sth = $Connection->db->prepare($query); |
1030 | - $sth->execute(array(':source' => 'website_faa')); |
|
1031 | - } catch(PDOException $e) { |
|
1032 | - return "error : ".$e->getMessage(); |
|
1033 | - } |
|
1030 | + $sth->execute(array(':source' => 'website_faa')); |
|
1031 | + } catch(PDOException $e) { |
|
1032 | + return "error : ".$e->getMessage(); |
|
1033 | + } |
|
1034 | 1034 | |
1035 | 1035 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source = :source"; |
1036 | 1036 | try { |
1037 | 1037 | $Connection = new Connection(); |
1038 | 1038 | $sth = $Connection->db->prepare($query); |
1039 | - $sth->execute(array(':source' => 'website_faa')); |
|
1040 | - } catch(PDOException $e) { |
|
1041 | - return "error : ".$e->getMessage(); |
|
1042 | - } |
|
1039 | + $sth->execute(array(':source' => 'website_faa')); |
|
1040 | + } catch(PDOException $e) { |
|
1041 | + return "error : ".$e->getMessage(); |
|
1042 | + } |
|
1043 | 1043 | |
1044 | 1044 | $delimiter = ","; |
1045 | 1045 | $mfr = array(); |
@@ -1115,17 +1115,17 @@ discard block |
||
1115 | 1115 | } |
1116 | 1116 | //print_r($mfr); |
1117 | 1117 | return ''; |
1118 | - } |
|
1118 | + } |
|
1119 | 1119 | public static function modes_fam() { |
1120 | 1120 | global $tmp_dir, $globalTransaction; |
1121 | 1121 | $query = "DELETE FROM aircraft_modes WHERE Source = '' OR Source = :source"; |
1122 | 1122 | try { |
1123 | 1123 | $Connection = new Connection(); |
1124 | 1124 | $sth = $Connection->db->prepare($query); |
1125 | - $sth->execute(array(':source' => 'website_fam')); |
|
1126 | - } catch(PDOException $e) { |
|
1127 | - return "error : ".$e->getMessage(); |
|
1128 | - } |
|
1125 | + $sth->execute(array(':source' => 'website_fam')); |
|
1126 | + } catch(PDOException $e) { |
|
1127 | + return "error : ".$e->getMessage(); |
|
1128 | + } |
|
1129 | 1129 | |
1130 | 1130 | |
1131 | 1131 | //update_db::unzip($out_file); |
@@ -1155,7 +1155,7 @@ discard block |
||
1155 | 1155 | if ($globalTransaction) $Connection->db->commit(); |
1156 | 1156 | } |
1157 | 1157 | return ''; |
1158 | - } |
|
1158 | + } |
|
1159 | 1159 | |
1160 | 1160 | public static function owner_fam() { |
1161 | 1161 | global $tmp_dir, $globalTransaction; |
@@ -1163,10 +1163,10 @@ discard block |
||
1163 | 1163 | try { |
1164 | 1164 | $Connection = new Connection(); |
1165 | 1165 | $sth = $Connection->db->prepare($query); |
1166 | - $sth->execute(array(':source' => 'website_fam')); |
|
1167 | - } catch(PDOException $e) { |
|
1168 | - return "error : ".$e->getMessage(); |
|
1169 | - } |
|
1166 | + $sth->execute(array(':source' => 'website_fam')); |
|
1167 | + } catch(PDOException $e) { |
|
1168 | + return "error : ".$e->getMessage(); |
|
1169 | + } |
|
1170 | 1170 | |
1171 | 1171 | $delimiter = "\t"; |
1172 | 1172 | $Connection = new Connection(); |
@@ -1192,7 +1192,7 @@ discard block |
||
1192 | 1192 | if ($globalTransaction) $Connection->db->commit(); |
1193 | 1193 | } |
1194 | 1194 | return ''; |
1195 | - } |
|
1195 | + } |
|
1196 | 1196 | |
1197 | 1197 | public static function routes_fam() { |
1198 | 1198 | global $tmp_dir, $globalTransaction, $globalDebug; |
@@ -1227,7 +1227,7 @@ discard block |
||
1227 | 1227 | if ($globalTransaction) $Connection->db->commit(); |
1228 | 1228 | } |
1229 | 1229 | return ''; |
1230 | - } |
|
1230 | + } |
|
1231 | 1231 | |
1232 | 1232 | public static function marine_identity_fam() { |
1233 | 1233 | global $tmp_dir, $globalTransaction; |
@@ -1235,10 +1235,10 @@ discard block |
||
1235 | 1235 | try { |
1236 | 1236 | $Connection = new Connection(); |
1237 | 1237 | $sth = $Connection->db->prepare($query); |
1238 | - $sth->execute(); |
|
1239 | - } catch(PDOException $e) { |
|
1240 | - return "error : ".$e->getMessage(); |
|
1241 | - } |
|
1238 | + $sth->execute(); |
|
1239 | + } catch(PDOException $e) { |
|
1240 | + return "error : ".$e->getMessage(); |
|
1241 | + } |
|
1242 | 1242 | |
1243 | 1243 | |
1244 | 1244 | //update_db::unzip($out_file); |
@@ -1268,7 +1268,7 @@ discard block |
||
1268 | 1268 | if ($globalTransaction) $Connection->db->commit(); |
1269 | 1269 | } |
1270 | 1270 | return ''; |
1271 | - } |
|
1271 | + } |
|
1272 | 1272 | |
1273 | 1273 | public static function satellite_fam() { |
1274 | 1274 | global $tmp_dir, $globalTransaction; |
@@ -1339,7 +1339,7 @@ discard block |
||
1339 | 1339 | if ($globalTransaction) $Connection->db->commit(); |
1340 | 1340 | } |
1341 | 1341 | return ''; |
1342 | - } |
|
1342 | + } |
|
1343 | 1343 | |
1344 | 1344 | public static function tle($filename,$tletype) { |
1345 | 1345 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
@@ -1350,10 +1350,10 @@ discard block |
||
1350 | 1350 | try { |
1351 | 1351 | $Connection = new Connection(); |
1352 | 1352 | $sth = $Connection->db->prepare($query); |
1353 | - $sth->execute(array(':source' => $filename)); |
|
1354 | - } catch(PDOException $e) { |
|
1355 | - return "error : ".$e->getMessage(); |
|
1356 | - } |
|
1353 | + $sth->execute(array(':source' => $filename)); |
|
1354 | + } catch(PDOException $e) { |
|
1355 | + return "error : ".$e->getMessage(); |
|
1356 | + } |
|
1357 | 1357 | |
1358 | 1358 | $Connection = new Connection(); |
1359 | 1359 | if (($handle = fopen($filename, 'r')) !== FALSE) |
@@ -1388,7 +1388,7 @@ discard block |
||
1388 | 1388 | //$Connection->db->commit(); |
1389 | 1389 | } |
1390 | 1390 | return ''; |
1391 | - } |
|
1391 | + } |
|
1392 | 1392 | |
1393 | 1393 | public static function satellite_ucsdb($filename) { |
1394 | 1394 | global $tmp_dir, $globalTransaction; |
@@ -1637,11 +1637,11 @@ discard block |
||
1637 | 1637 | try { |
1638 | 1638 | $sth = $Connection->db->prepare($query); |
1639 | 1639 | $sth->execute(array( |
1640 | - ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
1641 | - ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
1642 | - ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
1643 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
1644 | - ) |
|
1640 | + ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
1641 | + ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
1642 | + ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
1643 | + ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
1644 | + ) |
|
1645 | 1645 | ); |
1646 | 1646 | } catch(PDOException $e) { |
1647 | 1647 | return "error : ".$e->getMessage(); |
@@ -1665,13 +1665,13 @@ discard block |
||
1665 | 1665 | //$Connection->db->commit(); |
1666 | 1666 | } |
1667 | 1667 | return ''; |
1668 | - } |
|
1668 | + } |
|
1669 | 1669 | |
1670 | 1670 | /** |
1671 | - * Convert a HTML table to an array |
|
1672 | - * @param String $data HTML page |
|
1673 | - * @return Array array of the tables in HTML page |
|
1674 | - */ |
|
1671 | + * Convert a HTML table to an array |
|
1672 | + * @param String $data HTML page |
|
1673 | + * @return Array array of the tables in HTML page |
|
1674 | + */ |
|
1675 | 1675 | /* |
1676 | 1676 | private static function table2array($data) { |
1677 | 1677 | $html = str_get_html($data); |
@@ -1701,11 +1701,11 @@ discard block |
||
1701 | 1701 | return(array_filter($tabledata)); |
1702 | 1702 | } |
1703 | 1703 | */ |
1704 | - /** |
|
1705 | - * Get data from form result |
|
1706 | - * @param String $url form URL |
|
1707 | - * @return String the result |
|
1708 | - */ |
|
1704 | + /** |
|
1705 | + * Get data from form result |
|
1706 | + * @param String $url form URL |
|
1707 | + * @return String the result |
|
1708 | + */ |
|
1709 | 1709 | /* |
1710 | 1710 | private static function getData($url) { |
1711 | 1711 | $ch = curl_init(); |
@@ -1798,7 +1798,7 @@ discard block |
||
1798 | 1798 | if ($globalTransaction) $Connection->db->commit(); |
1799 | 1799 | } |
1800 | 1800 | return ''; |
1801 | - } |
|
1801 | + } |
|
1802 | 1802 | |
1803 | 1803 | public static function ivao_airlines($filename) { |
1804 | 1804 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
@@ -1808,10 +1808,10 @@ discard block |
||
1808 | 1808 | try { |
1809 | 1809 | $Connection = new Connection(); |
1810 | 1810 | $sth = $Connection->db->prepare($query); |
1811 | - $sth->execute(); |
|
1812 | - } catch(PDOException $e) { |
|
1813 | - return "error : ".$e->getMessage(); |
|
1814 | - } |
|
1811 | + $sth->execute(); |
|
1812 | + } catch(PDOException $e) { |
|
1813 | + return "error : ".$e->getMessage(); |
|
1814 | + } |
|
1815 | 1815 | |
1816 | 1816 | $header = NULL; |
1817 | 1817 | $delimiter = ':'; |
@@ -1835,7 +1835,7 @@ discard block |
||
1835 | 1835 | if ($globalTransaction) $Connection->db->commit(); |
1836 | 1836 | } |
1837 | 1837 | return ''; |
1838 | - } |
|
1838 | + } |
|
1839 | 1839 | |
1840 | 1840 | public static function update_airspace() { |
1841 | 1841 | global $tmp_dir, $globalDBdriver; |
@@ -1845,11 +1845,11 @@ discard block |
||
1845 | 1845 | $query = 'DROP TABLE airspace'; |
1846 | 1846 | try { |
1847 | 1847 | $sth = $Connection->db->prepare($query); |
1848 | - $sth->execute(); |
|
1849 | - } catch(PDOException $e) { |
|
1848 | + $sth->execute(); |
|
1849 | + } catch(PDOException $e) { |
|
1850 | 1850 | return "error : ".$e->getMessage(); |
1851 | - } |
|
1852 | - } |
|
1851 | + } |
|
1852 | + } |
|
1853 | 1853 | |
1854 | 1854 | |
1855 | 1855 | if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
@@ -1904,10 +1904,10 @@ discard block |
||
1904 | 1904 | $query = 'DROP TABLE countries'; |
1905 | 1905 | try { |
1906 | 1906 | $sth = $Connection->db->prepare($query); |
1907 | - $sth->execute(); |
|
1908 | - } catch(PDOException $e) { |
|
1909 | - echo "error : ".$e->getMessage(); |
|
1910 | - } |
|
1907 | + $sth->execute(); |
|
1908 | + } catch(PDOException $e) { |
|
1909 | + echo "error : ".$e->getMessage(); |
|
1910 | + } |
|
1911 | 1911 | } |
1912 | 1912 | if ($globalDBdriver == 'mysql') { |
1913 | 1913 | update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
@@ -2462,11 +2462,11 @@ discard block |
||
2462 | 2462 | $query = 'DROP TABLE airspace'; |
2463 | 2463 | try { |
2464 | 2464 | $sth = $Connection->db->prepare($query); |
2465 | - $sth->execute(); |
|
2466 | - } catch(PDOException $e) { |
|
2465 | + $sth->execute(); |
|
2466 | + } catch(PDOException $e) { |
|
2467 | 2467 | return "error : ".$e->getMessage(); |
2468 | - } |
|
2469 | - } |
|
2468 | + } |
|
2469 | + } |
|
2470 | 2470 | $error = create_db::import_file($tmp_dir.'airspace.sql'); |
2471 | 2471 | update_db::insert_airspace_version($airspace_md5); |
2472 | 2472 | } else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
@@ -2676,12 +2676,12 @@ discard block |
||
2676 | 2676 | echo $data; |
2677 | 2677 | */ |
2678 | 2678 | if (file_exists($tmp_dir.'aircrafts.html')) { |
2679 | - //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
2680 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
2681 | - $result = fread($fh,100000000); |
|
2682 | - //echo $result; |
|
2683 | - //var_dump(str_get_html($result)); |
|
2684 | - //print_r(self::table2array($result)); |
|
2679 | + //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
2680 | + $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
2681 | + $result = fread($fh,100000000); |
|
2682 | + //echo $result; |
|
2683 | + //var_dump(str_get_html($result)); |
|
2684 | + //print_r(self::table2array($result)); |
|
2685 | 2685 | } |
2686 | 2686 | |
2687 | 2687 | } |
@@ -2695,10 +2695,10 @@ discard block |
||
2695 | 2695 | try { |
2696 | 2696 | $Connection = new Connection(); |
2697 | 2697 | $sth = $Connection->db->prepare($query); |
2698 | - $sth->execute(); |
|
2699 | - } catch(PDOException $e) { |
|
2700 | - return "error : ".$e->getMessage(); |
|
2701 | - } |
|
2698 | + $sth->execute(); |
|
2699 | + } catch(PDOException $e) { |
|
2700 | + return "error : ".$e->getMessage(); |
|
2701 | + } |
|
2702 | 2702 | |
2703 | 2703 | $error = ''; |
2704 | 2704 | if ($globalDebug) echo "Notam : Download..."; |
@@ -2754,8 +2754,8 @@ discard block |
||
2754 | 2754 | $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
2755 | 2755 | $data['permanent'] = 0; |
2756 | 2756 | } else { |
2757 | - $data['date_end'] = NULL; |
|
2758 | - $data['permanent'] = 1; |
|
2757 | + $data['date_end'] = NULL; |
|
2758 | + $data['permanent'] = 1; |
|
2759 | 2759 | } |
2760 | 2760 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
2761 | 2761 | $NOTAM = new NOTAM(); |
@@ -2829,13 +2829,13 @@ discard block |
||
2829 | 2829 | try { |
2830 | 2830 | $Connection = new Connection(); |
2831 | 2831 | $sth = $Connection->db->prepare($query); |
2832 | - $sth->execute(); |
|
2833 | - } catch(PDOException $e) { |
|
2834 | - return "error : ".$e->getMessage(); |
|
2835 | - } |
|
2836 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2837 | - if ($row['nb'] > 0) return false; |
|
2838 | - else return true; |
|
2832 | + $sth->execute(); |
|
2833 | + } catch(PDOException $e) { |
|
2834 | + return "error : ".$e->getMessage(); |
|
2835 | + } |
|
2836 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2837 | + if ($row['nb'] > 0) return false; |
|
2838 | + else return true; |
|
2839 | 2839 | } |
2840 | 2840 | |
2841 | 2841 | public static function insert_last_update() { |
@@ -2844,10 +2844,10 @@ discard block |
||
2844 | 2844 | try { |
2845 | 2845 | $Connection = new Connection(); |
2846 | 2846 | $sth = $Connection->db->prepare($query); |
2847 | - $sth->execute(); |
|
2848 | - } catch(PDOException $e) { |
|
2849 | - return "error : ".$e->getMessage(); |
|
2850 | - } |
|
2847 | + $sth->execute(); |
|
2848 | + } catch(PDOException $e) { |
|
2849 | + return "error : ".$e->getMessage(); |
|
2850 | + } |
|
2851 | 2851 | } |
2852 | 2852 | |
2853 | 2853 | public static function check_airspace_version($version) { |
@@ -2855,13 +2855,13 @@ discard block |
||
2855 | 2855 | try { |
2856 | 2856 | $Connection = new Connection(); |
2857 | 2857 | $sth = $Connection->db->prepare($query); |
2858 | - $sth->execute(array(':version' => $version)); |
|
2859 | - } catch(PDOException $e) { |
|
2860 | - return "error : ".$e->getMessage(); |
|
2861 | - } |
|
2862 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2863 | - if ($row['nb'] > 0) return true; |
|
2864 | - else return false; |
|
2858 | + $sth->execute(array(':version' => $version)); |
|
2859 | + } catch(PDOException $e) { |
|
2860 | + return "error : ".$e->getMessage(); |
|
2861 | + } |
|
2862 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2863 | + if ($row['nb'] > 0) return true; |
|
2864 | + else return false; |
|
2865 | 2865 | } |
2866 | 2866 | |
2867 | 2867 | public static function check_geoid_version($version) { |
@@ -2869,13 +2869,13 @@ discard block |
||
2869 | 2869 | try { |
2870 | 2870 | $Connection = new Connection(); |
2871 | 2871 | $sth = $Connection->db->prepare($query); |
2872 | - $sth->execute(array(':version' => $version)); |
|
2873 | - } catch(PDOException $e) { |
|
2874 | - return "error : ".$e->getMessage(); |
|
2875 | - } |
|
2876 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2877 | - if ($row['nb'] > 0) return true; |
|
2878 | - else return false; |
|
2872 | + $sth->execute(array(':version' => $version)); |
|
2873 | + } catch(PDOException $e) { |
|
2874 | + return "error : ".$e->getMessage(); |
|
2875 | + } |
|
2876 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2877 | + if ($row['nb'] > 0) return true; |
|
2878 | + else return false; |
|
2879 | 2879 | } |
2880 | 2880 | |
2881 | 2881 | public static function check_marine_identity_version($version) { |
@@ -2925,10 +2925,10 @@ discard block |
||
2925 | 2925 | try { |
2926 | 2926 | $Connection = new Connection(); |
2927 | 2927 | $sth = $Connection->db->prepare($query); |
2928 | - $sth->execute(array(':version' => $version)); |
|
2929 | - } catch(PDOException $e) { |
|
2930 | - return "error : ".$e->getMessage(); |
|
2931 | - } |
|
2928 | + $sth->execute(array(':version' => $version)); |
|
2929 | + } catch(PDOException $e) { |
|
2930 | + return "error : ".$e->getMessage(); |
|
2931 | + } |
|
2932 | 2932 | } |
2933 | 2933 | |
2934 | 2934 | public static function insert_marine_identity_version($version) { |
@@ -2965,13 +2965,13 @@ discard block |
||
2965 | 2965 | try { |
2966 | 2966 | $Connection = new Connection(); |
2967 | 2967 | $sth = $Connection->db->prepare($query); |
2968 | - $sth->execute(); |
|
2969 | - } catch(PDOException $e) { |
|
2970 | - return "error : ".$e->getMessage(); |
|
2971 | - } |
|
2972 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2973 | - if ($row['nb'] > 0) return false; |
|
2974 | - else return true; |
|
2968 | + $sth->execute(); |
|
2969 | + } catch(PDOException $e) { |
|
2970 | + return "error : ".$e->getMessage(); |
|
2971 | + } |
|
2972 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
2973 | + if ($row['nb'] > 0) return false; |
|
2974 | + else return true; |
|
2975 | 2975 | } |
2976 | 2976 | |
2977 | 2977 | public static function insert_last_notam_update() { |
@@ -2980,10 +2980,10 @@ discard block |
||
2980 | 2980 | try { |
2981 | 2981 | $Connection = new Connection(); |
2982 | 2982 | $sth = $Connection->db->prepare($query); |
2983 | - $sth->execute(); |
|
2984 | - } catch(PDOException $e) { |
|
2985 | - return "error : ".$e->getMessage(); |
|
2986 | - } |
|
2983 | + $sth->execute(); |
|
2984 | + } catch(PDOException $e) { |
|
2985 | + return "error : ".$e->getMessage(); |
|
2986 | + } |
|
2987 | 2987 | } |
2988 | 2988 | |
2989 | 2989 | public static function check_last_airspace_update() { |
@@ -2996,13 +2996,13 @@ discard block |
||
2996 | 2996 | try { |
2997 | 2997 | $Connection = new Connection(); |
2998 | 2998 | $sth = $Connection->db->prepare($query); |
2999 | - $sth->execute(); |
|
3000 | - } catch(PDOException $e) { |
|
3001 | - return "error : ".$e->getMessage(); |
|
3002 | - } |
|
3003 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3004 | - if ($row['nb'] > 0) return false; |
|
3005 | - else return true; |
|
2999 | + $sth->execute(); |
|
3000 | + } catch(PDOException $e) { |
|
3001 | + return "error : ".$e->getMessage(); |
|
3002 | + } |
|
3003 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3004 | + if ($row['nb'] > 0) return false; |
|
3005 | + else return true; |
|
3006 | 3006 | } |
3007 | 3007 | |
3008 | 3008 | public static function insert_last_airspace_update() { |
@@ -3011,10 +3011,10 @@ discard block |
||
3011 | 3011 | try { |
3012 | 3012 | $Connection = new Connection(); |
3013 | 3013 | $sth = $Connection->db->prepare($query); |
3014 | - $sth->execute(); |
|
3015 | - } catch(PDOException $e) { |
|
3016 | - return "error : ".$e->getMessage(); |
|
3017 | - } |
|
3014 | + $sth->execute(); |
|
3015 | + } catch(PDOException $e) { |
|
3016 | + return "error : ".$e->getMessage(); |
|
3017 | + } |
|
3018 | 3018 | } |
3019 | 3019 | |
3020 | 3020 | public static function check_last_geoid_update() { |
@@ -3027,13 +3027,13 @@ discard block |
||
3027 | 3027 | try { |
3028 | 3028 | $Connection = new Connection(); |
3029 | 3029 | $sth = $Connection->db->prepare($query); |
3030 | - $sth->execute(); |
|
3031 | - } catch(PDOException $e) { |
|
3032 | - return "error : ".$e->getMessage(); |
|
3033 | - } |
|
3034 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3035 | - if ($row['nb'] > 0) return false; |
|
3036 | - else return true; |
|
3030 | + $sth->execute(); |
|
3031 | + } catch(PDOException $e) { |
|
3032 | + return "error : ".$e->getMessage(); |
|
3033 | + } |
|
3034 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3035 | + if ($row['nb'] > 0) return false; |
|
3036 | + else return true; |
|
3037 | 3037 | } |
3038 | 3038 | |
3039 | 3039 | public static function insert_last_geoid_update() { |
@@ -3042,10 +3042,10 @@ discard block |
||
3042 | 3042 | try { |
3043 | 3043 | $Connection = new Connection(); |
3044 | 3044 | $sth = $Connection->db->prepare($query); |
3045 | - $sth->execute(); |
|
3046 | - } catch(PDOException $e) { |
|
3047 | - return "error : ".$e->getMessage(); |
|
3048 | - } |
|
3045 | + $sth->execute(); |
|
3046 | + } catch(PDOException $e) { |
|
3047 | + return "error : ".$e->getMessage(); |
|
3048 | + } |
|
3049 | 3049 | } |
3050 | 3050 | |
3051 | 3051 | public static function check_last_owner_update() { |
@@ -3058,13 +3058,13 @@ discard block |
||
3058 | 3058 | try { |
3059 | 3059 | $Connection = new Connection(); |
3060 | 3060 | $sth = $Connection->db->prepare($query); |
3061 | - $sth->execute(); |
|
3062 | - } catch(PDOException $e) { |
|
3063 | - return "error : ".$e->getMessage(); |
|
3064 | - } |
|
3065 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3066 | - if ($row['nb'] > 0) return false; |
|
3067 | - else return true; |
|
3061 | + $sth->execute(); |
|
3062 | + } catch(PDOException $e) { |
|
3063 | + return "error : ".$e->getMessage(); |
|
3064 | + } |
|
3065 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3066 | + if ($row['nb'] > 0) return false; |
|
3067 | + else return true; |
|
3068 | 3068 | } |
3069 | 3069 | |
3070 | 3070 | public static function insert_last_owner_update() { |
@@ -3073,10 +3073,10 @@ discard block |
||
3073 | 3073 | try { |
3074 | 3074 | $Connection = new Connection(); |
3075 | 3075 | $sth = $Connection->db->prepare($query); |
3076 | - $sth->execute(); |
|
3077 | - } catch(PDOException $e) { |
|
3078 | - return "error : ".$e->getMessage(); |
|
3079 | - } |
|
3076 | + $sth->execute(); |
|
3077 | + } catch(PDOException $e) { |
|
3078 | + return "error : ".$e->getMessage(); |
|
3079 | + } |
|
3080 | 3080 | } |
3081 | 3081 | public static function check_last_schedules_update() { |
3082 | 3082 | global $globalDBdriver; |
@@ -3088,13 +3088,13 @@ discard block |
||
3088 | 3088 | try { |
3089 | 3089 | $Connection = new Connection(); |
3090 | 3090 | $sth = $Connection->db->prepare($query); |
3091 | - $sth->execute(); |
|
3092 | - } catch(PDOException $e) { |
|
3093 | - return "error : ".$e->getMessage(); |
|
3094 | - } |
|
3095 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3096 | - if ($row['nb'] > 0) return false; |
|
3097 | - else return true; |
|
3091 | + $sth->execute(); |
|
3092 | + } catch(PDOException $e) { |
|
3093 | + return "error : ".$e->getMessage(); |
|
3094 | + } |
|
3095 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
3096 | + if ($row['nb'] > 0) return false; |
|
3097 | + else return true; |
|
3098 | 3098 | } |
3099 | 3099 | |
3100 | 3100 | public static function insert_last_schedules_update() { |
@@ -3274,10 +3274,10 @@ discard block |
||
3274 | 3274 | try { |
3275 | 3275 | $Connection = new Connection(); |
3276 | 3276 | $sth = $Connection->db->prepare($query); |
3277 | - $sth->execute(); |
|
3278 | - } catch(PDOException $e) { |
|
3279 | - return "error : ".$e->getMessage(); |
|
3280 | - } |
|
3277 | + $sth->execute(); |
|
3278 | + } catch(PDOException $e) { |
|
3279 | + return "error : ".$e->getMessage(); |
|
3280 | + } |
|
3281 | 3281 | } |
3282 | 3282 | public static function delete_duplicateowner() { |
3283 | 3283 | global $globalDBdriver; |
@@ -3289,10 +3289,10 @@ discard block |
||
3289 | 3289 | try { |
3290 | 3290 | $Connection = new Connection(); |
3291 | 3291 | $sth = $Connection->db->prepare($query); |
3292 | - $sth->execute(); |
|
3293 | - } catch(PDOException $e) { |
|
3294 | - return "error : ".$e->getMessage(); |
|
3295 | - } |
|
3292 | + $sth->execute(); |
|
3293 | + } catch(PDOException $e) { |
|
3294 | + return "error : ".$e->getMessage(); |
|
3295 | + } |
|
3296 | 3296 | } |
3297 | 3297 | |
3298 | 3298 | public static function update_all() { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $ch = curl_init(); |
17 | 17 | curl_setopt($ch, CURLOPT_URL, $url); |
18 | 18 | if (isset($globalForceIPv4) && $globalForceIPv4) { |
19 | - if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){ |
|
19 | + if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) { |
|
20 | 20 | curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); |
21 | 21 | } |
22 | 22 | } |
@@ -34,20 +34,20 @@ discard block |
||
34 | 34 | fclose($fp); |
35 | 35 | } |
36 | 36 | |
37 | - public static function gunzip($in_file,$out_file_name = '') { |
|
37 | + public static function gunzip($in_file, $out_file_name = '') { |
|
38 | 38 | //echo $in_file.' -> '.$out_file_name."\n"; |
39 | 39 | $buffer_size = 4096; // read 4kb at a time |
40 | 40 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
41 | 41 | if ($in_file != '' && file_exists($in_file)) { |
42 | 42 | // 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'); |
|
43 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
44 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
45 | 45 | else { |
46 | 46 | echo 'gzopen not available'; |
47 | 47 | die; |
48 | 48 | } |
49 | 49 | $out_file = fopen($out_file_name, 'wb'); |
50 | - while(!gzeof($file)) { |
|
50 | + while (!gzeof($file)) { |
|
51 | 51 | fwrite($out_file, gzread($file, $buffer_size)); |
52 | 52 | } |
53 | 53 | fclose($out_file); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | try { |
72 | 72 | self::$db_sqlite = new PDO('sqlite:'.$database); |
73 | 73 | self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
74 | - } catch(PDOException $e) { |
|
74 | + } catch (PDOException $e) { |
|
75 | 75 | return "error : ".$e->getMessage(); |
76 | 76 | } |
77 | 77 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | //$Connection = new Connection(); |
87 | 87 | $sth = $Connection->db->prepare($query); |
88 | 88 | $sth->execute(array(':source' => $database_file)); |
89 | - } catch(PDOException $e) { |
|
89 | + } catch (PDOException $e) { |
|
90 | 90 | return "error : ".$e->getMessage(); |
91 | 91 | } |
92 | 92 | |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | try { |
98 | 98 | $sth = update_db::$db_sqlite->prepare($query); |
99 | 99 | $sth->execute(); |
100 | - } catch(PDOException $e) { |
|
100 | + } catch (PDOException $e) { |
|
101 | 101 | return "error : ".$e->getMessage(); |
102 | 102 | } |
103 | 103 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
@@ -108,11 +108,11 @@ discard block |
||
108 | 108 | if ($globalTransaction) $Connection->db->beginTransaction(); |
109 | 109 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
110 | 110 | //$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 | - $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); |
|
111 | + $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 | 112 | $sth_dest->execute($query_dest_values); |
113 | 113 | } |
114 | 114 | if ($globalTransaction) $Connection->db->commit(); |
115 | - } catch(PDOException $e) { |
|
115 | + } catch (PDOException $e) { |
|
116 | 116 | if ($globalTransaction) $Connection->db->rollBack(); |
117 | 117 | return "error : ".$e->getMessage(); |
118 | 118 | } |
@@ -128,26 +128,26 @@ discard block |
||
128 | 128 | //$Connection = new Connection(); |
129 | 129 | $sth = $Connection->db->prepare($query); |
130 | 130 | $sth->execute(array(':source' => 'oneworld')); |
131 | - } catch(PDOException $e) { |
|
131 | + } catch (PDOException $e) { |
|
132 | 132 | return "error : ".$e->getMessage(); |
133 | 133 | } |
134 | 134 | |
135 | 135 | if ($globalDebug) echo " - Add routes to DB -"; |
136 | 136 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
137 | 137 | $Spotter = new Spotter(); |
138 | - if ($fh = fopen($database_file,"r")) { |
|
138 | + if ($fh = fopen($database_file, "r")) { |
|
139 | 139 | $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 | 140 | $Connection = new Connection(); |
141 | 141 | $sth_dest = $Connection->db->prepare($query_dest); |
142 | 142 | if ($globalTransaction) $Connection->db->beginTransaction(); |
143 | 143 | while (!feof($fh)) { |
144 | - $line = fgetcsv($fh,9999,','); |
|
144 | + $line = fgetcsv($fh, 9999, ','); |
|
145 | 145 | if ($line[0] != '') { |
146 | 146 | if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) { |
147 | 147 | try { |
148 | - $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'); |
|
148 | + $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 | 149 | $sth_dest->execute($query_dest_values); |
150 | - } catch(PDOException $e) { |
|
150 | + } catch (PDOException $e) { |
|
151 | 151 | if ($globalTransaction) $Connection->db->rollBack(); |
152 | 152 | return "error : ".$e->getMessage(); |
153 | 153 | } |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | //$Connection = new Connection(); |
170 | 170 | $sth = $Connection->db->prepare($query); |
171 | 171 | $sth->execute(array(':source' => 'skyteam')); |
172 | - } catch(PDOException $e) { |
|
172 | + } catch (PDOException $e) { |
|
173 | 173 | return "error : ".$e->getMessage(); |
174 | 174 | } |
175 | 175 | |
@@ -177,24 +177,24 @@ discard block |
||
177 | 177 | |
178 | 178 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
179 | 179 | $Spotter = new Spotter(); |
180 | - if ($fh = fopen($database_file,"r")) { |
|
180 | + if ($fh = fopen($database_file, "r")) { |
|
181 | 181 | $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)'; |
182 | 182 | $Connection = new Connection(); |
183 | 183 | $sth_dest = $Connection->db->prepare($query_dest); |
184 | 184 | try { |
185 | 185 | if ($globalTransaction) $Connection->db->beginTransaction(); |
186 | 186 | while (!feof($fh)) { |
187 | - $line = fgetcsv($fh,9999,','); |
|
187 | + $line = fgetcsv($fh, 9999, ','); |
|
188 | 188 | if ($line[0] != '') { |
189 | - $datebe = explode(' - ',$line[2]); |
|
189 | + $datebe = explode(' - ', $line[2]); |
|
190 | 190 | if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) { |
191 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam'); |
|
191 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam'); |
|
192 | 192 | $sth_dest->execute($query_dest_values); |
193 | 193 | } |
194 | 194 | } |
195 | 195 | } |
196 | 196 | if ($globalTransaction) $Connection->db->commit(); |
197 | - } catch(PDOException $e) { |
|
197 | + } catch (PDOException $e) { |
|
198 | 198 | if ($globalTransaction) $Connection->db->rollBack(); |
199 | 199 | return "error : ".$e->getMessage(); |
200 | 200 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $Connection = new Connection(); |
210 | 210 | $sth = $Connection->db->prepare($query); |
211 | 211 | $sth->execute(array(':source' => $database_file)); |
212 | - } catch(PDOException $e) { |
|
212 | + } catch (PDOException $e) { |
|
213 | 213 | return "error : ".$e->getMessage(); |
214 | 214 | } |
215 | 215 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $Connection = new Connection(); |
218 | 218 | $sth = $Connection->db->prepare($query); |
219 | 219 | $sth->execute(array(':source' => $database_file)); |
220 | - } catch(PDOException $e) { |
|
220 | + } catch (PDOException $e) { |
|
221 | 221 | return "error : ".$e->getMessage(); |
222 | 222 | } |
223 | 223 | |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | try { |
227 | 227 | $sth = update_db::$db_sqlite->prepare($query); |
228 | 228 | $sth->execute(); |
229 | - } catch(PDOException $e) { |
|
229 | + } catch (PDOException $e) { |
|
230 | 230 | return "error : ".$e->getMessage(); |
231 | 231 | } |
232 | 232 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -243,15 +243,15 @@ discard block |
||
243 | 243 | //$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 | 244 | if ($values['UserString4'] == 'M') $type = 'military'; |
245 | 245 | else $type = null; |
246 | - $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
|
246 | + $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 | 247 | $sth_dest->execute($query_dest_values); |
248 | 248 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
249 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
249 | + $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']); |
|
250 | 250 | $sth_dest_owner->execute($query_dest_owner_values); |
251 | 251 | } |
252 | 252 | } |
253 | 253 | if ($globalTransaction) $Connection->db->commit(); |
254 | - } catch(PDOException $e) { |
|
254 | + } catch (PDOException $e) { |
|
255 | 255 | return "error : ".$e->getMessage(); |
256 | 256 | } |
257 | 257 | |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | $Connection = new Connection(); |
262 | 262 | $sth = $Connection->db->prepare($query); |
263 | 263 | $sth->execute(array(':source' => $database_file)); |
264 | - } catch(PDOException $e) { |
|
264 | + } catch (PDOException $e) { |
|
265 | 265 | return "error : ".$e->getMessage(); |
266 | 266 | } |
267 | 267 | return ''; |
@@ -276,11 +276,11 @@ discard block |
||
276 | 276 | $Connection = new Connection(); |
277 | 277 | $sth = $Connection->db->prepare($query); |
278 | 278 | $sth->execute(array(':source' => $database_file)); |
279 | - } catch(PDOException $e) { |
|
279 | + } catch (PDOException $e) { |
|
280 | 280 | return "error : ".$e->getMessage(); |
281 | 281 | } |
282 | 282 | |
283 | - if ($fh = fopen($database_file,"r")) { |
|
283 | + if ($fh = fopen($database_file, "r")) { |
|
284 | 284 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
285 | 285 | $query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
286 | 286 | |
@@ -290,13 +290,13 @@ discard block |
||
290 | 290 | if ($globalTransaction) $Connection->db->beginTransaction(); |
291 | 291 | while (!feof($fh)) { |
292 | 292 | $values = array(); |
293 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
293 | + $line = $Common->hex2str(fgets($fh, 9999)); |
|
294 | 294 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
295 | - $values['ModeS'] = substr($line,0,6); |
|
296 | - $values['Registration'] = trim(substr($line,69,6)); |
|
297 | - $aircraft_name = trim(substr($line,48,6)); |
|
295 | + $values['ModeS'] = substr($line, 0, 6); |
|
296 | + $values['Registration'] = trim(substr($line, 69, 6)); |
|
297 | + $aircraft_name = trim(substr($line, 48, 6)); |
|
298 | 298 | // Check if we can find ICAO, else set it to GLID |
299 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
299 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
300 | 300 | $search_more = ''; |
301 | 301 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
302 | 302 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -308,20 +308,20 @@ discard block |
||
308 | 308 | if (isset($result['icao']) && $result['icao'] != '') { |
309 | 309 | $values['ICAOTypeCode'] = $result['icao']; |
310 | 310 | } |
311 | - } catch(PDOException $e) { |
|
311 | + } catch (PDOException $e) { |
|
312 | 312 | return "error : ".$e->getMessage(); |
313 | 313 | } |
314 | 314 | if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
315 | 315 | // Add data to db |
316 | 316 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
317 | 317 | //$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']); |
318 | - $query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
318 | + $query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
319 | 319 | //print_r($query_dest_values); |
320 | 320 | $sth_dest->execute($query_dest_values); |
321 | 321 | } |
322 | 322 | } |
323 | 323 | if ($globalTransaction) $Connection->db->commit(); |
324 | - } catch(PDOException $e) { |
|
324 | + } catch (PDOException $e) { |
|
325 | 325 | return "error : ".$e->getMessage(); |
326 | 326 | } |
327 | 327 | } |
@@ -331,7 +331,7 @@ discard block |
||
331 | 331 | $Connection = new Connection(); |
332 | 332 | $sth = $Connection->db->prepare($query); |
333 | 333 | $sth->execute(array(':source' => $database_file)); |
334 | - } catch(PDOException $e) { |
|
334 | + } catch (PDOException $e) { |
|
335 | 335 | return "error : ".$e->getMessage(); |
336 | 336 | } |
337 | 337 | return ''; |
@@ -345,11 +345,11 @@ discard block |
||
345 | 345 | $Connection = new Connection(); |
346 | 346 | $sth = $Connection->db->prepare($query); |
347 | 347 | $sth->execute(array(':source' => $database_file)); |
348 | - } catch(PDOException $e) { |
|
348 | + } catch (PDOException $e) { |
|
349 | 349 | return "error : ".$e->getMessage(); |
350 | 350 | } |
351 | 351 | |
352 | - if ($fh = fopen($database_file,"r")) { |
|
352 | + if ($fh = fopen($database_file, "r")) { |
|
353 | 353 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
354 | 354 | $query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
355 | 355 | |
@@ -357,9 +357,9 @@ discard block |
||
357 | 357 | $sth_dest = $Connection->db->prepare($query_dest); |
358 | 358 | try { |
359 | 359 | if ($globalTransaction) $Connection->db->beginTransaction(); |
360 | - $tmp = fgetcsv($fh,9999,',',"'"); |
|
360 | + $tmp = fgetcsv($fh, 9999, ',', "'"); |
|
361 | 361 | while (!feof($fh)) { |
362 | - $line = fgetcsv($fh,9999,',',"'"); |
|
362 | + $line = fgetcsv($fh, 9999, ',', "'"); |
|
363 | 363 | |
364 | 364 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
365 | 365 | //print_r($line); |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | $values['ICAOTypeCode'] = ''; |
369 | 369 | $aircraft_name = $line[2]; |
370 | 370 | // Check if we can find ICAO, else set it to GLID |
371 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
371 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
372 | 372 | $search_more = ''; |
373 | 373 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
374 | 374 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -377,20 +377,20 @@ discard block |
||
377 | 377 | $sth_search->execute(); |
378 | 378 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
379 | 379 | if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
380 | - } catch(PDOException $e) { |
|
380 | + } catch (PDOException $e) { |
|
381 | 381 | return "error : ".$e->getMessage(); |
382 | 382 | } |
383 | 383 | //if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
384 | 384 | // Add data to db |
385 | 385 | if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') { |
386 | 386 | //$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']); |
387 | - $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
387 | + $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
388 | 388 | //print_r($query_dest_values); |
389 | 389 | $sth_dest->execute($query_dest_values); |
390 | 390 | } |
391 | 391 | } |
392 | 392 | if ($globalTransaction) $Connection->db->commit(); |
393 | - } catch(PDOException $e) { |
|
393 | + } catch (PDOException $e) { |
|
394 | 394 | return "error : ".$e->getMessage(); |
395 | 395 | } |
396 | 396 | } |
@@ -400,13 +400,13 @@ discard block |
||
400 | 400 | $Connection = new Connection(); |
401 | 401 | $sth = $Connection->db->prepare($query); |
402 | 402 | $sth->execute(array(':source' => $database_file)); |
403 | - } catch(PDOException $e) { |
|
403 | + } catch (PDOException $e) { |
|
404 | 404 | return "error : ".$e->getMessage(); |
405 | 405 | } |
406 | 406 | return ''; |
407 | 407 | } |
408 | 408 | |
409 | - public static function retrieve_owner($database_file,$country = 'F') { |
|
409 | + public static function retrieve_owner($database_file, $country = 'F') { |
|
410 | 410 | global $globalTransaction, $globalMasterSource; |
411 | 411 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
412 | 412 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;"; |
@@ -414,12 +414,12 @@ discard block |
||
414 | 414 | $Connection = new Connection(); |
415 | 415 | $sth = $Connection->db->prepare($query); |
416 | 416 | $sth->execute(array(':source' => $database_file)); |
417 | - } catch(PDOException $e) { |
|
417 | + } catch (PDOException $e) { |
|
418 | 418 | return "error : ".$e->getMessage(); |
419 | 419 | } |
420 | 420 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
421 | 421 | $Spotter = new Spotter(); |
422 | - if ($fh = fopen($database_file,"r")) { |
|
422 | + if ($fh = fopen($database_file, "r")) { |
|
423 | 423 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
424 | 424 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
425 | 425 | $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
@@ -429,9 +429,9 @@ discard block |
||
429 | 429 | $sth_modes = $Connection->db->prepare($query_modes); |
430 | 430 | try { |
431 | 431 | if ($globalTransaction) $Connection->db->beginTransaction(); |
432 | - $tmp = fgetcsv($fh,9999,',','"'); |
|
432 | + $tmp = fgetcsv($fh, 9999, ',', '"'); |
|
433 | 433 | while (!feof($fh)) { |
434 | - $line = fgetcsv($fh,9999,',','"'); |
|
434 | + $line = fgetcsv($fh, 9999, ',', '"'); |
|
435 | 435 | $values = array(); |
436 | 436 | //print_r($line); |
437 | 437 | if ($country == 'F') { |
@@ -439,7 +439,7 @@ discard block |
||
439 | 439 | $values['base'] = $line[4]; |
440 | 440 | $values['owner'] = $line[5]; |
441 | 441 | if ($line[6] == '') $values['date_first_reg'] = null; |
442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
442 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
443 | 443 | $values['cancel'] = $line[7]; |
444 | 444 | } elseif ($country == 'EI') { |
445 | 445 | // TODO : add modeS & reg to aircraft_modes |
@@ -447,7 +447,7 @@ discard block |
||
447 | 447 | $values['base'] = $line[3]; |
448 | 448 | $values['owner'] = $line[2]; |
449 | 449 | if ($line[1] == '') $values['date_first_reg'] = null; |
450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
450 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1])); |
|
451 | 451 | $values['cancel'] = ''; |
452 | 452 | $values['modes'] = $line[7]; |
453 | 453 | $values['icao'] = $line[8]; |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | $values['base'] = null; |
468 | 468 | $values['owner'] = $line[5]; |
469 | 469 | if ($line[18] == '') $values['date_first_reg'] = null; |
470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
470 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18])); |
|
471 | 471 | $values['cancel'] = ''; |
472 | 472 | } elseif ($country == 'VH') { |
473 | 473 | // TODO : add modeS & reg to aircraft_modes |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | $values['base'] = null; |
476 | 476 | $values['owner'] = $line[12]; |
477 | 477 | if ($line[28] == '') $values['date_first_reg'] = null; |
478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
478 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28])); |
|
479 | 479 | |
480 | 480 | $values['cancel'] = $line[39]; |
481 | 481 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -495,28 +495,28 @@ discard block |
||
495 | 495 | $values['base'] = null; |
496 | 496 | $values['owner'] = $line[8]; |
497 | 497 | if ($line[7] == '') $values['date_first_reg'] = null; |
498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
498 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
499 | 499 | $values['cancel'] = ''; |
500 | 500 | } elseif ($country == 'PP') { |
501 | 501 | $values['registration'] = $line[0]; |
502 | 502 | $values['base'] = null; |
503 | 503 | $values['owner'] = $line[4]; |
504 | 504 | if ($line[6] == '') $values['date_first_reg'] = null; |
505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
505 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
506 | 506 | $values['cancel'] = $line[7]; |
507 | 507 | } elseif ($country == 'E7') { |
508 | 508 | $values['registration'] = $line[0]; |
509 | 509 | $values['base'] = null; |
510 | 510 | $values['owner'] = $line[4]; |
511 | 511 | if ($line[5] == '') $values['date_first_reg'] = null; |
512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
512 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
513 | 513 | $values['cancel'] = ''; |
514 | 514 | } elseif ($country == '8Q') { |
515 | 515 | $values['registration'] = $line[0]; |
516 | 516 | $values['base'] = null; |
517 | 517 | $values['owner'] = $line[3]; |
518 | 518 | if ($line[7] == '') $values['date_first_reg'] = null; |
519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
519 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
520 | 520 | $values['cancel'] = ''; |
521 | 521 | } elseif ($country == 'ZK') { |
522 | 522 | $values['registration'] = $line[0]; |
@@ -530,18 +530,18 @@ discard block |
||
530 | 530 | $values['registration'] = $line[0]; |
531 | 531 | $values['base'] = null; |
532 | 532 | $values['owner'] = $line[6]; |
533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
534 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
533 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
534 | + $values['cancel'] = date("Y-m-d", strtotime($line[8])); |
|
535 | 535 | $values['modes'] = $line[4]; |
536 | 536 | $values['icao'] = $line[10]; |
537 | 537 | } elseif ($country == 'OY') { |
538 | 538 | $values['registration'] = $line[0]; |
539 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
539 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[4])); |
|
540 | 540 | $values['modes'] = $line[5]; |
541 | 541 | $values['icao'] = $line[6]; |
542 | 542 | } elseif ($country == 'PH') { |
543 | 543 | $values['registration'] = $line[0]; |
544 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
544 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[3])); |
|
545 | 545 | $values['modes'] = $line[4]; |
546 | 546 | $values['icao'] = $line[5]; |
547 | 547 | } elseif ($country == 'OM' || $country == 'TF') { |
@@ -552,17 +552,17 @@ discard block |
||
552 | 552 | $values['cancel'] = ''; |
553 | 553 | } |
554 | 554 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
555 | - $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
|
555 | + $query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file); |
|
556 | 556 | $sth_dest->execute($query_dest_values); |
557 | 557 | } |
558 | 558 | if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') { |
559 | 559 | $modescountry = $Spotter->countryFromAircraftRegistration($values['registration']); |
560 | - $query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file); |
|
560 | + $query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file); |
|
561 | 561 | $sth_modes->execute($query_modes_values); |
562 | 562 | } |
563 | 563 | } |
564 | 564 | if ($globalTransaction) $Connection->db->commit(); |
565 | - } catch(PDOException $e) { |
|
565 | + } catch (PDOException $e) { |
|
566 | 566 | return "error : ".$e->getMessage(); |
567 | 567 | } |
568 | 568 | } |
@@ -700,7 +700,7 @@ discard block |
||
700 | 700 | if ($globalTransaction) $Connection->db->beginTransaction(); |
701 | 701 | |
702 | 702 | $i = 0; |
703 | - while($row = sparql_fetch_array($result)) |
|
703 | + while ($row = sparql_fetch_array($result)) |
|
704 | 704 | { |
705 | 705 | if ($i >= 1) { |
706 | 706 | //print_r($row); |
@@ -720,33 +720,33 @@ discard block |
||
720 | 720 | $row['image'] = ''; |
721 | 721 | $row['image_thumb'] = ''; |
722 | 722 | } else { |
723 | - $image = str_replace(' ','_',$row['image']); |
|
723 | + $image = str_replace(' ', '_', $row['image']); |
|
724 | 724 | $digest = md5($image); |
725 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image; |
|
726 | - $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder; |
|
727 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image; |
|
728 | - $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder; |
|
725 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image; |
|
726 | + $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder; |
|
727 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image; |
|
728 | + $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder; |
|
729 | 729 | } |
730 | 730 | |
731 | - $country = explode('-',$row['country']); |
|
731 | + $country = explode('-', $row['country']); |
|
732 | 732 | $row['country'] = $country[0]; |
733 | 733 | |
734 | 734 | $row['type'] = trim($row['type']); |
735 | - if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) { |
|
735 | + if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) { |
|
736 | 736 | $row['type'] = 'military'; |
737 | 737 | } elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') { |
738 | 738 | $row['type'] = 'small_airport'; |
739 | 739 | } |
740 | 740 | |
741 | - $row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city']))); |
|
742 | - $query_dest_values = array(':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => round($row['altitude']),':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']); |
|
741 | + $row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city']))); |
|
742 | + $query_dest_values = array(':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => round($row['altitude']), ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']); |
|
743 | 743 | //print_r($query_dest_values); |
744 | 744 | |
745 | 745 | if ($row['icao'] != '') { |
746 | 746 | try { |
747 | 747 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
748 | 748 | $sth->execute(array(':icao' => $row['icao'])); |
749 | - } catch(PDOException $e) { |
|
749 | + } catch (PDOException $e) { |
|
750 | 750 | return "error : ".$e->getMessage(); |
751 | 751 | } |
752 | 752 | if ($sth->fetchColumn() > 0) { |
@@ -754,15 +754,15 @@ discard block |
||
754 | 754 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
755 | 755 | try { |
756 | 756 | $sth = $Connection->db->prepare($query); |
757 | - $sth->execute(array(':icao' => $row['icao'],':type' => $row['type'])); |
|
758 | - } catch(PDOException $e) { |
|
757 | + $sth->execute(array(':icao' => $row['icao'], ':type' => $row['type'])); |
|
758 | + } catch (PDOException $e) { |
|
759 | 759 | return "error : ".$e->getMessage(); |
760 | 760 | } |
761 | 761 | echo $row['icao'].' : '.$row['type']."\n"; |
762 | 762 | } else { |
763 | 763 | try { |
764 | 764 | $sth_dest->execute($query_dest_values); |
765 | - } catch(PDOException $e) { |
|
765 | + } catch (PDOException $e) { |
|
766 | 766 | return "error : ".$e->getMessage(); |
767 | 767 | } |
768 | 768 | } |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | echo "Download data from ourairports.com...\n"; |
814 | 814 | $delimiter = ','; |
815 | 815 | $out_file = $tmp_dir.'airports.csv'; |
816 | - update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
|
816 | + update_db::download('http://ourairports.com/data/airports.csv', $out_file); |
|
817 | 817 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
818 | 818 | echo "Add data from ourairports.com...\n"; |
819 | 819 | |
@@ -824,33 +824,33 @@ discard block |
||
824 | 824 | //$Connection->db->beginTransaction(); |
825 | 825 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
826 | 826 | { |
827 | - if(!$header) $header = $row; |
|
827 | + if (!$header) $header = $row; |
|
828 | 828 | else { |
829 | 829 | $data = array(); |
830 | 830 | $data = array_combine($header, $row); |
831 | 831 | try { |
832 | 832 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE icao = :icao'); |
833 | 833 | $sth->execute(array(':icao' => $data['ident'])); |
834 | - } catch(PDOException $e) { |
|
834 | + } catch (PDOException $e) { |
|
835 | 835 | return "error : ".$e->getMessage(); |
836 | 836 | } |
837 | 837 | if ($sth->fetchColumn() > 0) { |
838 | 838 | $query = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
839 | 839 | try { |
840 | 840 | $sth = $Connection->db->prepare($query); |
841 | - $sth->execute(array(':icao' => $data['ident'],':type' => $data['type'])); |
|
842 | - } catch(PDOException $e) { |
|
841 | + $sth->execute(array(':icao' => $data['ident'], ':type' => $data['type'])); |
|
842 | + } catch (PDOException $e) { |
|
843 | 843 | return "error : ".$e->getMessage(); |
844 | 844 | } |
845 | 845 | } else { |
846 | 846 | if ($data['gps_code'] == $data['ident']) { |
847 | 847 | $query = "INSERT INTO airport (name,city,country,iata,icao,latitude,longitude,altitude,type,home_link,wikipedia_link) |
848 | 848 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)"; |
849 | - $query_values = array(':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => round($data['elevation_ft']),':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']); |
|
849 | + $query_values = array(':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => round($data['elevation_ft']), ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']); |
|
850 | 850 | try { |
851 | 851 | $sth = $Connection->db->prepare($query); |
852 | 852 | $sth->execute($query_values); |
853 | - } catch(PDOException $e) { |
|
853 | + } catch (PDOException $e) { |
|
854 | 854 | return "error : ".$e->getMessage(); |
855 | 855 | } |
856 | 856 | $i++; |
@@ -865,7 +865,7 @@ discard block |
||
865 | 865 | |
866 | 866 | echo "Download data from another free database...\n"; |
867 | 867 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
868 | - update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
|
868 | + update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file); |
|
869 | 869 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
870 | 870 | update_db::unzip($out_file); |
871 | 871 | $header = NULL; |
@@ -877,15 +877,15 @@ discard block |
||
877 | 877 | //$Connection->db->beginTransaction(); |
878 | 878 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
879 | 879 | { |
880 | - if(!$header) $header = $row; |
|
880 | + if (!$header) $header = $row; |
|
881 | 881 | else { |
882 | 882 | $data = $row; |
883 | 883 | |
884 | 884 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
885 | 885 | try { |
886 | 886 | $sth = $Connection->db->prepare($query); |
887 | - $sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4])))); |
|
888 | - } catch(PDOException $e) { |
|
887 | + $sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4])))); |
|
888 | + } catch (PDOException $e) { |
|
889 | 889 | return "error : ".$e->getMessage(); |
890 | 890 | } |
891 | 891 | } |
@@ -899,15 +899,15 @@ discard block |
||
899 | 899 | try { |
900 | 900 | $sth = $Connection->db->prepare("SELECT icao FROM airport WHERE name LIKE '%Air Base%'"); |
901 | 901 | $sth->execute(); |
902 | - } catch(PDOException $e) { |
|
902 | + } catch (PDOException $e) { |
|
903 | 903 | return "error : ".$e->getMessage(); |
904 | 904 | } |
905 | 905 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
906 | 906 | $query2 = 'UPDATE airport SET type = :type WHERE icao = :icao'; |
907 | 907 | try { |
908 | 908 | $sth2 = $Connection->db->prepare($query2); |
909 | - $sth2->execute(array(':icao' => $row['icao'],':type' => 'military')); |
|
910 | - } catch(PDOException $e) { |
|
909 | + $sth2->execute(array(':icao' => $row['icao'], ':type' => 'military')); |
|
910 | + } catch (PDOException $e) { |
|
911 | 911 | return "error : ".$e->getMessage(); |
912 | 912 | } |
913 | 913 | } |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | $Connection = new Connection(); |
929 | 929 | $sth = $Connection->db->prepare($query); |
930 | 930 | $sth->execute(array(':source' => 'translation.csv')); |
931 | - } catch(PDOException $e) { |
|
931 | + } catch (PDOException $e) { |
|
932 | 932 | return "error : ".$e->getMessage(); |
933 | 933 | } |
934 | 934 | |
@@ -945,7 +945,7 @@ discard block |
||
945 | 945 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
946 | 946 | { |
947 | 947 | $i++; |
948 | - if($i > 12) { |
|
948 | + if ($i > 12) { |
|
949 | 949 | $data = $row; |
950 | 950 | $operator = $data[2]; |
951 | 951 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
@@ -953,7 +953,7 @@ discard block |
||
953 | 953 | //echo substr($operator, 0, 2)."\n";; |
954 | 954 | if (count($airline_array) > 0) { |
955 | 955 | //print_r($airline_array); |
956 | - $operator = $airline_array[0]['icao'].substr($operator,2); |
|
956 | + $operator = $airline_array[0]['icao'].substr($operator, 2); |
|
957 | 957 | } |
958 | 958 | } |
959 | 959 | |
@@ -961,14 +961,14 @@ discard block |
||
961 | 961 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
962 | 962 | $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
963 | 963 | if (count($airline_array) > 0) { |
964 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
964 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2); |
|
965 | 965 | } |
966 | 966 | } |
967 | 967 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
968 | 968 | try { |
969 | 969 | $sth = $Connection->db->prepare($query); |
970 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
971 | - } catch(PDOException $e) { |
|
970 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
971 | + } catch (PDOException $e) { |
|
972 | 972 | return "error : ".$e->getMessage(); |
973 | 973 | } |
974 | 974 | } |
@@ -986,7 +986,7 @@ discard block |
||
986 | 986 | $Connection = new Connection(); |
987 | 987 | $sth = $Connection->db->prepare($query); |
988 | 988 | $sth->execute(array(':source' => 'website_fam')); |
989 | - } catch(PDOException $e) { |
|
989 | + } catch (PDOException $e) { |
|
990 | 990 | return "error : ".$e->getMessage(); |
991 | 991 | } |
992 | 992 | //update_db::unzip($out_file); |
@@ -1004,8 +1004,8 @@ discard block |
||
1004 | 1004 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
1005 | 1005 | try { |
1006 | 1006 | $sth = $Connection->db->prepare($query); |
1007 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
1008 | - } catch(PDOException $e) { |
|
1007 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
1008 | + } catch (PDOException $e) { |
|
1009 | 1009 | return "error : ".$e->getMessage(); |
1010 | 1010 | } |
1011 | 1011 | } |
@@ -1028,7 +1028,7 @@ discard block |
||
1028 | 1028 | $Connection = new Connection(); |
1029 | 1029 | $sth = $Connection->db->prepare($query); |
1030 | 1030 | $sth->execute(array(':source' => 'website_faa')); |
1031 | - } catch(PDOException $e) { |
|
1031 | + } catch (PDOException $e) { |
|
1032 | 1032 | return "error : ".$e->getMessage(); |
1033 | 1033 | } |
1034 | 1034 | |
@@ -1037,7 +1037,7 @@ discard block |
||
1037 | 1037 | $Connection = new Connection(); |
1038 | 1038 | $sth = $Connection->db->prepare($query); |
1039 | 1039 | $sth->execute(array(':source' => 'website_faa')); |
1040 | - } catch(PDOException $e) { |
|
1040 | + } catch (PDOException $e) { |
|
1041 | 1041 | return "error : ".$e->getMessage(); |
1042 | 1042 | } |
1043 | 1043 | |
@@ -1054,8 +1054,8 @@ discard block |
||
1054 | 1054 | $query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1'; |
1055 | 1055 | try { |
1056 | 1056 | $sths = $Connection->db->prepare($query_search); |
1057 | - $sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa')); |
|
1058 | - } catch(PDOException $e) { |
|
1057 | + $sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa')); |
|
1058 | + } catch (PDOException $e) { |
|
1059 | 1059 | return "error s : ".$e->getMessage(); |
1060 | 1060 | } |
1061 | 1061 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
@@ -1068,8 +1068,8 @@ discard block |
||
1068 | 1068 | //} |
1069 | 1069 | try { |
1070 | 1070 | $sthi = $Connection->db->prepare($queryi); |
1071 | - $sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode'])); |
|
1072 | - } catch(PDOException $e) { |
|
1071 | + $sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode'])); |
|
1072 | + } catch (PDOException $e) { |
|
1073 | 1073 | return "error u : ".$e->getMessage(); |
1074 | 1074 | } |
1075 | 1075 | } else { |
@@ -1077,7 +1077,7 @@ discard block |
||
1077 | 1077 | try { |
1078 | 1078 | $sthsm = $Connection->db->prepare($query_search_mfr); |
1079 | 1079 | $sthsm->execute(array(':mfr' => $data[2])); |
1080 | - } catch(PDOException $e) { |
|
1080 | + } catch (PDOException $e) { |
|
1081 | 1081 | return "error mfr : ".$e->getMessage(); |
1082 | 1082 | } |
1083 | 1083 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
@@ -1087,8 +1087,8 @@ discard block |
||
1087 | 1087 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
1088 | 1088 | try { |
1089 | 1089 | $sthf = $Connection->db->prepare($queryf); |
1090 | - $sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa')); |
|
1091 | - } catch(PDOException $e) { |
|
1090 | + $sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa')); |
|
1091 | + } catch (PDOException $e) { |
|
1092 | 1092 | return "error f : ".$e->getMessage(); |
1093 | 1093 | } |
1094 | 1094 | } |
@@ -1098,13 +1098,13 @@ discard block |
||
1098 | 1098 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
1099 | 1099 | try { |
1100 | 1100 | $sth = $Connection->db->prepare($query); |
1101 | - $sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa')); |
|
1102 | - } catch(PDOException $e) { |
|
1101 | + $sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa')); |
|
1102 | + } catch (PDOException $e) { |
|
1103 | 1103 | return "error i : ".$e->getMessage(); |
1104 | 1104 | } |
1105 | 1105 | } |
1106 | 1106 | } |
1107 | - if ($i % 90 == 0) { |
|
1107 | + if ($i%90 == 0) { |
|
1108 | 1108 | if ($globalTransaction) $Connection->db->commit(); |
1109 | 1109 | if ($globalTransaction) $Connection->db->beginTransaction(); |
1110 | 1110 | } |
@@ -1123,7 +1123,7 @@ discard block |
||
1123 | 1123 | $Connection = new Connection(); |
1124 | 1124 | $sth = $Connection->db->prepare($query); |
1125 | 1125 | $sth->execute(array(':source' => 'website_fam')); |
1126 | - } catch(PDOException $e) { |
|
1126 | + } catch (PDOException $e) { |
|
1127 | 1127 | return "error : ".$e->getMessage(); |
1128 | 1128 | } |
1129 | 1129 | |
@@ -1144,8 +1144,8 @@ discard block |
||
1144 | 1144 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
1145 | 1145 | try { |
1146 | 1146 | $sth = $Connection->db->prepare($query); |
1147 | - $sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam')); |
|
1148 | - } catch(PDOException $e) { |
|
1147 | + $sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam')); |
|
1148 | + } catch (PDOException $e) { |
|
1149 | 1149 | return "error : ".$e->getMessage(); |
1150 | 1150 | } |
1151 | 1151 | } |
@@ -1164,7 +1164,7 @@ discard block |
||
1164 | 1164 | $Connection = new Connection(); |
1165 | 1165 | $sth = $Connection->db->prepare($query); |
1166 | 1166 | $sth->execute(array(':source' => 'website_fam')); |
1167 | - } catch(PDOException $e) { |
|
1167 | + } catch (PDOException $e) { |
|
1168 | 1168 | return "error : ".$e->getMessage(); |
1169 | 1169 | } |
1170 | 1170 | |
@@ -1180,8 +1180,8 @@ discard block |
||
1180 | 1180 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
1181 | 1181 | try { |
1182 | 1182 | $sth = $Connection->db->prepare($query); |
1183 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
1184 | - } catch(PDOException $e) { |
|
1183 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
1184 | + } catch (PDOException $e) { |
|
1185 | 1185 | //print_r($data); |
1186 | 1186 | return "error : ".$e->getMessage(); |
1187 | 1187 | } |
@@ -1201,7 +1201,7 @@ discard block |
||
1201 | 1201 | $Connection = new Connection(); |
1202 | 1202 | $sth = $Connection->db->prepare($query); |
1203 | 1203 | $sth->execute(array(':source' => 'website_fam')); |
1204 | - } catch(PDOException $e) { |
|
1204 | + } catch (PDOException $e) { |
|
1205 | 1205 | return "error : ".$e->getMessage(); |
1206 | 1206 | } |
1207 | 1207 | $delimiter = "\t"; |
@@ -1216,9 +1216,9 @@ discard block |
||
1216 | 1216 | $query = '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)'; |
1217 | 1217 | try { |
1218 | 1218 | $sth = $Connection->db->prepare($query); |
1219 | - $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')); |
|
1220 | - } catch(PDOException $e) { |
|
1221 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
1219 | + $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')); |
|
1220 | + } catch (PDOException $e) { |
|
1221 | + if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data); |
|
1222 | 1222 | } |
1223 | 1223 | } |
1224 | 1224 | $i++; |
@@ -1236,7 +1236,7 @@ discard block |
||
1236 | 1236 | $Connection = new Connection(); |
1237 | 1237 | $sth = $Connection->db->prepare($query); |
1238 | 1238 | $sth->execute(); |
1239 | - } catch(PDOException $e) { |
|
1239 | + } catch (PDOException $e) { |
|
1240 | 1240 | return "error : ".$e->getMessage(); |
1241 | 1241 | } |
1242 | 1242 | |
@@ -1257,8 +1257,8 @@ discard block |
||
1257 | 1257 | $query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)'; |
1258 | 1258 | try { |
1259 | 1259 | $sth = $Connection->db->prepare($query); |
1260 | - $sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10])); |
|
1261 | - } catch(PDOException $e) { |
|
1260 | + $sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10])); |
|
1261 | + } catch (PDOException $e) { |
|
1262 | 1262 | return "error : ".$e->getMessage(); |
1263 | 1263 | } |
1264 | 1264 | } |
@@ -1277,7 +1277,7 @@ discard block |
||
1277 | 1277 | $Connection = new Connection(); |
1278 | 1278 | $sth = $Connection->db->prepare($query); |
1279 | 1279 | $sth->execute(); |
1280 | - } catch(PDOException $e) { |
|
1280 | + } catch (PDOException $e) { |
|
1281 | 1281 | return "error : ".$e->getMessage(); |
1282 | 1282 | } |
1283 | 1283 | $delimiter = "\t"; |
@@ -1294,8 +1294,8 @@ discard block |
||
1294 | 1294 | VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)'; |
1295 | 1295 | try { |
1296 | 1296 | $sth = $Connection->db->prepare($query); |
1297 | - $sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21],':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29])); |
|
1298 | - } catch(PDOException $e) { |
|
1297 | + $sth->execute(array(':name' => $data[0], ':name_alternate' => $data[1], ':country_un' => $data[2], ':country_owner' => $data[3], ':owner' => $data[4], ':users' => $data[5], ':purpose' => $data[6], ':purpose_detailed' => $data[7], ':orbit' => $data[8], ':type' => $data[9], ':longitude_geo' => $data[10], ':perigee' => !empty($data[11]) ? $data[11] : NULL, ':apogee' => !empty($data[12]) ? $data[12] : NULL, ':eccentricity' => $data[13], ':inclination' => $data[14], ':period' => !empty($data[15]) ? $data[15] : NULL, ':launch_mass' => !empty($data[16]) ? $data[16] : NULL, ':dry_mass' => !empty($data[17]) ? $data[17] : NULL, ':power' => !empty($data[18]) ? $data[18] : NULL, ':launch_date' => $data[19], ':lifetime' => $data[20], ':contractor' => $data[21], ':country_contractor' => $data[22], ':launch_site' => $data[23], ':launch_vehicule' => $data[24], ':cospar' => $data[25], ':norad' => $data[26], ':comments' => $data[27], ':source_orbital' => $data[28], ':sources' => $data[29])); |
|
1298 | + } catch (PDOException $e) { |
|
1299 | 1299 | return "error : ".$e->getMessage(); |
1300 | 1300 | } |
1301 | 1301 | } |
@@ -1314,7 +1314,7 @@ discard block |
||
1314 | 1314 | $Connection = new Connection(); |
1315 | 1315 | $sth = $Connection->db->prepare($query); |
1316 | 1316 | $sth->execute(); |
1317 | - } catch(PDOException $e) { |
|
1317 | + } catch (PDOException $e) { |
|
1318 | 1318 | return "error : ".$e->getMessage(); |
1319 | 1319 | } |
1320 | 1320 | |
@@ -1330,7 +1330,7 @@ discard block |
||
1330 | 1330 | try { |
1331 | 1331 | $sth = $Connection->db->prepare($query); |
1332 | 1332 | $sth->execute(array(':icao' => $icao)); |
1333 | - } catch(PDOException $e) { |
|
1333 | + } catch (PDOException $e) { |
|
1334 | 1334 | return "error : ".$e->getMessage(); |
1335 | 1335 | } |
1336 | 1336 | } |
@@ -1341,7 +1341,7 @@ discard block |
||
1341 | 1341 | return ''; |
1342 | 1342 | } |
1343 | 1343 | |
1344 | - public static function tle($filename,$tletype) { |
|
1344 | + public static function tle($filename, $tletype) { |
|
1345 | 1345 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
1346 | 1346 | global $tmp_dir, $globalTransaction; |
1347 | 1347 | //$Spotter = new Spotter(); |
@@ -1351,7 +1351,7 @@ discard block |
||
1351 | 1351 | $Connection = new Connection(); |
1352 | 1352 | $sth = $Connection->db->prepare($query); |
1353 | 1353 | $sth->execute(array(':source' => $filename)); |
1354 | - } catch(PDOException $e) { |
|
1354 | + } catch (PDOException $e) { |
|
1355 | 1355 | return "error : ".$e->getMessage(); |
1356 | 1356 | } |
1357 | 1357 | |
@@ -1376,8 +1376,8 @@ discard block |
||
1376 | 1376 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
1377 | 1377 | try { |
1378 | 1378 | $sth = $Connection->db->prepare($query); |
1379 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
1380 | - } catch(PDOException $e) { |
|
1379 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
1380 | + } catch (PDOException $e) { |
|
1381 | 1381 | return "error : ".$e->getMessage(); |
1382 | 1382 | } |
1383 | 1383 | |
@@ -1397,7 +1397,7 @@ discard block |
||
1397 | 1397 | $Connection = new Connection(); |
1398 | 1398 | $sth = $Connection->db->prepare($query); |
1399 | 1399 | $sth->execute(array(':source' => $filename)); |
1400 | - } catch(PDOException $e) { |
|
1400 | + } catch (PDOException $e) { |
|
1401 | 1401 | return "error : ".$e->getMessage(); |
1402 | 1402 | } |
1403 | 1403 | |
@@ -1407,13 +1407,13 @@ discard block |
||
1407 | 1407 | $i = 0; |
1408 | 1408 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
1409 | 1409 | //$Connection->db->beginTransaction(); |
1410 | - while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE) |
|
1410 | + while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE) |
|
1411 | 1411 | { |
1412 | 1412 | if ($i > 0 && $data[0] != '') { |
1413 | 1413 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
1414 | - $period = str_replace(',','',$data[14]); |
|
1415 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
1416 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
1414 | + $period = str_replace(',', '', $data[14]); |
|
1415 | + if (!empty($period) && strpos($period, 'days')) $period = str_replace(' days', '', $period)*24*60; |
|
1416 | + if ($data[18] != '') $launch_date = date('Y-m-d', strtotime($data[18])); |
|
1417 | 1417 | else $launch_date = NULL; |
1418 | 1418 | $data = array_map(function($value) { |
1419 | 1419 | return trim($value) === '' ? null : $value; |
@@ -1423,8 +1423,8 @@ discard block |
||
1423 | 1423 | VALUES (:name, :name_alternate, :country_un, :country_owner, :owner, :users, :purpose, :purpose_detailed, :orbit, :type, :longitude_geo, :perigee, :apogee, :eccentricity, :inclination, :period, :launch_mass, :dry_mass, :power, :launch_date, :lifetime, :contractor, :country_contractor, :launch_site, :launch_vehicule, :cospar, :norad, :comments, :source_orbital, :sources)'; |
1424 | 1424 | try { |
1425 | 1425 | $sth = $Connection->db->prepare($query); |
1426 | - $sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',','',$data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',','',$data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+',','),'',$data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',','-1900',' (BOL)',' (EOL)'),'',$data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',',' (BOL)',' (EOL)'),'',$data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20],':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources)); |
|
1427 | - } catch(PDOException $e) { |
|
1426 | + $sth->execute(array(':name' => $data[0], ':name_alternate' => '', ':country_un' => $data[1], ':country_owner' => $data[2], ':owner' => $data[3], ':users' => $data[4], ':purpose' => $data[5], ':purpose_detailed' => $data[6], ':orbit' => $data[7], ':type' => $data[8], ':longitude_geo' => $data[9], ':perigee' => !empty($data[10]) ? str_replace(',', '', $data[10]) : NULL, ':apogee' => !empty($data[11]) ? str_replace(',', '', $data[11]) : NULL, ':eccentricity' => $data[12], ':inclination' => $data[13], ':period' => !empty($period) ? $period : NULL, ':launch_mass' => !empty($data[15]) ? str_replace(array('+', ','), '', $data[15]) : NULL, ':dry_mass' => !empty($data[16]) ? str_replace(array(',', '-1900', ' (BOL)', ' (EOL)'), '', $data[16]) : NULL, ':power' => !empty($data[17]) ? str_replace(array(',', ' (BOL)', ' (EOL)'), '', $data[17]) : NULL, ':launch_date' => $launch_date, ':lifetime' => $data[19], ':contractor' => $data[20], ':country_contractor' => $data[21], ':launch_site' => $data[22], ':launch_vehicule' => $data[23], ':cospar' => $data[24], ':norad' => $data[25], ':comments' => $data[26], ':source_orbital' => $data[27], ':sources' => $sources)); |
|
1427 | + } catch (PDOException $e) { |
|
1428 | 1428 | return "error : ".$e->getMessage(); |
1429 | 1429 | } |
1430 | 1430 | } |
@@ -1464,7 +1464,7 @@ discard block |
||
1464 | 1464 | 'EGYP' => array('country' => 'Egypt', 'owner' => ''), |
1465 | 1465 | 'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'), |
1466 | 1466 | 'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'), |
1467 | - 'EST' => array('country' => 'Estonia','owner' => ''), |
|
1467 | + 'EST' => array('country' => 'Estonia', 'owner' => ''), |
|
1468 | 1468 | 'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'), |
1469 | 1469 | 'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'), |
1470 | 1470 | 'FGER' => array('country' => 'France/Germany', 'owner' => ''), |
@@ -1587,10 +1587,10 @@ discard block |
||
1587 | 1587 | while (($data = fgets($handle, 1000)) !== FALSE) |
1588 | 1588 | { |
1589 | 1589 | $result = array(); |
1590 | - $result['cospar'] = trim(substr($data,0,11)); |
|
1591 | - $result['norad'] = trim(substr($data,13,6)); |
|
1592 | - $result['operational'] = trim(substr($data,21,1)); |
|
1593 | - $result['name'] = trim(substr($data,23,24)); |
|
1590 | + $result['cospar'] = trim(substr($data, 0, 11)); |
|
1591 | + $result['norad'] = trim(substr($data, 13, 6)); |
|
1592 | + $result['operational'] = trim(substr($data, 21, 1)); |
|
1593 | + $result['name'] = trim(substr($data, 23, 24)); |
|
1594 | 1594 | /* |
1595 | 1595 | * R/B(1) = Rocket body, first stage |
1596 | 1596 | * R/B(2) = Rocket body, second stage |
@@ -1602,20 +1602,20 @@ discard block |
||
1602 | 1602 | * An ampersand (&) indicates two or more objects are attached |
1603 | 1603 | */ |
1604 | 1604 | |
1605 | - $owner_code = trim(substr($data,49,5)); |
|
1605 | + $owner_code = trim(substr($data, 49, 5)); |
|
1606 | 1606 | if ($owner_code != 'TBD') { |
1607 | 1607 | $result['country_owner'] = $satcat_sources[$owner_code]['country']; |
1608 | 1608 | $result['owner'] = $satcat_sources[$owner_code]['owner']; |
1609 | - $result['launch_date'] = trim(substr($data,56,10)); |
|
1610 | - $launch_site_code = trim(substr($data,68,5)); |
|
1609 | + $result['launch_date'] = trim(substr($data, 56, 10)); |
|
1610 | + $launch_site_code = trim(substr($data, 68, 5)); |
|
1611 | 1611 | $result['launch_site'] = $satcat_launch_site[$launch_site_code]; |
1612 | - $result['lifetime'] = trim(substr($data,75,10)); |
|
1613 | - $result['period'] = trim(substr($data,87,7)); |
|
1614 | - $result['inclination'] = trim(substr($data,96,5)); |
|
1615 | - $result['apogee'] = trim(substr($data,103,6)); |
|
1616 | - $result['perigee'] = trim(substr($data,111,6)); |
|
1612 | + $result['lifetime'] = trim(substr($data, 75, 10)); |
|
1613 | + $result['period'] = trim(substr($data, 87, 7)); |
|
1614 | + $result['inclination'] = trim(substr($data, 96, 5)); |
|
1615 | + $result['apogee'] = trim(substr($data, 103, 6)); |
|
1616 | + $result['perigee'] = trim(substr($data, 111, 6)); |
|
1617 | 1617 | //$result['radarcross'] = trim(substr($data,119,8)); |
1618 | - $result['status'] = trim(substr($data,129,3)); |
|
1618 | + $result['status'] = trim(substr($data, 129, 3)); |
|
1619 | 1619 | //print_r($result); |
1620 | 1620 | $result = array_map(function($value) { |
1621 | 1621 | return trim($value) === '' ? null : $value; |
@@ -1628,7 +1628,7 @@ discard block |
||
1628 | 1628 | $sth = $Connection->db->prepare($query); |
1629 | 1629 | $sth->execute(array(':cospar' => $result['cospar'])); |
1630 | 1630 | $exist = $sth->fetchAll(PDO::FETCH_ASSOC); |
1631 | - } catch(PDOException $e) { |
|
1631 | + } catch (PDOException $e) { |
|
1632 | 1632 | return "error : ".$e->getMessage(); |
1633 | 1633 | } |
1634 | 1634 | if (empty($exist)) { |
@@ -1640,10 +1640,10 @@ discard block |
||
1640 | 1640 | ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
1641 | 1641 | ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
1642 | 1642 | ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
1643 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
1643 | + ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
1644 | 1644 | ) |
1645 | 1645 | ); |
1646 | - } catch(PDOException $e) { |
|
1646 | + } catch (PDOException $e) { |
|
1647 | 1647 | return "error : ".$e->getMessage(); |
1648 | 1648 | } |
1649 | 1649 | } elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) { |
@@ -1651,8 +1651,8 @@ discard block |
||
1651 | 1651 | try { |
1652 | 1652 | $Connection = new Connection(); |
1653 | 1653 | $sth = $Connection->db->prepare($query); |
1654 | - $sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar'])); |
|
1655 | - } catch(PDOException $e) { |
|
1654 | + $sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar'])); |
|
1655 | + } catch (PDOException $e) { |
|
1656 | 1656 | return "error : ".$e->getMessage(); |
1657 | 1657 | } |
1658 | 1658 | } |
@@ -1771,13 +1771,13 @@ discard block |
||
1771 | 1771 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1772 | 1772 | { |
1773 | 1773 | $i++; |
1774 | - if($i > 3 && count($row) > 2) { |
|
1774 | + if ($i > 3 && count($row) > 2) { |
|
1775 | 1775 | $data = array_values(array_filter($row)); |
1776 | 1776 | $cntdata = count($data); |
1777 | 1777 | if ($cntdata > 10) { |
1778 | 1778 | $value = $data[9]; |
1779 | 1779 | |
1780 | - for ($i =10;$i < $cntdata;$i++) { |
|
1780 | + for ($i = 10; $i < $cntdata; $i++) { |
|
1781 | 1781 | $value .= ' '.$data[$i]; |
1782 | 1782 | } |
1783 | 1783 | $data[9] = $value; |
@@ -1787,8 +1787,8 @@ discard block |
||
1787 | 1787 | $query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)'; |
1788 | 1788 | try { |
1789 | 1789 | $sth = $Connection->db->prepare($query); |
1790 | - $sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
1791 | - } catch(PDOException $e) { |
|
1790 | + $sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
1791 | + } catch (PDOException $e) { |
|
1792 | 1792 | return "error : ".$e->getMessage(); |
1793 | 1793 | } |
1794 | 1794 | } |
@@ -1809,7 +1809,7 @@ discard block |
||
1809 | 1809 | $Connection = new Connection(); |
1810 | 1810 | $sth = $Connection->db->prepare($query); |
1811 | 1811 | $sth->execute(); |
1812 | - } catch(PDOException $e) { |
|
1812 | + } catch (PDOException $e) { |
|
1813 | 1813 | return "error : ".$e->getMessage(); |
1814 | 1814 | } |
1815 | 1815 | |
@@ -1821,12 +1821,12 @@ discard block |
||
1821 | 1821 | if ($globalTransaction) $Connection->db->beginTransaction(); |
1822 | 1822 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1823 | 1823 | { |
1824 | - if(count($row) > 1) { |
|
1824 | + if (count($row) > 1) { |
|
1825 | 1825 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
1826 | 1826 | try { |
1827 | 1827 | $sth = $Connection->db->prepare($query); |
1828 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
1829 | - } catch(PDOException $e) { |
|
1828 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
1829 | + } catch (PDOException $e) { |
|
1830 | 1830 | return "error : ".$e->getMessage(); |
1831 | 1831 | } |
1832 | 1832 | } |
@@ -1846,21 +1846,21 @@ discard block |
||
1846 | 1846 | try { |
1847 | 1847 | $sth = $Connection->db->prepare($query); |
1848 | 1848 | $sth->execute(); |
1849 | - } catch(PDOException $e) { |
|
1849 | + } catch (PDOException $e) { |
|
1850 | 1850 | return "error : ".$e->getMessage(); |
1851 | 1851 | } |
1852 | 1852 | } |
1853 | 1853 | |
1854 | 1854 | |
1855 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
1855 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
1856 | 1856 | else { |
1857 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
1857 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
1858 | 1858 | $query = "CREATE EXTENSION postgis"; |
1859 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
1859 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
1860 | 1860 | try { |
1861 | 1861 | $sth = $Connection->db->prepare($query); |
1862 | 1862 | $sth->execute(); |
1863 | - } catch(PDOException $e) { |
|
1863 | + } catch (PDOException $e) { |
|
1864 | 1864 | return "error : ".$e->getMessage(); |
1865 | 1865 | } |
1866 | 1866 | } |
@@ -1873,7 +1873,7 @@ discard block |
||
1873 | 1873 | include_once('class.create_db.php'); |
1874 | 1874 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
1875 | 1875 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
1876 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
1876 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
1877 | 1877 | $error = ''; |
1878 | 1878 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
1879 | 1879 | if ($globalDebug) echo "Gunzip..."; |
@@ -1905,14 +1905,14 @@ discard block |
||
1905 | 1905 | try { |
1906 | 1906 | $sth = $Connection->db->prepare($query); |
1907 | 1907 | $sth->execute(); |
1908 | - } catch(PDOException $e) { |
|
1908 | + } catch (PDOException $e) { |
|
1909 | 1909 | echo "error : ".$e->getMessage(); |
1910 | 1910 | } |
1911 | 1911 | } |
1912 | 1912 | if ($globalDBdriver == 'mysql') { |
1913 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
1913 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
1914 | 1914 | } else { |
1915 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
1915 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
1916 | 1916 | } |
1917 | 1917 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
1918 | 1918 | return $error; |
@@ -1925,7 +1925,7 @@ discard block |
||
1925 | 1925 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
1926 | 1926 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
1927 | 1927 | // update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
1928 | - update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
|
1928 | + update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net'); |
|
1929 | 1929 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
1930 | 1930 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
1931 | 1931 | return $error; |
@@ -1945,7 +1945,7 @@ discard block |
||
1945 | 1945 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
1946 | 1946 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
1947 | 1947 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
1948 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
1948 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
1949 | 1949 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
1950 | 1950 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
1951 | 1951 | if ($error != '') { |
@@ -1958,7 +1958,7 @@ discard block |
||
1958 | 1958 | global $tmp_dir, $globalDebug; |
1959 | 1959 | $error = ''; |
1960 | 1960 | if ($globalDebug) echo "Routes : Download..."; |
1961 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
1961 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
1962 | 1962 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
1963 | 1963 | if ($globalDebug) echo "Gunzip..."; |
1964 | 1964 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -1974,7 +1974,7 @@ discard block |
||
1974 | 1974 | global $tmp_dir, $globalDebug; |
1975 | 1975 | $error = ''; |
1976 | 1976 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
1977 | - update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
1977 | + update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
1978 | 1978 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
1979 | 1979 | if ($globalDebug) echo "Gunzip..."; |
1980 | 1980 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -1990,7 +1990,7 @@ discard block |
||
1990 | 1990 | global $tmp_dir, $globalDebug; |
1991 | 1991 | $error = ''; |
1992 | 1992 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
1993 | - update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
1993 | + update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
1994 | 1994 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
1995 | 1995 | if ($globalDebug) echo "Gunzip..."; |
1996 | 1996 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -2018,7 +2018,7 @@ discard block |
||
2018 | 2018 | */ |
2019 | 2019 | if ($globalDebug) echo "Modes : Download..."; |
2020 | 2020 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
2021 | - update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
2021 | + update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
2022 | 2022 | |
2023 | 2023 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
2024 | 2024 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -2038,7 +2038,7 @@ discard block |
||
2038 | 2038 | public static function update_ModeS_faa() { |
2039 | 2039 | global $tmp_dir, $globalDebug; |
2040 | 2040 | if ($globalDebug) echo "Modes FAA: Download..."; |
2041 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
2041 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
2042 | 2042 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
2043 | 2043 | if ($globalDebug) echo "Unzip..."; |
2044 | 2044 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -2054,7 +2054,7 @@ discard block |
||
2054 | 2054 | public static function update_ModeS_flarm() { |
2055 | 2055 | global $tmp_dir, $globalDebug; |
2056 | 2056 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
2057 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
2057 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
2058 | 2058 | if (file_exists($tmp_dir.'data.fln')) { |
2059 | 2059 | if ($globalDebug) echo "Add to DB..."; |
2060 | 2060 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -2068,7 +2068,7 @@ discard block |
||
2068 | 2068 | public static function update_ModeS_ogn() { |
2069 | 2069 | global $tmp_dir, $globalDebug; |
2070 | 2070 | if ($globalDebug) echo "Modes OGN: Download..."; |
2071 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
2071 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
2072 | 2072 | if (file_exists($tmp_dir.'ogn.csv')) { |
2073 | 2073 | if ($globalDebug) echo "Add to DB..."; |
2074 | 2074 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -2083,201 +2083,201 @@ discard block |
||
2083 | 2083 | global $tmp_dir, $globalDebug, $globalMasterSource; |
2084 | 2084 | |
2085 | 2085 | if ($globalDebug) echo "Owner France: Download..."; |
2086 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
2086 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
2087 | 2087 | if (file_exists($tmp_dir.'owner_f.csv')) { |
2088 | 2088 | if ($globalDebug) echo "Add to DB..."; |
2089 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
2089 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
2090 | 2090 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
2091 | 2091 | if ($error != '') { |
2092 | 2092 | return $error; |
2093 | 2093 | } elseif ($globalDebug) echo "Done\n"; |
2094 | 2094 | |
2095 | 2095 | if ($globalDebug) echo "Owner Ireland: Download..."; |
2096 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
2096 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
2097 | 2097 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
2098 | 2098 | if ($globalDebug) echo "Add to DB..."; |
2099 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
2099 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
2100 | 2100 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
2101 | 2101 | if ($error != '') { |
2102 | 2102 | return $error; |
2103 | 2103 | } elseif ($globalDebug) echo "Done\n"; |
2104 | 2104 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
2105 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
2105 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
2106 | 2106 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
2107 | 2107 | if ($globalDebug) echo "Add to DB..."; |
2108 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
2108 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
2109 | 2109 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
2110 | 2110 | if ($error != '') { |
2111 | 2111 | return $error; |
2112 | 2112 | } elseif ($globalDebug) echo "Done\n"; |
2113 | 2113 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
2114 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
2114 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
2115 | 2115 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
2116 | 2116 | if ($globalDebug) echo "Add to DB..."; |
2117 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
2117 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
2118 | 2118 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
2119 | 2119 | if ($error != '') { |
2120 | 2120 | return $error; |
2121 | 2121 | } elseif ($globalDebug) echo "Done\n"; |
2122 | 2122 | if ($globalDebug) echo "Owner Australia: Download..."; |
2123 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
2123 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
2124 | 2124 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
2125 | 2125 | if ($globalDebug) echo "Add to DB..."; |
2126 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
2126 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
2127 | 2127 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
2128 | 2128 | if ($error != '') { |
2129 | 2129 | return $error; |
2130 | 2130 | } elseif ($globalDebug) echo "Done\n"; |
2131 | 2131 | if ($globalDebug) echo "Owner Austria: Download..."; |
2132 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
2132 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
2133 | 2133 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
2134 | 2134 | if ($globalDebug) echo "Add to DB..."; |
2135 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
2135 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
2136 | 2136 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
2137 | 2137 | if ($error != '') { |
2138 | 2138 | return $error; |
2139 | 2139 | } elseif ($globalDebug) echo "Done\n"; |
2140 | 2140 | if ($globalDebug) echo "Owner Chile: Download..."; |
2141 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
2141 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
2142 | 2142 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
2143 | 2143 | if ($globalDebug) echo "Add to DB..."; |
2144 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
2144 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
2145 | 2145 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
2146 | 2146 | if ($error != '') { |
2147 | 2147 | return $error; |
2148 | 2148 | } elseif ($globalDebug) echo "Done\n"; |
2149 | 2149 | if ($globalDebug) echo "Owner Colombia: Download..."; |
2150 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
2150 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
2151 | 2151 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
2152 | 2152 | if ($globalDebug) echo "Add to DB..."; |
2153 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
2153 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
2154 | 2154 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
2155 | 2155 | if ($error != '') { |
2156 | 2156 | return $error; |
2157 | 2157 | } elseif ($globalDebug) echo "Done\n"; |
2158 | 2158 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
2159 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
2159 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
2160 | 2160 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
2161 | 2161 | if ($globalDebug) echo "Add to DB..."; |
2162 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
2162 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
2163 | 2163 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
2164 | 2164 | if ($error != '') { |
2165 | 2165 | return $error; |
2166 | 2166 | } elseif ($globalDebug) echo "Done\n"; |
2167 | 2167 | if ($globalDebug) echo "Owner Brazil: Download..."; |
2168 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
2168 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
2169 | 2169 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
2170 | 2170 | if ($globalDebug) echo "Add to DB..."; |
2171 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
2171 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
2172 | 2172 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
2173 | 2173 | if ($error != '') { |
2174 | 2174 | return $error; |
2175 | 2175 | } elseif ($globalDebug) echo "Done\n"; |
2176 | 2176 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
2177 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
2177 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
2178 | 2178 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
2179 | 2179 | if ($globalDebug) echo "Add to DB..."; |
2180 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
2180 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
2181 | 2181 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
2182 | 2182 | if ($error != '') { |
2183 | 2183 | return $error; |
2184 | 2184 | } elseif ($globalDebug) echo "Done\n"; |
2185 | 2185 | if ($globalDebug) echo "Owner Croatia: Download..."; |
2186 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
2186 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
2187 | 2187 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
2188 | 2188 | if ($globalDebug) echo "Add to DB..."; |
2189 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
2189 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
2190 | 2190 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
2191 | 2191 | if ($error != '') { |
2192 | 2192 | return $error; |
2193 | 2193 | } elseif ($globalDebug) echo "Done\n"; |
2194 | 2194 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
2195 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
2195 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
2196 | 2196 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
2197 | 2197 | if ($globalDebug) echo "Add to DB..."; |
2198 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
2198 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
2199 | 2199 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
2200 | 2200 | if ($error != '') { |
2201 | 2201 | return $error; |
2202 | 2202 | } elseif ($globalDebug) echo "Done\n"; |
2203 | 2203 | if ($globalDebug) echo "Owner Maldives: Download..."; |
2204 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
2204 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
2205 | 2205 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
2206 | 2206 | if ($globalDebug) echo "Add to DB..."; |
2207 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
2207 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
2208 | 2208 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
2209 | 2209 | if ($error != '') { |
2210 | 2210 | return $error; |
2211 | 2211 | } elseif ($globalDebug) echo "Done\n"; |
2212 | 2212 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
2213 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
2213 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
2214 | 2214 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
2215 | 2215 | if ($globalDebug) echo "Add to DB..."; |
2216 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
2216 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
2217 | 2217 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
2218 | 2218 | if ($error != '') { |
2219 | 2219 | return $error; |
2220 | 2220 | } elseif ($globalDebug) echo "Done\n"; |
2221 | 2221 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
2222 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
2222 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
2223 | 2223 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
2224 | 2224 | if ($globalDebug) echo "Add to DB..."; |
2225 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
2225 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
2226 | 2226 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
2227 | 2227 | if ($error != '') { |
2228 | 2228 | return $error; |
2229 | 2229 | } elseif ($globalDebug) echo "Done\n"; |
2230 | 2230 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
2231 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
2231 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
2232 | 2232 | if (file_exists($tmp_dir.'owner_om.csv')) { |
2233 | 2233 | if ($globalDebug) echo "Add to DB..."; |
2234 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
2234 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
2235 | 2235 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
2236 | 2236 | if ($error != '') { |
2237 | 2237 | return $error; |
2238 | 2238 | } elseif ($globalDebug) echo "Done\n"; |
2239 | 2239 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
2240 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
2240 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
2241 | 2241 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
2242 | 2242 | if ($globalDebug) echo "Add to DB..."; |
2243 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
2243 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
2244 | 2244 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
2245 | 2245 | if ($error != '') { |
2246 | 2246 | return $error; |
2247 | 2247 | } elseif ($globalDebug) echo "Done\n"; |
2248 | 2248 | if ($globalDebug) echo "Owner Iceland: Download..."; |
2249 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
2249 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
2250 | 2250 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
2251 | 2251 | if ($globalDebug) echo "Add to DB..."; |
2252 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
2252 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
2253 | 2253 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
2254 | 2254 | if ($error != '') { |
2255 | 2255 | return $error; |
2256 | 2256 | } elseif ($globalDebug) echo "Done\n"; |
2257 | 2257 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
2258 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
2258 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
2259 | 2259 | if (file_exists($tmp_dir.'owner_m.csv')) { |
2260 | 2260 | if ($globalDebug) echo "Add to DB..."; |
2261 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
2261 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
2262 | 2262 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
2263 | 2263 | if ($error != '') { |
2264 | 2264 | return $error; |
2265 | 2265 | } elseif ($globalDebug) echo "Done\n"; |
2266 | 2266 | if ($globalMasterSource) { |
2267 | 2267 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
2268 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
2268 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
2269 | 2269 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
2270 | 2270 | if ($globalDebug) echo "Add to DB..."; |
2271 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
2271 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
2272 | 2272 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
2273 | 2273 | if ($error != '') { |
2274 | 2274 | return $error; |
2275 | 2275 | } elseif ($globalDebug) echo "Done\n"; |
2276 | 2276 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
2277 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
2277 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
2278 | 2278 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
2279 | 2279 | if ($globalDebug) echo "Add to DB..."; |
2280 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
2280 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
2281 | 2281 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
2282 | 2282 | if ($error != '') { |
2283 | 2283 | return $error; |
@@ -2290,7 +2290,7 @@ discard block |
||
2290 | 2290 | global $tmp_dir, $globalDebug; |
2291 | 2291 | $error = ''; |
2292 | 2292 | if ($globalDebug) echo "Translation : Download..."; |
2293 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
2293 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
2294 | 2294 | if (file_exists($tmp_dir.'translation.zip')) { |
2295 | 2295 | if ($globalDebug) echo "Unzip..."; |
2296 | 2296 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -2306,7 +2306,7 @@ discard block |
||
2306 | 2306 | public static function update_translation_fam() { |
2307 | 2307 | global $tmp_dir, $globalDebug; |
2308 | 2308 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
2309 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
2309 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
2310 | 2310 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
2311 | 2311 | if ($globalDebug) echo "Gunzip..."; |
2312 | 2312 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
@@ -2321,7 +2321,7 @@ discard block |
||
2321 | 2321 | public static function update_ModeS_fam() { |
2322 | 2322 | global $tmp_dir, $globalDebug; |
2323 | 2323 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
2324 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
2324 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
2325 | 2325 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
2326 | 2326 | if ($globalDebug) echo "Gunzip..."; |
2327 | 2327 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
@@ -2337,9 +2337,9 @@ discard block |
||
2337 | 2337 | global $tmp_dir, $globalDebug, $globalOwner; |
2338 | 2338 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
2339 | 2339 | if ($globalOwner === TRUE) { |
2340 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
2340 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
2341 | 2341 | } else { |
2342 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
2342 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
2343 | 2343 | } |
2344 | 2344 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
2345 | 2345 | if ($globalDebug) echo "Gunzip..."; |
@@ -2355,7 +2355,7 @@ discard block |
||
2355 | 2355 | public static function update_routes_fam() { |
2356 | 2356 | global $tmp_dir, $globalDebug; |
2357 | 2357 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
2358 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
2358 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
2359 | 2359 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
2360 | 2360 | if ($globalDebug) echo "Gunzip..."; |
2361 | 2361 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
@@ -2369,13 +2369,13 @@ discard block |
||
2369 | 2369 | } |
2370 | 2370 | public static function update_marine_identity_fam() { |
2371 | 2371 | global $tmp_dir, $globalDebug; |
2372 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
2372 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
2373 | 2373 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
2374 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
2374 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
2375 | 2375 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
2376 | 2376 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
2377 | 2377 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
2378 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
2378 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
2379 | 2379 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
2380 | 2380 | if ($globalDebug) echo "Gunzip..."; |
2381 | 2381 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
@@ -2395,13 +2395,13 @@ discard block |
||
2395 | 2395 | |
2396 | 2396 | public static function update_satellite_fam() { |
2397 | 2397 | global $tmp_dir, $globalDebug; |
2398 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5'); |
|
2398 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5'); |
|
2399 | 2399 | if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) { |
2400 | - $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
2400 | + $satellite_md5_file = explode(' ', file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
2401 | 2401 | $satellite_md5 = $satellite_md5_file[0]; |
2402 | 2402 | if (!update_db::check_satellite_version($satellite_md5)) { |
2403 | 2403 | if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
2404 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
|
2404 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz', $tmp_dir.'satellite.tsv.gz'); |
|
2405 | 2405 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
2406 | 2406 | if ($globalDebug) echo "Gunzip..."; |
2407 | 2407 | update_db::gunzip($tmp_dir.'satellite.tsv.gz'); |
@@ -2421,7 +2421,7 @@ discard block |
||
2421 | 2421 | public static function update_banned_fam() { |
2422 | 2422 | global $tmp_dir, $globalDebug; |
2423 | 2423 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
2424 | - update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
2424 | + update_db::download('http://data.flightairmap.com/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
2425 | 2425 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
2426 | 2426 | //if ($globalDebug) echo "Gunzip..."; |
2427 | 2427 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2440,18 +2440,18 @@ discard block |
||
2440 | 2440 | $error = ''; |
2441 | 2441 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
2442 | 2442 | if ($globalDBdriver == 'mysql') { |
2443 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
2443 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
2444 | 2444 | } else { |
2445 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
2445 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
2446 | 2446 | } |
2447 | 2447 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
2448 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
2448 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
2449 | 2449 | $airspace_md5 = $airspace_md5_file[0]; |
2450 | 2450 | if (!update_db::check_airspace_version($airspace_md5)) { |
2451 | 2451 | if ($globalDBdriver == 'mysql') { |
2452 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
2452 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
2453 | 2453 | } else { |
2454 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
2454 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
2455 | 2455 | } |
2456 | 2456 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
2457 | 2457 | if ($globalDebug) echo "Gunzip..."; |
@@ -2463,7 +2463,7 @@ discard block |
||
2463 | 2463 | try { |
2464 | 2464 | $sth = $Connection->db->prepare($query); |
2465 | 2465 | $sth->execute(); |
2466 | - } catch(PDOException $e) { |
|
2466 | + } catch (PDOException $e) { |
|
2467 | 2467 | return "error : ".$e->getMessage(); |
2468 | 2468 | } |
2469 | 2469 | } |
@@ -2482,15 +2482,15 @@ discard block |
||
2482 | 2482 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
2483 | 2483 | $error = ''; |
2484 | 2484 | if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
2485 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
2485 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
2486 | 2486 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
2487 | - $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
2487 | + $geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
2488 | 2488 | $geoid_md5 = $geoid_md5_file[0]; |
2489 | 2489 | if (!update_db::check_geoid_version($geoid_md5)) { |
2490 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
2490 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
2491 | 2491 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
2492 | 2492 | if ($globalDebug) echo "Gunzip..."; |
2493 | - update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
2493 | + update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
2494 | 2494 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
2495 | 2495 | update_db::insert_geoid_version($geoid_md5); |
2496 | 2496 | } |
@@ -2506,15 +2506,15 @@ discard block |
||
2506 | 2506 | public static function update_tle() { |
2507 | 2507 | global $tmp_dir, $globalDebug; |
2508 | 2508 | if ($globalDebug) echo "Download TLE : Download..."; |
2509 | - $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', |
|
2510 | - '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', |
|
2511 | - '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'); |
|
2509 | + $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', |
|
2510 | + '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', |
|
2511 | + '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'); |
|
2512 | 2512 | foreach ($alltle as $filename) { |
2513 | 2513 | if ($globalDebug) echo "downloading ".$filename.'...'; |
2514 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
2514 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
2515 | 2515 | if (file_exists($tmp_dir.$filename)) { |
2516 | 2516 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
2517 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
2517 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
2518 | 2518 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
2519 | 2519 | if ($error != '') { |
2520 | 2520 | echo $error."\n"; |
@@ -2526,7 +2526,7 @@ discard block |
||
2526 | 2526 | public static function update_ucsdb() { |
2527 | 2527 | global $tmp_dir, $globalDebug; |
2528 | 2528 | if ($globalDebug) echo "Download UCS DB : Download..."; |
2529 | - 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'); |
|
2529 | + 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'); |
|
2530 | 2530 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
2531 | 2531 | if ($globalDebug) echo "Add to DB..."; |
2532 | 2532 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
@@ -2540,7 +2540,7 @@ discard block |
||
2540 | 2540 | public static function update_celestrak() { |
2541 | 2541 | global $tmp_dir, $globalDebug; |
2542 | 2542 | if ($globalDebug) echo "Download Celestrak DB : Download..."; |
2543 | - update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
|
2543 | + update_db::download('http://celestrak.com/pub/satcat.txt', $tmp_dir.'satcat.txt'); |
|
2544 | 2544 | if (file_exists($tmp_dir.'satcat.txt')) { |
2545 | 2545 | if ($globalDebug) echo "Add to DB..."; |
2546 | 2546 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
@@ -2555,32 +2555,32 @@ discard block |
||
2555 | 2555 | global $tmp_dir, $globalDebug; |
2556 | 2556 | $error = ''; |
2557 | 2557 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
2558 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
2558 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
2559 | 2559 | if (file_exists($tmp_dir.'models.md5sum')) { |
2560 | 2560 | if ($globalDebug) echo "Check files...\n"; |
2561 | 2561 | $newmodelsdb = array(); |
2562 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
2563 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
2562 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
2563 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
2564 | 2564 | $model = trim($row[2]); |
2565 | 2565 | $newmodelsdb[$model] = trim($row[0]); |
2566 | 2566 | } |
2567 | 2567 | } |
2568 | 2568 | $modelsdb = array(); |
2569 | 2569 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
2570 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
2571 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
2570 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
2571 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
2572 | 2572 | $model = trim($row[2]); |
2573 | 2573 | $modelsdb[$model] = trim($row[0]); |
2574 | 2574 | } |
2575 | 2575 | } |
2576 | 2576 | } |
2577 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
2577 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
2578 | 2578 | foreach ($diff as $key => $value) { |
2579 | 2579 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
2580 | - update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
2580 | + update_db::download('http://data.flightairmap.com/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
2581 | 2581 | |
2582 | 2582 | } |
2583 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
2583 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
2584 | 2584 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
2585 | 2585 | if ($error != '') { |
2586 | 2586 | return $error; |
@@ -2592,32 +2592,32 @@ discard block |
||
2592 | 2592 | global $tmp_dir, $globalDebug; |
2593 | 2593 | $error = ''; |
2594 | 2594 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
2595 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
2595 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
2596 | 2596 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
2597 | 2597 | if ($globalDebug) echo "Check files...\n"; |
2598 | 2598 | $newmodelsdb = array(); |
2599 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
2600 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
2599 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
2600 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
2601 | 2601 | $model = trim($row[2]); |
2602 | 2602 | $newmodelsdb[$model] = trim($row[0]); |
2603 | 2603 | } |
2604 | 2604 | } |
2605 | 2605 | $modelsdb = array(); |
2606 | 2606 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
2607 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
2608 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
2607 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
2608 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
2609 | 2609 | $model = trim($row[2]); |
2610 | 2610 | $modelsdb[$model] = trim($row[0]); |
2611 | 2611 | } |
2612 | 2612 | } |
2613 | 2613 | } |
2614 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
2614 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
2615 | 2615 | foreach ($diff as $key => $value) { |
2616 | 2616 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
2617 | - update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
2617 | + update_db::download('http://data.flightairmap.com/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
2618 | 2618 | |
2619 | 2619 | } |
2620 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
2620 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
2621 | 2621 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
2622 | 2622 | if ($error != '') { |
2623 | 2623 | return $error; |
@@ -2629,32 +2629,32 @@ discard block |
||
2629 | 2629 | global $tmp_dir, $globalDebug; |
2630 | 2630 | $error = ''; |
2631 | 2631 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
2632 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
2632 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
2633 | 2633 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
2634 | 2634 | if ($globalDebug) echo "Check files...\n"; |
2635 | 2635 | $newmodelsdb = array(); |
2636 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
2637 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
2636 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
2637 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
2638 | 2638 | $model = trim($row[2]); |
2639 | 2639 | $newmodelsdb[$model] = trim($row[0]); |
2640 | 2640 | } |
2641 | 2641 | } |
2642 | 2642 | $modelsdb = array(); |
2643 | 2643 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
2644 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
2645 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
2644 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
2645 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
2646 | 2646 | $model = trim($row[2]); |
2647 | 2647 | $modelsdb[$model] = trim($row[0]); |
2648 | 2648 | } |
2649 | 2649 | } |
2650 | 2650 | } |
2651 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
2651 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
2652 | 2652 | foreach ($diff as $key => $value) { |
2653 | 2653 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
2654 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
2654 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
2655 | 2655 | |
2656 | 2656 | } |
2657 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
2657 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
2658 | 2658 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
2659 | 2659 | if ($error != '') { |
2660 | 2660 | return $error; |
@@ -2677,8 +2677,8 @@ discard block |
||
2677 | 2677 | */ |
2678 | 2678 | if (file_exists($tmp_dir.'aircrafts.html')) { |
2679 | 2679 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
2680 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
2681 | - $result = fread($fh,100000000); |
|
2680 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
2681 | + $result = fread($fh, 100000000); |
|
2682 | 2682 | //echo $result; |
2683 | 2683 | //var_dump(str_get_html($result)); |
2684 | 2684 | //print_r(self::table2array($result)); |
@@ -2696,23 +2696,23 @@ discard block |
||
2696 | 2696 | $Connection = new Connection(); |
2697 | 2697 | $sth = $Connection->db->prepare($query); |
2698 | 2698 | $sth->execute(); |
2699 | - } catch(PDOException $e) { |
|
2699 | + } catch (PDOException $e) { |
|
2700 | 2700 | return "error : ".$e->getMessage(); |
2701 | 2701 | } |
2702 | 2702 | |
2703 | 2703 | $error = ''; |
2704 | 2704 | if ($globalDebug) echo "Notam : Download..."; |
2705 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
2705 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
2706 | 2706 | if (file_exists($tmp_dir.'notam.rss')) { |
2707 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
2707 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
2708 | 2708 | foreach ($notams['channel']['item'] as $notam) { |
2709 | - $title = explode(':',$notam['title']); |
|
2709 | + $title = explode(':', $notam['title']); |
|
2710 | 2710 | $data['ref'] = trim($title[0]); |
2711 | 2711 | unset($title[0]); |
2712 | - $data['title'] = trim(implode(':',$title)); |
|
2713 | - $description = strip_tags($notam['description'],'<pre>'); |
|
2714 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
2715 | - $q = explode('/',$match[1]); |
|
2712 | + $data['title'] = trim(implode(':', $title)); |
|
2713 | + $description = strip_tags($notam['description'], '<pre>'); |
|
2714 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
2715 | + $q = explode('/', $match[1]); |
|
2716 | 2716 | $data['fir'] = $q[0]; |
2717 | 2717 | $data['code'] = $q[1]; |
2718 | 2718 | $ifrvfr = $q[2]; |
@@ -2728,30 +2728,30 @@ discard block |
||
2728 | 2728 | $data['lower_limit'] = $q[5]; |
2729 | 2729 | $data['upper_limit'] = $q[6]; |
2730 | 2730 | $latlonrad = $q[7]; |
2731 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
2732 | - $latitude = $Common->convertDec($las,'latitude'); |
|
2733 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
2731 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
2732 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
2733 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
2734 | 2734 | if ($lac == 'S') $latitude = '-'.$latitude; |
2735 | 2735 | if ($lnc == 'W') $longitude = '-'.$longitude; |
2736 | 2736 | $data['center_latitude'] = $latitude; |
2737 | 2737 | $data['center_longitude'] = $longitude; |
2738 | 2738 | $data['radius'] = intval($radius); |
2739 | 2739 | |
2740 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
2740 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
2741 | 2741 | $data['text'] = $match[1]; |
2742 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
2742 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
2743 | 2743 | $fromto = $match[1]; |
2744 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
2744 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
2745 | 2745 | $fromall = trim($match[1]); |
2746 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
2746 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
2747 | 2747 | $from = trim($match[1]); |
2748 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
2749 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
2748 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
2749 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
2750 | 2750 | $toall = trim($match[1]); |
2751 | - if (!preg_match(':Permanent:',$toall)) { |
|
2752 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
2751 | + if (!preg_match(':Permanent:', $toall)) { |
|
2752 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
2753 | 2753 | $to = trim($match[1]); |
2754 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
2754 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
2755 | 2755 | $data['permanent'] = 0; |
2756 | 2756 | } else { |
2757 | 2757 | $data['date_end'] = NULL; |
@@ -2759,7 +2759,7 @@ discard block |
||
2759 | 2759 | } |
2760 | 2760 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
2761 | 2761 | $NOTAM = new NOTAM(); |
2762 | - $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']); |
|
2762 | + $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']); |
|
2763 | 2763 | unset($data); |
2764 | 2764 | } |
2765 | 2765 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2782,16 +2782,16 @@ discard block |
||
2782 | 2782 | $Connection = new Connection(); |
2783 | 2783 | $sth = $Connection->db->prepare($query); |
2784 | 2784 | $sth->execute(); |
2785 | - } catch(PDOException $e) { |
|
2785 | + } catch (PDOException $e) { |
|
2786 | 2786 | return "error : ".$e->getMessage(); |
2787 | 2787 | } |
2788 | 2788 | } |
2789 | 2789 | $Common = new Common(); |
2790 | 2790 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
2791 | - $airspace_json = json_decode($airspace_lst,true); |
|
2791 | + $airspace_json = json_decode($airspace_lst, true); |
|
2792 | 2792 | foreach ($airspace_json['records'] as $airspace) { |
2793 | 2793 | if ($globalDebug) echo $airspace['name']."...\n"; |
2794 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
2794 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
2795 | 2795 | if (file_exists($tmp_dir.$airspace['name'])) { |
2796 | 2796 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
2797 | 2797 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2813,7 +2813,7 @@ discard block |
||
2813 | 2813 | $Connection = new Connection(); |
2814 | 2814 | $sth = $Connection->db->prepare($query); |
2815 | 2815 | $sth->execute(array(':new' => $new, ':old' => $old)); |
2816 | - } catch(PDOException $e) { |
|
2816 | + } catch (PDOException $e) { |
|
2817 | 2817 | return "error : ".$e->getMessage(); |
2818 | 2818 | } |
2819 | 2819 | } |
@@ -2830,7 +2830,7 @@ discard block |
||
2830 | 2830 | $Connection = new Connection(); |
2831 | 2831 | $sth = $Connection->db->prepare($query); |
2832 | 2832 | $sth->execute(); |
2833 | - } catch(PDOException $e) { |
|
2833 | + } catch (PDOException $e) { |
|
2834 | 2834 | return "error : ".$e->getMessage(); |
2835 | 2835 | } |
2836 | 2836 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2845,7 +2845,7 @@ discard block |
||
2845 | 2845 | $Connection = new Connection(); |
2846 | 2846 | $sth = $Connection->db->prepare($query); |
2847 | 2847 | $sth->execute(); |
2848 | - } catch(PDOException $e) { |
|
2848 | + } catch (PDOException $e) { |
|
2849 | 2849 | return "error : ".$e->getMessage(); |
2850 | 2850 | } |
2851 | 2851 | } |
@@ -2856,7 +2856,7 @@ discard block |
||
2856 | 2856 | $Connection = new Connection(); |
2857 | 2857 | $sth = $Connection->db->prepare($query); |
2858 | 2858 | $sth->execute(array(':version' => $version)); |
2859 | - } catch(PDOException $e) { |
|
2859 | + } catch (PDOException $e) { |
|
2860 | 2860 | return "error : ".$e->getMessage(); |
2861 | 2861 | } |
2862 | 2862 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2870,7 +2870,7 @@ discard block |
||
2870 | 2870 | $Connection = new Connection(); |
2871 | 2871 | $sth = $Connection->db->prepare($query); |
2872 | 2872 | $sth->execute(array(':version' => $version)); |
2873 | - } catch(PDOException $e) { |
|
2873 | + } catch (PDOException $e) { |
|
2874 | 2874 | return "error : ".$e->getMessage(); |
2875 | 2875 | } |
2876 | 2876 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2884,7 +2884,7 @@ discard block |
||
2884 | 2884 | $Connection = new Connection(); |
2885 | 2885 | $sth = $Connection->db->prepare($query); |
2886 | 2886 | $sth->execute(array(':version' => $version)); |
2887 | - } catch(PDOException $e) { |
|
2887 | + } catch (PDOException $e) { |
|
2888 | 2888 | return "error : ".$e->getMessage(); |
2889 | 2889 | } |
2890 | 2890 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2898,7 +2898,7 @@ discard block |
||
2898 | 2898 | $Connection = new Connection(); |
2899 | 2899 | $sth = $Connection->db->prepare($query); |
2900 | 2900 | $sth->execute(array(':version' => $version)); |
2901 | - } catch(PDOException $e) { |
|
2901 | + } catch (PDOException $e) { |
|
2902 | 2902 | return "error : ".$e->getMessage(); |
2903 | 2903 | } |
2904 | 2904 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2914,7 +2914,7 @@ discard block |
||
2914 | 2914 | $Connection = new Connection(); |
2915 | 2915 | $sth = $Connection->db->prepare($query); |
2916 | 2916 | $sth->execute(array(':version' => $version)); |
2917 | - } catch(PDOException $e) { |
|
2917 | + } catch (PDOException $e) { |
|
2918 | 2918 | return "error : ".$e->getMessage(); |
2919 | 2919 | } |
2920 | 2920 | } |
@@ -2926,7 +2926,7 @@ discard block |
||
2926 | 2926 | $Connection = new Connection(); |
2927 | 2927 | $sth = $Connection->db->prepare($query); |
2928 | 2928 | $sth->execute(array(':version' => $version)); |
2929 | - } catch(PDOException $e) { |
|
2929 | + } catch (PDOException $e) { |
|
2930 | 2930 | return "error : ".$e->getMessage(); |
2931 | 2931 | } |
2932 | 2932 | } |
@@ -2938,7 +2938,7 @@ discard block |
||
2938 | 2938 | $Connection = new Connection(); |
2939 | 2939 | $sth = $Connection->db->prepare($query); |
2940 | 2940 | $sth->execute(array(':version' => $version)); |
2941 | - } catch(PDOException $e) { |
|
2941 | + } catch (PDOException $e) { |
|
2942 | 2942 | return "error : ".$e->getMessage(); |
2943 | 2943 | } |
2944 | 2944 | } |
@@ -2950,7 +2950,7 @@ discard block |
||
2950 | 2950 | $Connection = new Connection(); |
2951 | 2951 | $sth = $Connection->db->prepare($query); |
2952 | 2952 | $sth->execute(array(':version' => $version)); |
2953 | - } catch(PDOException $e) { |
|
2953 | + } catch (PDOException $e) { |
|
2954 | 2954 | return "error : ".$e->getMessage(); |
2955 | 2955 | } |
2956 | 2956 | } |
@@ -2966,7 +2966,7 @@ discard block |
||
2966 | 2966 | $Connection = new Connection(); |
2967 | 2967 | $sth = $Connection->db->prepare($query); |
2968 | 2968 | $sth->execute(); |
2969 | - } catch(PDOException $e) { |
|
2969 | + } catch (PDOException $e) { |
|
2970 | 2970 | return "error : ".$e->getMessage(); |
2971 | 2971 | } |
2972 | 2972 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2981,7 +2981,7 @@ discard block |
||
2981 | 2981 | $Connection = new Connection(); |
2982 | 2982 | $sth = $Connection->db->prepare($query); |
2983 | 2983 | $sth->execute(); |
2984 | - } catch(PDOException $e) { |
|
2984 | + } catch (PDOException $e) { |
|
2985 | 2985 | return "error : ".$e->getMessage(); |
2986 | 2986 | } |
2987 | 2987 | } |
@@ -2997,7 +2997,7 @@ discard block |
||
2997 | 2997 | $Connection = new Connection(); |
2998 | 2998 | $sth = $Connection->db->prepare($query); |
2999 | 2999 | $sth->execute(); |
3000 | - } catch(PDOException $e) { |
|
3000 | + } catch (PDOException $e) { |
|
3001 | 3001 | return "error : ".$e->getMessage(); |
3002 | 3002 | } |
3003 | 3003 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3012,7 +3012,7 @@ discard block |
||
3012 | 3012 | $Connection = new Connection(); |
3013 | 3013 | $sth = $Connection->db->prepare($query); |
3014 | 3014 | $sth->execute(); |
3015 | - } catch(PDOException $e) { |
|
3015 | + } catch (PDOException $e) { |
|
3016 | 3016 | return "error : ".$e->getMessage(); |
3017 | 3017 | } |
3018 | 3018 | } |
@@ -3028,7 +3028,7 @@ discard block |
||
3028 | 3028 | $Connection = new Connection(); |
3029 | 3029 | $sth = $Connection->db->prepare($query); |
3030 | 3030 | $sth->execute(); |
3031 | - } catch(PDOException $e) { |
|
3031 | + } catch (PDOException $e) { |
|
3032 | 3032 | return "error : ".$e->getMessage(); |
3033 | 3033 | } |
3034 | 3034 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3043,7 +3043,7 @@ discard block |
||
3043 | 3043 | $Connection = new Connection(); |
3044 | 3044 | $sth = $Connection->db->prepare($query); |
3045 | 3045 | $sth->execute(); |
3046 | - } catch(PDOException $e) { |
|
3046 | + } catch (PDOException $e) { |
|
3047 | 3047 | return "error : ".$e->getMessage(); |
3048 | 3048 | } |
3049 | 3049 | } |
@@ -3059,7 +3059,7 @@ discard block |
||
3059 | 3059 | $Connection = new Connection(); |
3060 | 3060 | $sth = $Connection->db->prepare($query); |
3061 | 3061 | $sth->execute(); |
3062 | - } catch(PDOException $e) { |
|
3062 | + } catch (PDOException $e) { |
|
3063 | 3063 | return "error : ".$e->getMessage(); |
3064 | 3064 | } |
3065 | 3065 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3074,7 +3074,7 @@ discard block |
||
3074 | 3074 | $Connection = new Connection(); |
3075 | 3075 | $sth = $Connection->db->prepare($query); |
3076 | 3076 | $sth->execute(); |
3077 | - } catch(PDOException $e) { |
|
3077 | + } catch (PDOException $e) { |
|
3078 | 3078 | return "error : ".$e->getMessage(); |
3079 | 3079 | } |
3080 | 3080 | } |
@@ -3089,7 +3089,7 @@ discard block |
||
3089 | 3089 | $Connection = new Connection(); |
3090 | 3090 | $sth = $Connection->db->prepare($query); |
3091 | 3091 | $sth->execute(); |
3092 | - } catch(PDOException $e) { |
|
3092 | + } catch (PDOException $e) { |
|
3093 | 3093 | return "error : ".$e->getMessage(); |
3094 | 3094 | } |
3095 | 3095 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3104,7 +3104,7 @@ discard block |
||
3104 | 3104 | $Connection = new Connection(); |
3105 | 3105 | $sth = $Connection->db->prepare($query); |
3106 | 3106 | $sth->execute(); |
3107 | - } catch(PDOException $e) { |
|
3107 | + } catch (PDOException $e) { |
|
3108 | 3108 | return "error : ".$e->getMessage(); |
3109 | 3109 | } |
3110 | 3110 | } |
@@ -3120,7 +3120,7 @@ discard block |
||
3120 | 3120 | $Connection = new Connection(); |
3121 | 3121 | $sth = $Connection->db->prepare($query); |
3122 | 3122 | $sth->execute(); |
3123 | - } catch(PDOException $e) { |
|
3123 | + } catch (PDOException $e) { |
|
3124 | 3124 | return "error : ".$e->getMessage(); |
3125 | 3125 | } |
3126 | 3126 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3135,7 +3135,7 @@ discard block |
||
3135 | 3135 | $Connection = new Connection(); |
3136 | 3136 | $sth = $Connection->db->prepare($query); |
3137 | 3137 | $sth->execute(); |
3138 | - } catch(PDOException $e) { |
|
3138 | + } catch (PDOException $e) { |
|
3139 | 3139 | return "error : ".$e->getMessage(); |
3140 | 3140 | } |
3141 | 3141 | } |
@@ -3151,7 +3151,7 @@ discard block |
||
3151 | 3151 | $Connection = new Connection(); |
3152 | 3152 | $sth = $Connection->db->prepare($query); |
3153 | 3153 | $sth->execute(); |
3154 | - } catch(PDOException $e) { |
|
3154 | + } catch (PDOException $e) { |
|
3155 | 3155 | return "error : ".$e->getMessage(); |
3156 | 3156 | } |
3157 | 3157 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3166,7 +3166,7 @@ discard block |
||
3166 | 3166 | $Connection = new Connection(); |
3167 | 3167 | $sth = $Connection->db->prepare($query); |
3168 | 3168 | $sth->execute(); |
3169 | - } catch(PDOException $e) { |
|
3169 | + } catch (PDOException $e) { |
|
3170 | 3170 | return "error : ".$e->getMessage(); |
3171 | 3171 | } |
3172 | 3172 | } |
@@ -3182,7 +3182,7 @@ discard block |
||
3182 | 3182 | $Connection = new Connection(); |
3183 | 3183 | $sth = $Connection->db->prepare($query); |
3184 | 3184 | $sth->execute(); |
3185 | - } catch(PDOException $e) { |
|
3185 | + } catch (PDOException $e) { |
|
3186 | 3186 | return "error : ".$e->getMessage(); |
3187 | 3187 | } |
3188 | 3188 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3197,7 +3197,7 @@ discard block |
||
3197 | 3197 | $Connection = new Connection(); |
3198 | 3198 | $sth = $Connection->db->prepare($query); |
3199 | 3199 | $sth->execute(); |
3200 | - } catch(PDOException $e) { |
|
3200 | + } catch (PDOException $e) { |
|
3201 | 3201 | return "error : ".$e->getMessage(); |
3202 | 3202 | } |
3203 | 3203 | } |
@@ -3213,7 +3213,7 @@ discard block |
||
3213 | 3213 | $Connection = new Connection(); |
3214 | 3214 | $sth = $Connection->db->prepare($query); |
3215 | 3215 | $sth->execute(); |
3216 | - } catch(PDOException $e) { |
|
3216 | + } catch (PDOException $e) { |
|
3217 | 3217 | return "error : ".$e->getMessage(); |
3218 | 3218 | } |
3219 | 3219 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3232,7 +3232,7 @@ discard block |
||
3232 | 3232 | $Connection = new Connection(); |
3233 | 3233 | $sth = $Connection->db->prepare($query); |
3234 | 3234 | $sth->execute(); |
3235 | - } catch(PDOException $e) { |
|
3235 | + } catch (PDOException $e) { |
|
3236 | 3236 | return "error : ".$e->getMessage(); |
3237 | 3237 | } |
3238 | 3238 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3247,7 +3247,7 @@ discard block |
||
3247 | 3247 | $Connection = new Connection(); |
3248 | 3248 | $sth = $Connection->db->prepare($query); |
3249 | 3249 | $sth->execute(); |
3250 | - } catch(PDOException $e) { |
|
3250 | + } catch (PDOException $e) { |
|
3251 | 3251 | return "error : ".$e->getMessage(); |
3252 | 3252 | } |
3253 | 3253 | } |
@@ -3259,7 +3259,7 @@ discard block |
||
3259 | 3259 | $Connection = new Connection(); |
3260 | 3260 | $sth = $Connection->db->prepare($query); |
3261 | 3261 | $sth->execute(); |
3262 | - } catch(PDOException $e) { |
|
3262 | + } catch (PDOException $e) { |
|
3263 | 3263 | return "error : ".$e->getMessage(); |
3264 | 3264 | } |
3265 | 3265 | } |
@@ -3275,7 +3275,7 @@ discard block |
||
3275 | 3275 | $Connection = new Connection(); |
3276 | 3276 | $sth = $Connection->db->prepare($query); |
3277 | 3277 | $sth->execute(); |
3278 | - } catch(PDOException $e) { |
|
3278 | + } catch (PDOException $e) { |
|
3279 | 3279 | return "error : ".$e->getMessage(); |
3280 | 3280 | } |
3281 | 3281 | } |
@@ -3290,7 +3290,7 @@ discard block |
||
3290 | 3290 | $Connection = new Connection(); |
3291 | 3291 | $sth = $Connection->db->prepare($query); |
3292 | 3292 | $sth->execute(); |
3293 | - } catch(PDOException $e) { |
|
3293 | + } catch (PDOException $e) { |
|
3294 | 3294 | return "error : ".$e->getMessage(); |
3295 | 3295 | } |
3296 | 3296 | } |
@@ -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 | //print_r($mfr); |
1117 | 1252 | return ''; |
@@ -1136,11 +1271,15 @@ discard block |
||
1136 | 1271 | $i = 0; |
1137 | 1272 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
1138 | 1273 | //$Connection->db->beginTransaction(); |
1139 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1274 | + if ($globalTransaction) { |
|
1275 | + $Connection->db->beginTransaction(); |
|
1276 | + } |
|
1140 | 1277 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1141 | 1278 | { |
1142 | 1279 | if ($i > 0) { |
1143 | - if ($data[1] == 'NULL') $data[1] = $data[0]; |
|
1280 | + if ($data[1] == 'NULL') { |
|
1281 | + $data[1] = $data[0]; |
|
1282 | + } |
|
1144 | 1283 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
1145 | 1284 | try { |
1146 | 1285 | $sth = $Connection->db->prepare($query); |
@@ -1152,7 +1291,9 @@ discard block |
||
1152 | 1291 | $i++; |
1153 | 1292 | } |
1154 | 1293 | fclose($handle); |
1155 | - if ($globalTransaction) $Connection->db->commit(); |
|
1294 | + if ($globalTransaction) { |
|
1295 | + $Connection->db->commit(); |
|
1296 | + } |
|
1156 | 1297 | } |
1157 | 1298 | return ''; |
1158 | 1299 | } |
@@ -1173,7 +1314,9 @@ discard block |
||
1173 | 1314 | if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE) |
1174 | 1315 | { |
1175 | 1316 | $i = 0; |
1176 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1317 | + if ($globalTransaction) { |
|
1318 | + $Connection->db->beginTransaction(); |
|
1319 | + } |
|
1177 | 1320 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1178 | 1321 | { |
1179 | 1322 | if ($i > 0) { |
@@ -1189,7 +1332,9 @@ discard block |
||
1189 | 1332 | $i++; |
1190 | 1333 | } |
1191 | 1334 | fclose($handle); |
1192 | - if ($globalTransaction) $Connection->db->commit(); |
|
1335 | + if ($globalTransaction) { |
|
1336 | + $Connection->db->commit(); |
|
1337 | + } |
|
1193 | 1338 | } |
1194 | 1339 | return ''; |
1195 | 1340 | } |
@@ -1209,7 +1354,9 @@ discard block |
||
1209 | 1354 | if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE) |
1210 | 1355 | { |
1211 | 1356 | $i = 0; |
1212 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1357 | + if ($globalTransaction) { |
|
1358 | + $Connection->db->beginTransaction(); |
|
1359 | + } |
|
1213 | 1360 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1214 | 1361 | { |
1215 | 1362 | if ($i > 0) { |
@@ -1218,13 +1365,17 @@ discard block |
||
1218 | 1365 | $sth = $Connection->db->prepare($query); |
1219 | 1366 | $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')); |
1220 | 1367 | } catch(PDOException $e) { |
1221 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
1368 | + if ($globalDebug) { |
|
1369 | + echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
1370 | + } |
|
1222 | 1371 | } |
1223 | 1372 | } |
1224 | 1373 | $i++; |
1225 | 1374 | } |
1226 | 1375 | fclose($handle); |
1227 | - if ($globalTransaction) $Connection->db->commit(); |
|
1376 | + if ($globalTransaction) { |
|
1377 | + $Connection->db->commit(); |
|
1378 | + } |
|
1228 | 1379 | } |
1229 | 1380 | return ''; |
1230 | 1381 | } |
@@ -1249,7 +1400,9 @@ discard block |
||
1249 | 1400 | $i = 0; |
1250 | 1401 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
1251 | 1402 | //$Connection->db->beginTransaction(); |
1252 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1403 | + if ($globalTransaction) { |
|
1404 | + $Connection->db->beginTransaction(); |
|
1405 | + } |
|
1253 | 1406 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1254 | 1407 | { |
1255 | 1408 | if ($i > 0) { |
@@ -1265,7 +1418,9 @@ discard block |
||
1265 | 1418 | $i++; |
1266 | 1419 | } |
1267 | 1420 | fclose($handle); |
1268 | - if ($globalTransaction) $Connection->db->commit(); |
|
1421 | + if ($globalTransaction) { |
|
1422 | + $Connection->db->commit(); |
|
1423 | + } |
|
1269 | 1424 | } |
1270 | 1425 | return ''; |
1271 | 1426 | } |
@@ -1285,7 +1440,9 @@ discard block |
||
1285 | 1440 | if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE) |
1286 | 1441 | { |
1287 | 1442 | $i = 0; |
1288 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1443 | + if ($globalTransaction) { |
|
1444 | + $Connection->db->beginTransaction(); |
|
1445 | + } |
|
1289 | 1446 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1290 | 1447 | { |
1291 | 1448 | if ($i > 0) { |
@@ -1302,7 +1459,9 @@ discard block |
||
1302 | 1459 | $i++; |
1303 | 1460 | } |
1304 | 1461 | fclose($handle); |
1305 | - if ($globalTransaction) $Connection->db->commit(); |
|
1462 | + if ($globalTransaction) { |
|
1463 | + $Connection->db->commit(); |
|
1464 | + } |
|
1306 | 1465 | } |
1307 | 1466 | return ''; |
1308 | 1467 | } |
@@ -1321,7 +1480,9 @@ discard block |
||
1321 | 1480 | $Connection = new Connection(); |
1322 | 1481 | if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE) |
1323 | 1482 | { |
1324 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1483 | + if ($globalTransaction) { |
|
1484 | + $Connection->db->beginTransaction(); |
|
1485 | + } |
|
1325 | 1486 | while (($data = fgetcsv($handle, 1000)) !== FALSE) |
1326 | 1487 | { |
1327 | 1488 | $query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL'; |
@@ -1336,7 +1497,9 @@ discard block |
||
1336 | 1497 | } |
1337 | 1498 | } |
1338 | 1499 | fclose($handle); |
1339 | - if ($globalTransaction) $Connection->db->commit(); |
|
1500 | + if ($globalTransaction) { |
|
1501 | + $Connection->db->commit(); |
|
1502 | + } |
|
1340 | 1503 | } |
1341 | 1504 | return ''; |
1342 | 1505 | } |
@@ -1412,9 +1575,14 @@ discard block |
||
1412 | 1575 | if ($i > 0 && $data[0] != '') { |
1413 | 1576 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
1414 | 1577 | $period = str_replace(',','',$data[14]); |
1415 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
1416 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
1417 | - else $launch_date = NULL; |
|
1578 | + if (!empty($period) && strpos($period,'days')) { |
|
1579 | + $period = str_replace(' days','',$period)*24*60; |
|
1580 | + } |
|
1581 | + if ($data[18] != '') { |
|
1582 | + $launch_date = date('Y-m-d',strtotime($data[18])); |
|
1583 | + } else { |
|
1584 | + $launch_date = NULL; |
|
1585 | + } |
|
1418 | 1586 | $data = array_map(function($value) { |
1419 | 1587 | return trim($value) === '' ? null : $value; |
1420 | 1588 | }, $data); |
@@ -1767,7 +1935,9 @@ discard block |
||
1767 | 1935 | if (($handle = fopen($filename, 'r')) !== FALSE) |
1768 | 1936 | { |
1769 | 1937 | $i = 0; |
1770 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1938 | + if ($globalTransaction) { |
|
1939 | + $Connection->db->beginTransaction(); |
|
1940 | + } |
|
1771 | 1941 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1772 | 1942 | { |
1773 | 1943 | $i++; |
@@ -1795,7 +1965,9 @@ discard block |
||
1795 | 1965 | } |
1796 | 1966 | } |
1797 | 1967 | fclose($handle); |
1798 | - if ($globalTransaction) $Connection->db->commit(); |
|
1968 | + if ($globalTransaction) { |
|
1969 | + $Connection->db->commit(); |
|
1970 | + } |
|
1799 | 1971 | } |
1800 | 1972 | return ''; |
1801 | 1973 | } |
@@ -1818,7 +1990,9 @@ discard block |
||
1818 | 1990 | $Connection = new Connection(); |
1819 | 1991 | if (($handle = fopen($filename, 'r')) !== FALSE) |
1820 | 1992 | { |
1821 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
1993 | + if ($globalTransaction) { |
|
1994 | + $Connection->db->beginTransaction(); |
|
1995 | + } |
|
1822 | 1996 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
1823 | 1997 | { |
1824 | 1998 | if(count($row) > 1) { |
@@ -1832,7 +2006,9 @@ discard block |
||
1832 | 2006 | } |
1833 | 2007 | } |
1834 | 2008 | fclose($handle); |
1835 | - if ($globalTransaction) $Connection->db->commit(); |
|
2009 | + if ($globalTransaction) { |
|
2010 | + $Connection->db->commit(); |
|
2011 | + } |
|
1836 | 2012 | } |
1837 | 2013 | return ''; |
1838 | 2014 | } |
@@ -1852,8 +2028,9 @@ discard block |
||
1852 | 2028 | } |
1853 | 2029 | |
1854 | 2030 | |
1855 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
1856 | - else { |
|
2031 | + if ($globalDBdriver == 'mysql') { |
|
2032 | + update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
2033 | + } else { |
|
1857 | 2034 | update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
1858 | 2035 | $query = "CREATE EXTENSION postgis"; |
1859 | 2036 | $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
@@ -1872,20 +2049,30 @@ discard block |
||
1872 | 2049 | global $tmp_dir, $globalDebug; |
1873 | 2050 | include_once('class.create_db.php'); |
1874 | 2051 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
1875 | - if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
|
2052 | + if ($globalDebug) { |
|
2053 | + echo "NOTAM from FlightAirMap website : Download..."; |
|
2054 | + } |
|
1876 | 2055 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
1877 | 2056 | $error = ''; |
1878 | 2057 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
1879 | - if ($globalDebug) echo "Gunzip..."; |
|
2058 | + if ($globalDebug) { |
|
2059 | + echo "Gunzip..."; |
|
2060 | + } |
|
1880 | 2061 | update_db::gunzip($tmp_dir.'notam.txt.gz'); |
1881 | - if ($globalDebug) echo "Add to DB..."; |
|
2062 | + if ($globalDebug) { |
|
2063 | + echo "Add to DB..."; |
|
2064 | + } |
|
1882 | 2065 | //$error = create_db::import_file($tmp_dir.'notam.sql'); |
1883 | 2066 | $NOTAM = new NOTAM(); |
1884 | 2067 | $NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt'); |
1885 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
2068 | + } else { |
|
2069 | + $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
2070 | + } |
|
1886 | 2071 | if ($error != '') { |
1887 | 2072 | return $error; |
1888 | - } elseif ($globalDebug) echo "Done\n"; |
|
2073 | + } elseif ($globalDebug) { |
|
2074 | + echo "Done\n"; |
|
2075 | + } |
|
1889 | 2076 | return ''; |
1890 | 2077 | } |
1891 | 2078 | |
@@ -1939,67 +2126,111 @@ discard block |
||
1939 | 2126 | //if ($globalDebug) echo "IVAO : Download..."; |
1940 | 2127 | //update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip'); |
1941 | 2128 | if (file_exists($tmp_dir.'ivae_feb2013.zip')) { |
1942 | - if ($globalDebug) echo "Unzip..."; |
|
2129 | + if ($globalDebug) { |
|
2130 | + echo "Unzip..."; |
|
2131 | + } |
|
1943 | 2132 | update_db::unzip($tmp_dir.'ivae_feb2013.zip'); |
1944 | - if ($globalDebug) echo "Add to DB..."; |
|
2133 | + if ($globalDebug) { |
|
2134 | + echo "Add to DB..."; |
|
2135 | + } |
|
1945 | 2136 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
1946 | - if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
|
2137 | + if ($globalDebug) { |
|
2138 | + echo "Copy airlines logos to airlines images directory..."; |
|
2139 | + } |
|
1947 | 2140 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
1948 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
1949 | - } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
1950 | - } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
2141 | + if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) { |
|
2142 | + $error = "Failed to copy airlines logo."; |
|
2143 | + } |
|
2144 | + } else { |
|
2145 | + $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
2146 | + } |
|
2147 | + } else { |
|
2148 | + $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
2149 | + } |
|
1951 | 2150 | if ($error != '') { |
1952 | 2151 | return $error; |
1953 | - } elseif ($globalDebug) echo "Done\n"; |
|
2152 | + } elseif ($globalDebug) { |
|
2153 | + echo "Done\n"; |
|
2154 | + } |
|
1954 | 2155 | return ''; |
1955 | 2156 | } |
1956 | 2157 | |
1957 | 2158 | public static function update_routes() { |
1958 | 2159 | global $tmp_dir, $globalDebug; |
1959 | 2160 | $error = ''; |
1960 | - if ($globalDebug) echo "Routes : Download..."; |
|
2161 | + if ($globalDebug) { |
|
2162 | + echo "Routes : Download..."; |
|
2163 | + } |
|
1961 | 2164 | update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
1962 | 2165 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
1963 | - if ($globalDebug) echo "Gunzip..."; |
|
2166 | + if ($globalDebug) { |
|
2167 | + echo "Gunzip..."; |
|
2168 | + } |
|
1964 | 2169 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
1965 | - if ($globalDebug) echo "Add to DB..."; |
|
2170 | + if ($globalDebug) { |
|
2171 | + echo "Add to DB..."; |
|
2172 | + } |
|
1966 | 2173 | $error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb'); |
1967 | - } else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
2174 | + } else { |
|
2175 | + $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
2176 | + } |
|
1968 | 2177 | if ($error != '') { |
1969 | 2178 | return $error; |
1970 | - } elseif ($globalDebug) echo "Done\n"; |
|
2179 | + } elseif ($globalDebug) { |
|
2180 | + echo "Done\n"; |
|
2181 | + } |
|
1971 | 2182 | return ''; |
1972 | 2183 | } |
1973 | 2184 | public static function update_oneworld() { |
1974 | 2185 | global $tmp_dir, $globalDebug; |
1975 | 2186 | $error = ''; |
1976 | - if ($globalDebug) echo "Schedules Oneworld : Download..."; |
|
2187 | + if ($globalDebug) { |
|
2188 | + echo "Schedules Oneworld : Download..."; |
|
2189 | + } |
|
1977 | 2190 | update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
1978 | 2191 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
1979 | - if ($globalDebug) echo "Gunzip..."; |
|
2192 | + if ($globalDebug) { |
|
2193 | + echo "Gunzip..."; |
|
2194 | + } |
|
1980 | 2195 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
1981 | - if ($globalDebug) echo "Add to DB..."; |
|
2196 | + if ($globalDebug) { |
|
2197 | + echo "Add to DB..."; |
|
2198 | + } |
|
1982 | 2199 | $error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv'); |
1983 | - } else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
2200 | + } else { |
|
2201 | + $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
2202 | + } |
|
1984 | 2203 | if ($error != '') { |
1985 | 2204 | return $error; |
1986 | - } elseif ($globalDebug) echo "Done\n"; |
|
2205 | + } elseif ($globalDebug) { |
|
2206 | + echo "Done\n"; |
|
2207 | + } |
|
1987 | 2208 | return ''; |
1988 | 2209 | } |
1989 | 2210 | public static function update_skyteam() { |
1990 | 2211 | global $tmp_dir, $globalDebug; |
1991 | 2212 | $error = ''; |
1992 | - if ($globalDebug) echo "Schedules Skyteam : Download..."; |
|
2213 | + if ($globalDebug) { |
|
2214 | + echo "Schedules Skyteam : Download..."; |
|
2215 | + } |
|
1993 | 2216 | update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
1994 | 2217 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
1995 | - if ($globalDebug) echo "Gunzip..."; |
|
2218 | + if ($globalDebug) { |
|
2219 | + echo "Gunzip..."; |
|
2220 | + } |
|
1996 | 2221 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
1997 | - if ($globalDebug) echo "Add to DB..."; |
|
2222 | + if ($globalDebug) { |
|
2223 | + echo "Add to DB..."; |
|
2224 | + } |
|
1998 | 2225 | $error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv'); |
1999 | - } else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
2226 | + } else { |
|
2227 | + $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
2228 | + } |
|
2000 | 2229 | if ($error != '') { |
2001 | 2230 | return $error; |
2002 | - } elseif ($globalDebug) echo "Done\n"; |
|
2231 | + } elseif ($globalDebug) { |
|
2232 | + echo "Done\n"; |
|
2233 | + } |
|
2003 | 2234 | return ''; |
2004 | 2235 | } |
2005 | 2236 | public static function update_ModeS() { |
@@ -2016,355 +2247,619 @@ discard block |
||
2016 | 2247 | exit; |
2017 | 2248 | } elseif ($globalDebug) echo "Done\n"; |
2018 | 2249 | */ |
2019 | - if ($globalDebug) echo "Modes : Download..."; |
|
2020 | -// update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
2250 | + if ($globalDebug) { |
|
2251 | + echo "Modes : Download..."; |
|
2252 | + } |
|
2253 | + // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
2021 | 2254 | update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
2022 | 2255 | |
2023 | 2256 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
2024 | 2257 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
2025 | - if ($globalDebug) echo "Unzip..."; |
|
2026 | -// update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
2258 | + if ($globalDebug) { |
|
2259 | + echo "Unzip..."; |
|
2260 | + } |
|
2261 | + // update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
2027 | 2262 | update_db::gunzip($tmp_dir.'BaseStation.sqb.gz'); |
2028 | - if ($globalDebug) echo "Add to DB..."; |
|
2263 | + if ($globalDebug) { |
|
2264 | + echo "Add to DB..."; |
|
2265 | + } |
|
2029 | 2266 | $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb'); |
2030 | 2267 | // $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb'); |
2031 | - } else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
2268 | + } else { |
|
2269 | + $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
2270 | + } |
|
2032 | 2271 | if ($error != '') { |
2033 | 2272 | return $error; |
2034 | - } elseif ($globalDebug) echo "Done\n"; |
|
2273 | + } elseif ($globalDebug) { |
|
2274 | + echo "Done\n"; |
|
2275 | + } |
|
2035 | 2276 | return ''; |
2036 | 2277 | } |
2037 | 2278 | |
2038 | 2279 | public static function update_ModeS_faa() { |
2039 | 2280 | global $tmp_dir, $globalDebug; |
2040 | - if ($globalDebug) echo "Modes FAA: Download..."; |
|
2281 | + if ($globalDebug) { |
|
2282 | + echo "Modes FAA: Download..."; |
|
2283 | + } |
|
2041 | 2284 | update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
2042 | 2285 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
2043 | - if ($globalDebug) echo "Unzip..."; |
|
2286 | + if ($globalDebug) { |
|
2287 | + echo "Unzip..."; |
|
2288 | + } |
|
2044 | 2289 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
2045 | - if ($globalDebug) echo "Add to DB..."; |
|
2290 | + if ($globalDebug) { |
|
2291 | + echo "Add to DB..."; |
|
2292 | + } |
|
2046 | 2293 | $error = update_db::modes_faa(); |
2047 | - } else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
2294 | + } else { |
|
2295 | + $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
2296 | + } |
|
2048 | 2297 | if ($error != '') { |
2049 | 2298 | return $error; |
2050 | - } elseif ($globalDebug) echo "Done\n"; |
|
2299 | + } elseif ($globalDebug) { |
|
2300 | + echo "Done\n"; |
|
2301 | + } |
|
2051 | 2302 | return ''; |
2052 | 2303 | } |
2053 | 2304 | |
2054 | 2305 | public static function update_ModeS_flarm() { |
2055 | 2306 | global $tmp_dir, $globalDebug; |
2056 | - if ($globalDebug) echo "Modes Flarmnet: Download..."; |
|
2307 | + if ($globalDebug) { |
|
2308 | + echo "Modes Flarmnet: Download..."; |
|
2309 | + } |
|
2057 | 2310 | update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
2058 | 2311 | if (file_exists($tmp_dir.'data.fln')) { |
2059 | - if ($globalDebug) echo "Add to DB..."; |
|
2312 | + if ($globalDebug) { |
|
2313 | + echo "Add to DB..."; |
|
2314 | + } |
|
2060 | 2315 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
2061 | - } else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
2316 | + } else { |
|
2317 | + $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
2318 | + } |
|
2062 | 2319 | if ($error != '') { |
2063 | 2320 | return $error; |
2064 | - } elseif ($globalDebug) echo "Done\n"; |
|
2321 | + } elseif ($globalDebug) { |
|
2322 | + echo "Done\n"; |
|
2323 | + } |
|
2065 | 2324 | return ''; |
2066 | 2325 | } |
2067 | 2326 | |
2068 | 2327 | public static function update_ModeS_ogn() { |
2069 | 2328 | global $tmp_dir, $globalDebug; |
2070 | - if ($globalDebug) echo "Modes OGN: Download..."; |
|
2329 | + if ($globalDebug) { |
|
2330 | + echo "Modes OGN: Download..."; |
|
2331 | + } |
|
2071 | 2332 | update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
2072 | 2333 | if (file_exists($tmp_dir.'ogn.csv')) { |
2073 | - if ($globalDebug) echo "Add to DB..."; |
|
2334 | + if ($globalDebug) { |
|
2335 | + echo "Add to DB..."; |
|
2336 | + } |
|
2074 | 2337 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
2075 | - } else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
2338 | + } else { |
|
2339 | + $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
2340 | + } |
|
2076 | 2341 | if ($error != '') { |
2077 | 2342 | return $error; |
2078 | - } elseif ($globalDebug) echo "Done\n"; |
|
2343 | + } elseif ($globalDebug) { |
|
2344 | + echo "Done\n"; |
|
2345 | + } |
|
2079 | 2346 | return ''; |
2080 | 2347 | } |
2081 | 2348 | |
2082 | 2349 | public static function update_owner() { |
2083 | 2350 | global $tmp_dir, $globalDebug, $globalMasterSource; |
2084 | 2351 | |
2085 | - if ($globalDebug) echo "Owner France: Download..."; |
|
2352 | + if ($globalDebug) { |
|
2353 | + echo "Owner France: Download..."; |
|
2354 | + } |
|
2086 | 2355 | update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
2087 | 2356 | if (file_exists($tmp_dir.'owner_f.csv')) { |
2088 | - if ($globalDebug) echo "Add to DB..."; |
|
2357 | + if ($globalDebug) { |
|
2358 | + echo "Add to DB..."; |
|
2359 | + } |
|
2089 | 2360 | $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
2090 | - } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
2361 | + } else { |
|
2362 | + $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
2363 | + } |
|
2091 | 2364 | if ($error != '') { |
2092 | 2365 | return $error; |
2093 | - } elseif ($globalDebug) echo "Done\n"; |
|
2366 | + } elseif ($globalDebug) { |
|
2367 | + echo "Done\n"; |
|
2368 | + } |
|
2094 | 2369 | |
2095 | - if ($globalDebug) echo "Owner Ireland: Download..."; |
|
2370 | + if ($globalDebug) { |
|
2371 | + echo "Owner Ireland: Download..."; |
|
2372 | + } |
|
2096 | 2373 | update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
2097 | 2374 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
2098 | - if ($globalDebug) echo "Add to DB..."; |
|
2375 | + if ($globalDebug) { |
|
2376 | + echo "Add to DB..."; |
|
2377 | + } |
|
2099 | 2378 | $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
2100 | - } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
2379 | + } else { |
|
2380 | + $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
2381 | + } |
|
2101 | 2382 | if ($error != '') { |
2102 | 2383 | return $error; |
2103 | - } elseif ($globalDebug) echo "Done\n"; |
|
2104 | - if ($globalDebug) echo "Owner Switzerland: Download..."; |
|
2384 | + } elseif ($globalDebug) { |
|
2385 | + echo "Done\n"; |
|
2386 | + } |
|
2387 | + if ($globalDebug) { |
|
2388 | + echo "Owner Switzerland: Download..."; |
|
2389 | + } |
|
2105 | 2390 | update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
2106 | 2391 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
2107 | - if ($globalDebug) echo "Add to DB..."; |
|
2392 | + if ($globalDebug) { |
|
2393 | + echo "Add to DB..."; |
|
2394 | + } |
|
2108 | 2395 | $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
2109 | - } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
2396 | + } else { |
|
2397 | + $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
2398 | + } |
|
2110 | 2399 | if ($error != '') { |
2111 | 2400 | return $error; |
2112 | - } elseif ($globalDebug) echo "Done\n"; |
|
2113 | - if ($globalDebug) echo "Owner Czech Republic: Download..."; |
|
2401 | + } elseif ($globalDebug) { |
|
2402 | + echo "Done\n"; |
|
2403 | + } |
|
2404 | + if ($globalDebug) { |
|
2405 | + echo "Owner Czech Republic: Download..."; |
|
2406 | + } |
|
2114 | 2407 | update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
2115 | 2408 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
2116 | - if ($globalDebug) echo "Add to DB..."; |
|
2409 | + if ($globalDebug) { |
|
2410 | + echo "Add to DB..."; |
|
2411 | + } |
|
2117 | 2412 | $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
2118 | - } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
2413 | + } else { |
|
2414 | + $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
2415 | + } |
|
2119 | 2416 | if ($error != '') { |
2120 | 2417 | return $error; |
2121 | - } elseif ($globalDebug) echo "Done\n"; |
|
2122 | - if ($globalDebug) echo "Owner Australia: Download..."; |
|
2418 | + } elseif ($globalDebug) { |
|
2419 | + echo "Done\n"; |
|
2420 | + } |
|
2421 | + if ($globalDebug) { |
|
2422 | + echo "Owner Australia: Download..."; |
|
2423 | + } |
|
2123 | 2424 | update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
2124 | 2425 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
2125 | - if ($globalDebug) echo "Add to DB..."; |
|
2426 | + if ($globalDebug) { |
|
2427 | + echo "Add to DB..."; |
|
2428 | + } |
|
2126 | 2429 | $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
2127 | - } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
2430 | + } else { |
|
2431 | + $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
2432 | + } |
|
2128 | 2433 | if ($error != '') { |
2129 | 2434 | return $error; |
2130 | - } elseif ($globalDebug) echo "Done\n"; |
|
2131 | - if ($globalDebug) echo "Owner Austria: Download..."; |
|
2435 | + } elseif ($globalDebug) { |
|
2436 | + echo "Done\n"; |
|
2437 | + } |
|
2438 | + if ($globalDebug) { |
|
2439 | + echo "Owner Austria: Download..."; |
|
2440 | + } |
|
2132 | 2441 | update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
2133 | 2442 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
2134 | - if ($globalDebug) echo "Add to DB..."; |
|
2443 | + if ($globalDebug) { |
|
2444 | + echo "Add to DB..."; |
|
2445 | + } |
|
2135 | 2446 | $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
2136 | - } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
2447 | + } else { |
|
2448 | + $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
2449 | + } |
|
2137 | 2450 | if ($error != '') { |
2138 | 2451 | return $error; |
2139 | - } elseif ($globalDebug) echo "Done\n"; |
|
2140 | - if ($globalDebug) echo "Owner Chile: Download..."; |
|
2452 | + } elseif ($globalDebug) { |
|
2453 | + echo "Done\n"; |
|
2454 | + } |
|
2455 | + if ($globalDebug) { |
|
2456 | + echo "Owner Chile: Download..."; |
|
2457 | + } |
|
2141 | 2458 | update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
2142 | 2459 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
2143 | - if ($globalDebug) echo "Add to DB..."; |
|
2460 | + if ($globalDebug) { |
|
2461 | + echo "Add to DB..."; |
|
2462 | + } |
|
2144 | 2463 | $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
2145 | - } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
2464 | + } else { |
|
2465 | + $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
2466 | + } |
|
2146 | 2467 | if ($error != '') { |
2147 | 2468 | return $error; |
2148 | - } elseif ($globalDebug) echo "Done\n"; |
|
2149 | - if ($globalDebug) echo "Owner Colombia: Download..."; |
|
2469 | + } elseif ($globalDebug) { |
|
2470 | + echo "Done\n"; |
|
2471 | + } |
|
2472 | + if ($globalDebug) { |
|
2473 | + echo "Owner Colombia: Download..."; |
|
2474 | + } |
|
2150 | 2475 | update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
2151 | 2476 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
2152 | - if ($globalDebug) echo "Add to DB..."; |
|
2477 | + if ($globalDebug) { |
|
2478 | + echo "Add to DB..."; |
|
2479 | + } |
|
2153 | 2480 | $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
2154 | - } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
2481 | + } else { |
|
2482 | + $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
2483 | + } |
|
2155 | 2484 | if ($error != '') { |
2156 | 2485 | return $error; |
2157 | - } elseif ($globalDebug) echo "Done\n"; |
|
2158 | - if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
|
2486 | + } elseif ($globalDebug) { |
|
2487 | + echo "Done\n"; |
|
2488 | + } |
|
2489 | + if ($globalDebug) { |
|
2490 | + echo "Owner Bosnia Herzegobina: Download..."; |
|
2491 | + } |
|
2159 | 2492 | update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
2160 | 2493 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
2161 | - if ($globalDebug) echo "Add to DB..."; |
|
2494 | + if ($globalDebug) { |
|
2495 | + echo "Add to DB..."; |
|
2496 | + } |
|
2162 | 2497 | $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
2163 | - } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
2498 | + } else { |
|
2499 | + $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
2500 | + } |
|
2164 | 2501 | if ($error != '') { |
2165 | 2502 | return $error; |
2166 | - } elseif ($globalDebug) echo "Done\n"; |
|
2167 | - if ($globalDebug) echo "Owner Brazil: Download..."; |
|
2503 | + } elseif ($globalDebug) { |
|
2504 | + echo "Done\n"; |
|
2505 | + } |
|
2506 | + if ($globalDebug) { |
|
2507 | + echo "Owner Brazil: Download..."; |
|
2508 | + } |
|
2168 | 2509 | update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
2169 | 2510 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
2170 | - if ($globalDebug) echo "Add to DB..."; |
|
2511 | + if ($globalDebug) { |
|
2512 | + echo "Add to DB..."; |
|
2513 | + } |
|
2171 | 2514 | $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
2172 | - } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
2515 | + } else { |
|
2516 | + $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
2517 | + } |
|
2173 | 2518 | if ($error != '') { |
2174 | 2519 | return $error; |
2175 | - } elseif ($globalDebug) echo "Done\n"; |
|
2176 | - if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
|
2520 | + } elseif ($globalDebug) { |
|
2521 | + echo "Done\n"; |
|
2522 | + } |
|
2523 | + if ($globalDebug) { |
|
2524 | + echo "Owner Cayman Islands: Download..."; |
|
2525 | + } |
|
2177 | 2526 | update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
2178 | 2527 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
2179 | - if ($globalDebug) echo "Add to DB..."; |
|
2528 | + if ($globalDebug) { |
|
2529 | + echo "Add to DB..."; |
|
2530 | + } |
|
2180 | 2531 | $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
2181 | - } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
2532 | + } else { |
|
2533 | + $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
2534 | + } |
|
2182 | 2535 | if ($error != '') { |
2183 | 2536 | return $error; |
2184 | - } elseif ($globalDebug) echo "Done\n"; |
|
2185 | - if ($globalDebug) echo "Owner Croatia: Download..."; |
|
2537 | + } elseif ($globalDebug) { |
|
2538 | + echo "Done\n"; |
|
2539 | + } |
|
2540 | + if ($globalDebug) { |
|
2541 | + echo "Owner Croatia: Download..."; |
|
2542 | + } |
|
2186 | 2543 | update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
2187 | 2544 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
2188 | - if ($globalDebug) echo "Add to DB..."; |
|
2545 | + if ($globalDebug) { |
|
2546 | + echo "Add to DB..."; |
|
2547 | + } |
|
2189 | 2548 | $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
2190 | - } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
2549 | + } else { |
|
2550 | + $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
2551 | + } |
|
2191 | 2552 | if ($error != '') { |
2192 | 2553 | return $error; |
2193 | - } elseif ($globalDebug) echo "Done\n"; |
|
2194 | - if ($globalDebug) echo "Owner Luxembourg: Download..."; |
|
2554 | + } elseif ($globalDebug) { |
|
2555 | + echo "Done\n"; |
|
2556 | + } |
|
2557 | + if ($globalDebug) { |
|
2558 | + echo "Owner Luxembourg: Download..."; |
|
2559 | + } |
|
2195 | 2560 | update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
2196 | 2561 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
2197 | - if ($globalDebug) echo "Add to DB..."; |
|
2562 | + if ($globalDebug) { |
|
2563 | + echo "Add to DB..."; |
|
2564 | + } |
|
2198 | 2565 | $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
2199 | - } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
2566 | + } else { |
|
2567 | + $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
2568 | + } |
|
2200 | 2569 | if ($error != '') { |
2201 | 2570 | return $error; |
2202 | - } elseif ($globalDebug) echo "Done\n"; |
|
2203 | - if ($globalDebug) echo "Owner Maldives: Download..."; |
|
2571 | + } elseif ($globalDebug) { |
|
2572 | + echo "Done\n"; |
|
2573 | + } |
|
2574 | + if ($globalDebug) { |
|
2575 | + echo "Owner Maldives: Download..."; |
|
2576 | + } |
|
2204 | 2577 | update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
2205 | 2578 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
2206 | - if ($globalDebug) echo "Add to DB..."; |
|
2579 | + if ($globalDebug) { |
|
2580 | + echo "Add to DB..."; |
|
2581 | + } |
|
2207 | 2582 | $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
2208 | - } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
2583 | + } else { |
|
2584 | + $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
2585 | + } |
|
2209 | 2586 | if ($error != '') { |
2210 | 2587 | return $error; |
2211 | - } elseif ($globalDebug) echo "Done\n"; |
|
2212 | - if ($globalDebug) echo "Owner New Zealand: Download..."; |
|
2588 | + } elseif ($globalDebug) { |
|
2589 | + echo "Done\n"; |
|
2590 | + } |
|
2591 | + if ($globalDebug) { |
|
2592 | + echo "Owner New Zealand: Download..."; |
|
2593 | + } |
|
2213 | 2594 | update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
2214 | 2595 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
2215 | - if ($globalDebug) echo "Add to DB..."; |
|
2596 | + if ($globalDebug) { |
|
2597 | + echo "Add to DB..."; |
|
2598 | + } |
|
2216 | 2599 | $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
2217 | - } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
2600 | + } else { |
|
2601 | + $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
2602 | + } |
|
2218 | 2603 | if ($error != '') { |
2219 | 2604 | return $error; |
2220 | - } elseif ($globalDebug) echo "Done\n"; |
|
2221 | - if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
|
2605 | + } elseif ($globalDebug) { |
|
2606 | + echo "Done\n"; |
|
2607 | + } |
|
2608 | + if ($globalDebug) { |
|
2609 | + echo "Owner Papua New Guinea: Download..."; |
|
2610 | + } |
|
2222 | 2611 | update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
2223 | 2612 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
2224 | - if ($globalDebug) echo "Add to DB..."; |
|
2613 | + if ($globalDebug) { |
|
2614 | + echo "Add to DB..."; |
|
2615 | + } |
|
2225 | 2616 | $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
2226 | - } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
2617 | + } else { |
|
2618 | + $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
2619 | + } |
|
2227 | 2620 | if ($error != '') { |
2228 | 2621 | return $error; |
2229 | - } elseif ($globalDebug) echo "Done\n"; |
|
2230 | - if ($globalDebug) echo "Owner Slovakia: Download..."; |
|
2622 | + } elseif ($globalDebug) { |
|
2623 | + echo "Done\n"; |
|
2624 | + } |
|
2625 | + if ($globalDebug) { |
|
2626 | + echo "Owner Slovakia: Download..."; |
|
2627 | + } |
|
2231 | 2628 | update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
2232 | 2629 | if (file_exists($tmp_dir.'owner_om.csv')) { |
2233 | - if ($globalDebug) echo "Add to DB..."; |
|
2630 | + if ($globalDebug) { |
|
2631 | + echo "Add to DB..."; |
|
2632 | + } |
|
2234 | 2633 | $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
2235 | - } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
2634 | + } else { |
|
2635 | + $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
2636 | + } |
|
2236 | 2637 | if ($error != '') { |
2237 | 2638 | return $error; |
2238 | - } elseif ($globalDebug) echo "Done\n"; |
|
2239 | - if ($globalDebug) echo "Owner Ecuador: Download..."; |
|
2639 | + } elseif ($globalDebug) { |
|
2640 | + echo "Done\n"; |
|
2641 | + } |
|
2642 | + if ($globalDebug) { |
|
2643 | + echo "Owner Ecuador: Download..."; |
|
2644 | + } |
|
2240 | 2645 | update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
2241 | 2646 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
2242 | - if ($globalDebug) echo "Add to DB..."; |
|
2647 | + if ($globalDebug) { |
|
2648 | + echo "Add to DB..."; |
|
2649 | + } |
|
2243 | 2650 | $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
2244 | - } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
2651 | + } else { |
|
2652 | + $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
2653 | + } |
|
2245 | 2654 | if ($error != '') { |
2246 | 2655 | return $error; |
2247 | - } elseif ($globalDebug) echo "Done\n"; |
|
2248 | - if ($globalDebug) echo "Owner Iceland: Download..."; |
|
2656 | + } elseif ($globalDebug) { |
|
2657 | + echo "Done\n"; |
|
2658 | + } |
|
2659 | + if ($globalDebug) { |
|
2660 | + echo "Owner Iceland: Download..."; |
|
2661 | + } |
|
2249 | 2662 | update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
2250 | 2663 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
2251 | - if ($globalDebug) echo "Add to DB..."; |
|
2664 | + if ($globalDebug) { |
|
2665 | + echo "Add to DB..."; |
|
2666 | + } |
|
2252 | 2667 | $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
2253 | - } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
2668 | + } else { |
|
2669 | + $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
2670 | + } |
|
2254 | 2671 | if ($error != '') { |
2255 | 2672 | return $error; |
2256 | - } elseif ($globalDebug) echo "Done\n"; |
|
2257 | - if ($globalDebug) echo "Owner Isle of Man: Download..."; |
|
2673 | + } elseif ($globalDebug) { |
|
2674 | + echo "Done\n"; |
|
2675 | + } |
|
2676 | + if ($globalDebug) { |
|
2677 | + echo "Owner Isle of Man: Download..."; |
|
2678 | + } |
|
2258 | 2679 | update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
2259 | 2680 | if (file_exists($tmp_dir.'owner_m.csv')) { |
2260 | - if ($globalDebug) echo "Add to DB..."; |
|
2681 | + if ($globalDebug) { |
|
2682 | + echo "Add to DB..."; |
|
2683 | + } |
|
2261 | 2684 | $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
2262 | - } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
2685 | + } else { |
|
2686 | + $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
2687 | + } |
|
2263 | 2688 | if ($error != '') { |
2264 | 2689 | return $error; |
2265 | - } elseif ($globalDebug) echo "Done\n"; |
|
2690 | + } elseif ($globalDebug) { |
|
2691 | + echo "Done\n"; |
|
2692 | + } |
|
2266 | 2693 | if ($globalMasterSource) { |
2267 | - if ($globalDebug) echo "ModeS Netherlands: Download..."; |
|
2694 | + if ($globalDebug) { |
|
2695 | + echo "ModeS Netherlands: Download..."; |
|
2696 | + } |
|
2268 | 2697 | update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
2269 | 2698 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
2270 | - if ($globalDebug) echo "Add to DB..."; |
|
2699 | + if ($globalDebug) { |
|
2700 | + echo "Add to DB..."; |
|
2701 | + } |
|
2271 | 2702 | $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
2272 | - } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
2703 | + } else { |
|
2704 | + $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
2705 | + } |
|
2273 | 2706 | if ($error != '') { |
2274 | 2707 | return $error; |
2275 | - } elseif ($globalDebug) echo "Done\n"; |
|
2276 | - if ($globalDebug) echo "ModeS Denmark: Download..."; |
|
2708 | + } elseif ($globalDebug) { |
|
2709 | + echo "Done\n"; |
|
2710 | + } |
|
2711 | + if ($globalDebug) { |
|
2712 | + echo "ModeS Denmark: Download..."; |
|
2713 | + } |
|
2277 | 2714 | update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
2278 | 2715 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
2279 | - if ($globalDebug) echo "Add to DB..."; |
|
2716 | + if ($globalDebug) { |
|
2717 | + echo "Add to DB..."; |
|
2718 | + } |
|
2280 | 2719 | $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
2281 | - } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
2720 | + } else { |
|
2721 | + $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
2722 | + } |
|
2282 | 2723 | if ($error != '') { |
2283 | 2724 | return $error; |
2284 | - } elseif ($globalDebug) echo "Done\n"; |
|
2285 | - } elseif ($globalDebug) echo "Done\n"; |
|
2725 | + } elseif ($globalDebug) { |
|
2726 | + echo "Done\n"; |
|
2727 | + } |
|
2728 | + } elseif ($globalDebug) { |
|
2729 | + echo "Done\n"; |
|
2730 | + } |
|
2286 | 2731 | return ''; |
2287 | 2732 | } |
2288 | 2733 | |
2289 | 2734 | public static function update_translation() { |
2290 | 2735 | global $tmp_dir, $globalDebug; |
2291 | 2736 | $error = ''; |
2292 | - if ($globalDebug) echo "Translation : Download..."; |
|
2737 | + if ($globalDebug) { |
|
2738 | + echo "Translation : Download..."; |
|
2739 | + } |
|
2293 | 2740 | update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
2294 | 2741 | if (file_exists($tmp_dir.'translation.zip')) { |
2295 | - if ($globalDebug) echo "Unzip..."; |
|
2742 | + if ($globalDebug) { |
|
2743 | + echo "Unzip..."; |
|
2744 | + } |
|
2296 | 2745 | update_db::unzip($tmp_dir.'translation.zip'); |
2297 | - if ($globalDebug) echo "Add to DB..."; |
|
2746 | + if ($globalDebug) { |
|
2747 | + echo "Add to DB..."; |
|
2748 | + } |
|
2298 | 2749 | $error = update_db::translation(); |
2299 | - } else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
2750 | + } else { |
|
2751 | + $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
2752 | + } |
|
2300 | 2753 | if ($error != '') { |
2301 | 2754 | return $error; |
2302 | - } elseif ($globalDebug) echo "Done\n"; |
|
2755 | + } elseif ($globalDebug) { |
|
2756 | + echo "Done\n"; |
|
2757 | + } |
|
2303 | 2758 | return ''; |
2304 | 2759 | } |
2305 | 2760 | |
2306 | 2761 | public static function update_translation_fam() { |
2307 | 2762 | global $tmp_dir, $globalDebug; |
2308 | - if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
|
2763 | + if ($globalDebug) { |
|
2764 | + echo "Translation from FlightAirMap website : Download..."; |
|
2765 | + } |
|
2309 | 2766 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
2310 | 2767 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
2311 | - if ($globalDebug) echo "Gunzip..."; |
|
2768 | + if ($globalDebug) { |
|
2769 | + echo "Gunzip..."; |
|
2770 | + } |
|
2312 | 2771 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
2313 | - if ($globalDebug) echo "Add to DB..."; |
|
2772 | + if ($globalDebug) { |
|
2773 | + echo "Add to DB..."; |
|
2774 | + } |
|
2314 | 2775 | $error = update_db::translation_fam(); |
2315 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
2776 | + } else { |
|
2777 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
2778 | + } |
|
2316 | 2779 | if ($error != '') { |
2317 | 2780 | return $error; |
2318 | - } elseif ($globalDebug) echo "Done\n"; |
|
2781 | + } elseif ($globalDebug) { |
|
2782 | + echo "Done\n"; |
|
2783 | + } |
|
2319 | 2784 | return ''; |
2320 | 2785 | } |
2321 | 2786 | public static function update_ModeS_fam() { |
2322 | 2787 | global $tmp_dir, $globalDebug; |
2323 | - if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
|
2788 | + if ($globalDebug) { |
|
2789 | + echo "ModeS from FlightAirMap website : Download..."; |
|
2790 | + } |
|
2324 | 2791 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
2325 | 2792 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
2326 | - if ($globalDebug) echo "Gunzip..."; |
|
2793 | + if ($globalDebug) { |
|
2794 | + echo "Gunzip..."; |
|
2795 | + } |
|
2327 | 2796 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
2328 | - if ($globalDebug) echo "Add to DB..."; |
|
2797 | + if ($globalDebug) { |
|
2798 | + echo "Add to DB..."; |
|
2799 | + } |
|
2329 | 2800 | $error = update_db::modes_fam(); |
2330 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
2801 | + } else { |
|
2802 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
2803 | + } |
|
2331 | 2804 | if ($error != '') { |
2332 | 2805 | return $error; |
2333 | - } elseif ($globalDebug) echo "Done\n"; |
|
2806 | + } elseif ($globalDebug) { |
|
2807 | + echo "Done\n"; |
|
2808 | + } |
|
2334 | 2809 | return ''; |
2335 | 2810 | } |
2336 | 2811 | public static function update_owner_fam() { |
2337 | 2812 | global $tmp_dir, $globalDebug, $globalOwner; |
2338 | - if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
|
2813 | + if ($globalDebug) { |
|
2814 | + echo "owner from FlightAirMap website : Download..."; |
|
2815 | + } |
|
2339 | 2816 | if ($globalOwner === TRUE) { |
2340 | 2817 | update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
2341 | 2818 | } else { |
2342 | 2819 | update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
2343 | 2820 | } |
2344 | 2821 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
2345 | - if ($globalDebug) echo "Gunzip..."; |
|
2822 | + if ($globalDebug) { |
|
2823 | + echo "Gunzip..."; |
|
2824 | + } |
|
2346 | 2825 | update_db::gunzip($tmp_dir.'owners.tsv.gz'); |
2347 | - if ($globalDebug) echo "Add to DB..."; |
|
2826 | + if ($globalDebug) { |
|
2827 | + echo "Add to DB..."; |
|
2828 | + } |
|
2348 | 2829 | $error = update_db::owner_fam(); |
2349 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
2830 | + } else { |
|
2831 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
2832 | + } |
|
2350 | 2833 | if ($error != '') { |
2351 | 2834 | return $error; |
2352 | - } elseif ($globalDebug) echo "Done\n"; |
|
2835 | + } elseif ($globalDebug) { |
|
2836 | + echo "Done\n"; |
|
2837 | + } |
|
2353 | 2838 | return ''; |
2354 | 2839 | } |
2355 | 2840 | public static function update_routes_fam() { |
2356 | 2841 | global $tmp_dir, $globalDebug; |
2357 | - if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
|
2842 | + if ($globalDebug) { |
|
2843 | + echo "Routes from FlightAirMap website : Download..."; |
|
2844 | + } |
|
2358 | 2845 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
2359 | 2846 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
2360 | - if ($globalDebug) echo "Gunzip..."; |
|
2847 | + if ($globalDebug) { |
|
2848 | + echo "Gunzip..."; |
|
2849 | + } |
|
2361 | 2850 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
2362 | - if ($globalDebug) echo "Add to DB..."; |
|
2851 | + if ($globalDebug) { |
|
2852 | + echo "Add to DB..."; |
|
2853 | + } |
|
2363 | 2854 | $error = update_db::routes_fam(); |
2364 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
2855 | + } else { |
|
2856 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
2857 | + } |
|
2365 | 2858 | if ($error != '') { |
2366 | 2859 | return $error; |
2367 | - } elseif ($globalDebug) echo "Done\n"; |
|
2860 | + } elseif ($globalDebug) { |
|
2861 | + echo "Done\n"; |
|
2862 | + } |
|
2368 | 2863 | return ''; |
2369 | 2864 | } |
2370 | 2865 | public static function update_marine_identity_fam() { |
@@ -2374,14 +2869,22 @@ discard block |
||
2374 | 2869 | $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
2375 | 2870 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
2376 | 2871 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
2377 | - if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
|
2872 | + if ($globalDebug) { |
|
2873 | + echo "Marine identity from FlightAirMap website : Download..."; |
|
2874 | + } |
|
2378 | 2875 | update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
2379 | 2876 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
2380 | - if ($globalDebug) echo "Gunzip..."; |
|
2877 | + if ($globalDebug) { |
|
2878 | + echo "Gunzip..."; |
|
2879 | + } |
|
2381 | 2880 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
2382 | - if ($globalDebug) echo "Add to DB..."; |
|
2881 | + if ($globalDebug) { |
|
2882 | + echo "Add to DB..."; |
|
2883 | + } |
|
2383 | 2884 | $error = update_db::marine_identity_fam(); |
2384 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
2885 | + } else { |
|
2886 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
2887 | + } |
|
2385 | 2888 | if ($error != '') { |
2386 | 2889 | return $error; |
2387 | 2890 | } elseif ($globalDebug) { |
@@ -2400,14 +2903,22 @@ discard block |
||
2400 | 2903 | $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
2401 | 2904 | $satellite_md5 = $satellite_md5_file[0]; |
2402 | 2905 | if (!update_db::check_satellite_version($satellite_md5)) { |
2403 | - if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
|
2906 | + if ($globalDebug) { |
|
2907 | + echo "Satellite from FlightAirMap website : Download..."; |
|
2908 | + } |
|
2404 | 2909 | update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
2405 | 2910 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
2406 | - if ($globalDebug) echo "Gunzip..."; |
|
2911 | + if ($globalDebug) { |
|
2912 | + echo "Gunzip..."; |
|
2913 | + } |
|
2407 | 2914 | update_db::gunzip($tmp_dir.'satellite.tsv.gz'); |
2408 | - if ($globalDebug) echo "Add to DB..."; |
|
2915 | + if ($globalDebug) { |
|
2916 | + echo "Add to DB..."; |
|
2917 | + } |
|
2409 | 2918 | $error = update_db::satellite_fam(); |
2410 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
2919 | + } else { |
|
2920 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
2921 | + } |
|
2411 | 2922 | if ($error != '') { |
2412 | 2923 | return $error; |
2413 | 2924 | } elseif ($globalDebug) { |
@@ -2420,17 +2931,25 @@ discard block |
||
2420 | 2931 | } |
2421 | 2932 | public static function update_banned_fam() { |
2422 | 2933 | global $tmp_dir, $globalDebug; |
2423 | - if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
2934 | + if ($globalDebug) { |
|
2935 | + echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
2936 | + } |
|
2424 | 2937 | update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
2425 | 2938 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
2426 | 2939 | //if ($globalDebug) echo "Gunzip..."; |
2427 | 2940 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
2428 | - if ($globalDebug) echo "Add to DB..."; |
|
2941 | + if ($globalDebug) { |
|
2942 | + echo "Add to DB..."; |
|
2943 | + } |
|
2429 | 2944 | $error = update_db::banned_fam(); |
2430 | - } else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
2945 | + } else { |
|
2946 | + $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
2947 | + } |
|
2431 | 2948 | if ($error != '') { |
2432 | 2949 | return $error; |
2433 | - } elseif ($globalDebug) echo "Done\n"; |
|
2950 | + } elseif ($globalDebug) { |
|
2951 | + echo "Done\n"; |
|
2952 | + } |
|
2434 | 2953 | return ''; |
2435 | 2954 | } |
2436 | 2955 | |
@@ -2438,7 +2957,9 @@ discard block |
||
2438 | 2957 | global $tmp_dir, $globalDebug, $globalDBdriver; |
2439 | 2958 | include_once('class.create_db.php'); |
2440 | 2959 | $error = ''; |
2441 | - if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
|
2960 | + if ($globalDebug) { |
|
2961 | + echo "Airspace from FlightAirMap website : Download..."; |
|
2962 | + } |
|
2442 | 2963 | if ($globalDBdriver == 'mysql') { |
2443 | 2964 | update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
2444 | 2965 | } else { |
@@ -2454,9 +2975,13 @@ discard block |
||
2454 | 2975 | update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
2455 | 2976 | } |
2456 | 2977 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
2457 | - if ($globalDebug) echo "Gunzip..."; |
|
2978 | + if ($globalDebug) { |
|
2979 | + echo "Gunzip..."; |
|
2980 | + } |
|
2458 | 2981 | update_db::gunzip($tmp_dir.'airspace.sql.gz'); |
2459 | - if ($globalDebug) echo "Add to DB..."; |
|
2982 | + if ($globalDebug) { |
|
2983 | + echo "Add to DB..."; |
|
2984 | + } |
|
2460 | 2985 | $Connection = new Connection(); |
2461 | 2986 | if ($Connection->tableExists('airspace')) { |
2462 | 2987 | $query = 'DROP TABLE airspace'; |
@@ -2469,19 +2994,27 @@ discard block |
||
2469 | 2994 | } |
2470 | 2995 | $error = create_db::import_file($tmp_dir.'airspace.sql'); |
2471 | 2996 | update_db::insert_airspace_version($airspace_md5); |
2472 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
2997 | + } else { |
|
2998 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
2999 | + } |
|
2473 | 3000 | } |
2474 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
3001 | + } else { |
|
3002 | + $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
3003 | + } |
|
2475 | 3004 | if ($error != '') { |
2476 | 3005 | return $error; |
2477 | - } elseif ($globalDebug) echo "Done\n"; |
|
3006 | + } elseif ($globalDebug) { |
|
3007 | + echo "Done\n"; |
|
3008 | + } |
|
2478 | 3009 | return ''; |
2479 | 3010 | } |
2480 | 3011 | |
2481 | 3012 | public static function update_geoid_fam() { |
2482 | 3013 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
2483 | 3014 | $error = ''; |
2484 | - if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
|
3015 | + if ($globalDebug) { |
|
3016 | + echo "Geoid from FlightAirMap website : Download..."; |
|
3017 | + } |
|
2485 | 3018 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
2486 | 3019 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
2487 | 3020 | $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
@@ -2489,75 +3022,113 @@ discard block |
||
2489 | 3022 | if (!update_db::check_geoid_version($geoid_md5)) { |
2490 | 3023 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
2491 | 3024 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
2492 | - if ($globalDebug) echo "Gunzip..."; |
|
3025 | + if ($globalDebug) { |
|
3026 | + echo "Gunzip..."; |
|
3027 | + } |
|
2493 | 3028 | update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
2494 | 3029 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
2495 | 3030 | update_db::insert_geoid_version($geoid_md5); |
2496 | 3031 | } |
2497 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
3032 | + } else { |
|
3033 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
3034 | + } |
|
2498 | 3035 | } |
2499 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
3036 | + } else { |
|
3037 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
3038 | + } |
|
2500 | 3039 | if ($error != '') { |
2501 | 3040 | return $error; |
2502 | - } elseif ($globalDebug) echo "Done\n"; |
|
3041 | + } elseif ($globalDebug) { |
|
3042 | + echo "Done\n"; |
|
3043 | + } |
|
2503 | 3044 | return ''; |
2504 | 3045 | } |
2505 | 3046 | |
2506 | 3047 | public static function update_tle() { |
2507 | 3048 | global $tmp_dir, $globalDebug; |
2508 | - if ($globalDebug) echo "Download TLE : Download..."; |
|
3049 | + if ($globalDebug) { |
|
3050 | + echo "Download TLE : Download..."; |
|
3051 | + } |
|
2509 | 3052 | $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', |
2510 | 3053 | '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', |
2511 | 3054 | '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'); |
2512 | 3055 | foreach ($alltle as $filename) { |
2513 | - if ($globalDebug) echo "downloading ".$filename.'...'; |
|
3056 | + if ($globalDebug) { |
|
3057 | + echo "downloading ".$filename.'...'; |
|
3058 | + } |
|
2514 | 3059 | update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
2515 | 3060 | if (file_exists($tmp_dir.$filename)) { |
2516 | - if ($globalDebug) echo "Add to DB ".$filename."..."; |
|
3061 | + if ($globalDebug) { |
|
3062 | + echo "Add to DB ".$filename."..."; |
|
3063 | + } |
|
2517 | 3064 | $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
2518 | - } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
3065 | + } else { |
|
3066 | + $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
3067 | + } |
|
2519 | 3068 | if ($error != '') { |
2520 | 3069 | echo $error."\n"; |
2521 | - } elseif ($globalDebug) echo "Done\n"; |
|
3070 | + } elseif ($globalDebug) { |
|
3071 | + echo "Done\n"; |
|
3072 | + } |
|
2522 | 3073 | } |
2523 | 3074 | return ''; |
2524 | 3075 | } |
2525 | 3076 | |
2526 | 3077 | public static function update_ucsdb() { |
2527 | 3078 | global $tmp_dir, $globalDebug; |
2528 | - if ($globalDebug) echo "Download UCS DB : Download..."; |
|
3079 | + if ($globalDebug) { |
|
3080 | + echo "Download UCS DB : Download..."; |
|
3081 | + } |
|
2529 | 3082 | 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'); |
2530 | 3083 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
2531 | - if ($globalDebug) echo "Add to DB..."; |
|
3084 | + if ($globalDebug) { |
|
3085 | + echo "Add to DB..."; |
|
3086 | + } |
|
2532 | 3087 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
2533 | - } else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
3088 | + } else { |
|
3089 | + $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
3090 | + } |
|
2534 | 3091 | if ($error != '') { |
2535 | 3092 | echo $error."\n"; |
2536 | - } elseif ($globalDebug) echo "Done\n"; |
|
3093 | + } elseif ($globalDebug) { |
|
3094 | + echo "Done\n"; |
|
3095 | + } |
|
2537 | 3096 | return ''; |
2538 | 3097 | } |
2539 | 3098 | |
2540 | 3099 | public static function update_celestrak() { |
2541 | 3100 | global $tmp_dir, $globalDebug; |
2542 | - if ($globalDebug) echo "Download Celestrak DB : Download..."; |
|
3101 | + if ($globalDebug) { |
|
3102 | + echo "Download Celestrak DB : Download..."; |
|
3103 | + } |
|
2543 | 3104 | update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
2544 | 3105 | if (file_exists($tmp_dir.'satcat.txt')) { |
2545 | - if ($globalDebug) echo "Add to DB..."; |
|
3106 | + if ($globalDebug) { |
|
3107 | + echo "Add to DB..."; |
|
3108 | + } |
|
2546 | 3109 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
2547 | - } else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
3110 | + } else { |
|
3111 | + $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
3112 | + } |
|
2548 | 3113 | if ($error != '') { |
2549 | 3114 | echo $error."\n"; |
2550 | - } elseif ($globalDebug) echo "Done\n"; |
|
3115 | + } elseif ($globalDebug) { |
|
3116 | + echo "Done\n"; |
|
3117 | + } |
|
2551 | 3118 | return ''; |
2552 | 3119 | } |
2553 | 3120 | |
2554 | 3121 | public static function update_models() { |
2555 | 3122 | global $tmp_dir, $globalDebug; |
2556 | 3123 | $error = ''; |
2557 | - if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
|
3124 | + if ($globalDebug) { |
|
3125 | + echo "Models from FlightAirMap website : Download..."; |
|
3126 | + } |
|
2558 | 3127 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
2559 | 3128 | if (file_exists($tmp_dir.'models.md5sum')) { |
2560 | - if ($globalDebug) echo "Check files...\n"; |
|
3129 | + if ($globalDebug) { |
|
3130 | + echo "Check files...\n"; |
|
3131 | + } |
|
2561 | 3132 | $newmodelsdb = array(); |
2562 | 3133 | if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
2563 | 3134 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2576,25 +3147,35 @@ discard block |
||
2576 | 3147 | } |
2577 | 3148 | $diff = array_diff($newmodelsdb,$modelsdb); |
2578 | 3149 | foreach ($diff as $key => $value) { |
2579 | - if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
|
3150 | + if ($globalDebug) { |
|
3151 | + echo 'Downloading model '.$key.' ...'."\n"; |
|
3152 | + } |
|
2580 | 3153 | update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
2581 | 3154 | |
2582 | 3155 | } |
2583 | 3156 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
2584 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3157 | + } else { |
|
3158 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3159 | + } |
|
2585 | 3160 | if ($error != '') { |
2586 | 3161 | return $error; |
2587 | - } elseif ($globalDebug) echo "Done\n"; |
|
3162 | + } elseif ($globalDebug) { |
|
3163 | + echo "Done\n"; |
|
3164 | + } |
|
2588 | 3165 | return ''; |
2589 | 3166 | } |
2590 | 3167 | |
2591 | 3168 | public static function update_space_models() { |
2592 | 3169 | global $tmp_dir, $globalDebug; |
2593 | 3170 | $error = ''; |
2594 | - if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
|
3171 | + if ($globalDebug) { |
|
3172 | + echo "Space models from FlightAirMap website : Download..."; |
|
3173 | + } |
|
2595 | 3174 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
2596 | 3175 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
2597 | - if ($globalDebug) echo "Check files...\n"; |
|
3176 | + if ($globalDebug) { |
|
3177 | + echo "Check files...\n"; |
|
3178 | + } |
|
2598 | 3179 | $newmodelsdb = array(); |
2599 | 3180 | if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
2600 | 3181 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2613,25 +3194,35 @@ discard block |
||
2613 | 3194 | } |
2614 | 3195 | $diff = array_diff($newmodelsdb,$modelsdb); |
2615 | 3196 | foreach ($diff as $key => $value) { |
2616 | - if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
|
3197 | + if ($globalDebug) { |
|
3198 | + echo 'Downloading space model '.$key.' ...'."\n"; |
|
3199 | + } |
|
2617 | 3200 | update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
2618 | 3201 | |
2619 | 3202 | } |
2620 | 3203 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
2621 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3204 | + } else { |
|
3205 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3206 | + } |
|
2622 | 3207 | if ($error != '') { |
2623 | 3208 | return $error; |
2624 | - } elseif ($globalDebug) echo "Done\n"; |
|
3209 | + } elseif ($globalDebug) { |
|
3210 | + echo "Done\n"; |
|
3211 | + } |
|
2625 | 3212 | return ''; |
2626 | 3213 | } |
2627 | 3214 | |
2628 | 3215 | public static function update_vehicules_models() { |
2629 | 3216 | global $tmp_dir, $globalDebug; |
2630 | 3217 | $error = ''; |
2631 | - if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
|
3218 | + if ($globalDebug) { |
|
3219 | + echo "Vehicules models from FlightAirMap website : Download..."; |
|
3220 | + } |
|
2632 | 3221 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
2633 | 3222 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
2634 | - if ($globalDebug) echo "Check files...\n"; |
|
3223 | + if ($globalDebug) { |
|
3224 | + echo "Check files...\n"; |
|
3225 | + } |
|
2635 | 3226 | $newmodelsdb = array(); |
2636 | 3227 | if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
2637 | 3228 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2650,15 +3241,21 @@ discard block |
||
2650 | 3241 | } |
2651 | 3242 | $diff = array_diff($newmodelsdb,$modelsdb); |
2652 | 3243 | foreach ($diff as $key => $value) { |
2653 | - if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
3244 | + if ($globalDebug) { |
|
3245 | + echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
3246 | + } |
|
2654 | 3247 | update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
2655 | 3248 | |
2656 | 3249 | } |
2657 | 3250 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
2658 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3251 | + } else { |
|
3252 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
3253 | + } |
|
2659 | 3254 | if ($error != '') { |
2660 | 3255 | return $error; |
2661 | - } elseif ($globalDebug) echo "Done\n"; |
|
3256 | + } elseif ($globalDebug) { |
|
3257 | + echo "Done\n"; |
|
3258 | + } |
|
2662 | 3259 | return ''; |
2663 | 3260 | } |
2664 | 3261 | |
@@ -2701,7 +3298,9 @@ discard block |
||
2701 | 3298 | } |
2702 | 3299 | |
2703 | 3300 | $error = ''; |
2704 | - if ($globalDebug) echo "Notam : Download..."; |
|
3301 | + if ($globalDebug) { |
|
3302 | + echo "Notam : Download..."; |
|
3303 | + } |
|
2705 | 3304 | update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
2706 | 3305 | if (file_exists($tmp_dir.'notam.rss')) { |
2707 | 3306 | $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
@@ -2716,14 +3315,30 @@ discard block |
||
2716 | 3315 | $data['fir'] = $q[0]; |
2717 | 3316 | $data['code'] = $q[1]; |
2718 | 3317 | $ifrvfr = $q[2]; |
2719 | - if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR'; |
|
2720 | - if ($ifrvfr == 'I') $data['rules'] = 'IFR'; |
|
2721 | - if ($ifrvfr == 'V') $data['rules'] = 'VFR'; |
|
2722 | - if ($q[4] == 'A') $data['scope'] = 'Airport warning'; |
|
2723 | - if ($q[4] == 'E') $data['scope'] = 'Enroute warning'; |
|
2724 | - if ($q[4] == 'W') $data['scope'] = 'Navigation warning'; |
|
2725 | - if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning'; |
|
2726 | - if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning'; |
|
3318 | + if ($ifrvfr == 'IV') { |
|
3319 | + $data['rules'] = 'IFR/VFR'; |
|
3320 | + } |
|
3321 | + if ($ifrvfr == 'I') { |
|
3322 | + $data['rules'] = 'IFR'; |
|
3323 | + } |
|
3324 | + if ($ifrvfr == 'V') { |
|
3325 | + $data['rules'] = 'VFR'; |
|
3326 | + } |
|
3327 | + if ($q[4] == 'A') { |
|
3328 | + $data['scope'] = 'Airport warning'; |
|
3329 | + } |
|
3330 | + if ($q[4] == 'E') { |
|
3331 | + $data['scope'] = 'Enroute warning'; |
|
3332 | + } |
|
3333 | + if ($q[4] == 'W') { |
|
3334 | + $data['scope'] = 'Navigation warning'; |
|
3335 | + } |
|
3336 | + if ($q[4] == 'AE') { |
|
3337 | + $data['scope'] = 'Airport/Enroute warning'; |
|
3338 | + } |
|
3339 | + if ($q[4] == 'AW') { |
|
3340 | + $data['scope'] = 'Airport/Navigation warning'; |
|
3341 | + } |
|
2727 | 3342 | //$data['scope'] = $q[4]; |
2728 | 3343 | $data['lower_limit'] = $q[5]; |
2729 | 3344 | $data['upper_limit'] = $q[6]; |
@@ -2731,8 +3346,12 @@ discard block |
||
2731 | 3346 | sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
2732 | 3347 | $latitude = $Common->convertDec($las,'latitude'); |
2733 | 3348 | $longitude = $Common->convertDec($lns,'longitude'); |
2734 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
2735 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
3349 | + if ($lac == 'S') { |
|
3350 | + $latitude = '-'.$latitude; |
|
3351 | + } |
|
3352 | + if ($lnc == 'W') { |
|
3353 | + $longitude = '-'.$longitude; |
|
3354 | + } |
|
2736 | 3355 | $data['center_latitude'] = $latitude; |
2737 | 3356 | $data['center_longitude'] = $longitude; |
2738 | 3357 | $data['radius'] = intval($radius); |
@@ -2762,10 +3381,14 @@ discard block |
||
2762 | 3381 | $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']); |
2763 | 3382 | unset($data); |
2764 | 3383 | } |
2765 | - } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
3384 | + } else { |
|
3385 | + $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
3386 | + } |
|
2766 | 3387 | if ($error != '') { |
2767 | 3388 | return $error; |
2768 | - } elseif ($globalDebug) echo "Done\n"; |
|
3389 | + } elseif ($globalDebug) { |
|
3390 | + echo "Done\n"; |
|
3391 | + } |
|
2769 | 3392 | return ''; |
2770 | 3393 | } |
2771 | 3394 | |
@@ -2790,7 +3413,9 @@ discard block |
||
2790 | 3413 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
2791 | 3414 | $airspace_json = json_decode($airspace_lst,true); |
2792 | 3415 | foreach ($airspace_json['records'] as $airspace) { |
2793 | - if ($globalDebug) echo $airspace['name']."...\n"; |
|
3416 | + if ($globalDebug) { |
|
3417 | + echo $airspace['name']."...\n"; |
|
3418 | + } |
|
2794 | 3419 | update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
2795 | 3420 | if (file_exists($tmp_dir.$airspace['name'])) { |
2796 | 3421 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
@@ -2834,8 +3459,11 @@ discard block |
||
2834 | 3459 | return "error : ".$e->getMessage(); |
2835 | 3460 | } |
2836 | 3461 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2837 | - if ($row['nb'] > 0) return false; |
|
2838 | - else return true; |
|
3462 | + if ($row['nb'] > 0) { |
|
3463 | + return false; |
|
3464 | + } else { |
|
3465 | + return true; |
|
3466 | + } |
|
2839 | 3467 | } |
2840 | 3468 | |
2841 | 3469 | public static function insert_last_update() { |
@@ -2860,8 +3488,11 @@ discard block |
||
2860 | 3488 | return "error : ".$e->getMessage(); |
2861 | 3489 | } |
2862 | 3490 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2863 | - if ($row['nb'] > 0) return true; |
|
2864 | - else return false; |
|
3491 | + if ($row['nb'] > 0) { |
|
3492 | + return true; |
|
3493 | + } else { |
|
3494 | + return false; |
|
3495 | + } |
|
2865 | 3496 | } |
2866 | 3497 | |
2867 | 3498 | public static function check_geoid_version($version) { |
@@ -2874,8 +3505,11 @@ discard block |
||
2874 | 3505 | return "error : ".$e->getMessage(); |
2875 | 3506 | } |
2876 | 3507 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2877 | - if ($row['nb'] > 0) return true; |
|
2878 | - else return false; |
|
3508 | + if ($row['nb'] > 0) { |
|
3509 | + return true; |
|
3510 | + } else { |
|
3511 | + return false; |
|
3512 | + } |
|
2879 | 3513 | } |
2880 | 3514 | |
2881 | 3515 | public static function check_marine_identity_version($version) { |
@@ -2888,8 +3522,11 @@ discard block |
||
2888 | 3522 | return "error : ".$e->getMessage(); |
2889 | 3523 | } |
2890 | 3524 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2891 | - if ($row['nb'] > 0) return true; |
|
2892 | - else return false; |
|
3525 | + if ($row['nb'] > 0) { |
|
3526 | + return true; |
|
3527 | + } else { |
|
3528 | + return false; |
|
3529 | + } |
|
2893 | 3530 | } |
2894 | 3531 | |
2895 | 3532 | public static function check_satellite_version($version) { |
@@ -2902,8 +3539,11 @@ discard block |
||
2902 | 3539 | return "error : ".$e->getMessage(); |
2903 | 3540 | } |
2904 | 3541 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2905 | - if ($row['nb'] > 0) return true; |
|
2906 | - else return false; |
|
3542 | + if ($row['nb'] > 0) { |
|
3543 | + return true; |
|
3544 | + } else { |
|
3545 | + return false; |
|
3546 | + } |
|
2907 | 3547 | } |
2908 | 3548 | |
2909 | 3549 | |
@@ -2970,8 +3610,11 @@ discard block |
||
2970 | 3610 | return "error : ".$e->getMessage(); |
2971 | 3611 | } |
2972 | 3612 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
2973 | - if ($row['nb'] > 0) return false; |
|
2974 | - else return true; |
|
3613 | + if ($row['nb'] > 0) { |
|
3614 | + return false; |
|
3615 | + } else { |
|
3616 | + return true; |
|
3617 | + } |
|
2975 | 3618 | } |
2976 | 3619 | |
2977 | 3620 | public static function insert_last_notam_update() { |
@@ -3001,8 +3644,11 @@ discard block |
||
3001 | 3644 | return "error : ".$e->getMessage(); |
3002 | 3645 | } |
3003 | 3646 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3004 | - if ($row['nb'] > 0) return false; |
|
3005 | - else return true; |
|
3647 | + if ($row['nb'] > 0) { |
|
3648 | + return false; |
|
3649 | + } else { |
|
3650 | + return true; |
|
3651 | + } |
|
3006 | 3652 | } |
3007 | 3653 | |
3008 | 3654 | public static function insert_last_airspace_update() { |
@@ -3032,8 +3678,11 @@ discard block |
||
3032 | 3678 | return "error : ".$e->getMessage(); |
3033 | 3679 | } |
3034 | 3680 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3035 | - if ($row['nb'] > 0) return false; |
|
3036 | - else return true; |
|
3681 | + if ($row['nb'] > 0) { |
|
3682 | + return false; |
|
3683 | + } else { |
|
3684 | + return true; |
|
3685 | + } |
|
3037 | 3686 | } |
3038 | 3687 | |
3039 | 3688 | public static function insert_last_geoid_update() { |
@@ -3063,8 +3712,11 @@ discard block |
||
3063 | 3712 | return "error : ".$e->getMessage(); |
3064 | 3713 | } |
3065 | 3714 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3066 | - if ($row['nb'] > 0) return false; |
|
3067 | - else return true; |
|
3715 | + if ($row['nb'] > 0) { |
|
3716 | + return false; |
|
3717 | + } else { |
|
3718 | + return true; |
|
3719 | + } |
|
3068 | 3720 | } |
3069 | 3721 | |
3070 | 3722 | public static function insert_last_owner_update() { |
@@ -3093,8 +3745,11 @@ discard block |
||
3093 | 3745 | return "error : ".$e->getMessage(); |
3094 | 3746 | } |
3095 | 3747 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3096 | - if ($row['nb'] > 0) return false; |
|
3097 | - else return true; |
|
3748 | + if ($row['nb'] > 0) { |
|
3749 | + return false; |
|
3750 | + } else { |
|
3751 | + return true; |
|
3752 | + } |
|
3098 | 3753 | } |
3099 | 3754 | |
3100 | 3755 | public static function insert_last_schedules_update() { |
@@ -3124,8 +3779,11 @@ discard block |
||
3124 | 3779 | return "error : ".$e->getMessage(); |
3125 | 3780 | } |
3126 | 3781 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3127 | - if ($row['nb'] > 0) return false; |
|
3128 | - else return true; |
|
3782 | + if ($row['nb'] > 0) { |
|
3783 | + return false; |
|
3784 | + } else { |
|
3785 | + return true; |
|
3786 | + } |
|
3129 | 3787 | } |
3130 | 3788 | |
3131 | 3789 | public static function insert_last_tle_update() { |
@@ -3155,8 +3813,11 @@ discard block |
||
3155 | 3813 | return "error : ".$e->getMessage(); |
3156 | 3814 | } |
3157 | 3815 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3158 | - if ($row['nb'] > 0) return false; |
|
3159 | - else return true; |
|
3816 | + if ($row['nb'] > 0) { |
|
3817 | + return false; |
|
3818 | + } else { |
|
3819 | + return true; |
|
3820 | + } |
|
3160 | 3821 | } |
3161 | 3822 | |
3162 | 3823 | public static function insert_last_ucsdb_update() { |
@@ -3186,8 +3847,11 @@ discard block |
||
3186 | 3847 | return "error : ".$e->getMessage(); |
3187 | 3848 | } |
3188 | 3849 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3189 | - if ($row['nb'] > 0) return false; |
|
3190 | - else return true; |
|
3850 | + if ($row['nb'] > 0) { |
|
3851 | + return false; |
|
3852 | + } else { |
|
3853 | + return true; |
|
3854 | + } |
|
3191 | 3855 | } |
3192 | 3856 | |
3193 | 3857 | public static function insert_last_celestrak_update() { |
@@ -3217,8 +3881,11 @@ discard block |
||
3217 | 3881 | return "error : ".$e->getMessage(); |
3218 | 3882 | } |
3219 | 3883 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3220 | - if ($row['nb'] > 0) return false; |
|
3221 | - else return true; |
|
3884 | + if ($row['nb'] > 0) { |
|
3885 | + return false; |
|
3886 | + } else { |
|
3887 | + return true; |
|
3888 | + } |
|
3222 | 3889 | } |
3223 | 3890 | |
3224 | 3891 | public static function check_last_satellite_update() { |
@@ -3236,8 +3903,11 @@ discard block |
||
3236 | 3903 | return "error : ".$e->getMessage(); |
3237 | 3904 | } |
3238 | 3905 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
3239 | - if ($row['nb'] > 0) return false; |
|
3240 | - else return true; |
|
3906 | + if ($row['nb'] > 0) { |
|
3907 | + return false; |
|
3908 | + } else { |
|
3909 | + return true; |
|
3910 | + } |
|
3241 | 3911 | } |
3242 | 3912 | |
3243 | 3913 | public static function insert_last_marine_identity_update() { |