Ysurac /
FlightAirMap
@@ -329,15 +329,15 @@ |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | <?php |
| 332 | - if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 332 | + if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 333 | 333 | ?> |
| 334 | 334 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php?coord="+bbox()); |
| 335 | 335 | <?php |
| 336 | - } else { |
|
| 336 | + } else { |
|
| 337 | 337 | ?> |
| 338 | 338 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php"); |
| 339 | 339 | <?php |
| 340 | - } |
|
| 340 | + } |
|
| 341 | 341 | ?> |
| 342 | 342 | loc_geojson.then(function(geojsondata) { |
| 343 | 343 | loc = new Cesium.CustomDataSource('location'); |
@@ -413,7 +413,7 @@ |
||
| 413 | 413 | <?php |
| 414 | 414 | if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) { |
| 415 | 415 | if (isset($_COOKIE['lastcentercoord'])) { |
| 416 | - $lastcentercoord = explode(',',$_COOKIE['lastcentercoord']); |
|
| 416 | + $lastcentercoord = explode(',', $_COOKIE['lastcentercoord']); |
|
| 417 | 417 | if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0; |
| 418 | 418 | else $zoom = $lastcentercoord[3]; |
| 419 | 419 | $viewcenterlatitude = $lastcentercoord[0]; |
@@ -5,21 +5,30 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | document.cookie = 'MapFormat=3d; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/' |
| 7 | 7 | <?php |
| 8 | - if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType']; |
|
| 9 | - else $MapType = $globalMapProvider; |
|
| 8 | + if (isset($_COOKIE['MapType'])) { |
|
| 9 | + $MapType = $_COOKIE['MapType']; |
|
| 10 | + } else { |
|
| 11 | + $MapType = $globalMapProvider; |
|
| 12 | + } |
|
| 10 | 13 | |
| 11 | 14 | // unset($_COOKIE['MapType']); |
| 12 | 15 | if ($MapType != 'Mapbox' && $MapType != 'OpenStreetMap' && $MapType != 'Bing-Aerial' && $MapType != 'Bing-Hybrid' && $MapType != 'Bing-Road') { |
| 13 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') $MapType = 'Bing-Aerial'; |
|
| 14 | - else $MapType = 'OpenStreetMap'; |
|
| 16 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
| 17 | + $MapType = 'Bing-Aerial'; |
|
| 18 | + } else { |
|
| 19 | + $MapType = 'OpenStreetMap'; |
|
| 20 | + } |
|
| 15 | 21 | } |
| 16 | 22 | if (($MapType == 'Bing-Aerial' || $MapType == 'Bing-Hybrid' || $MapType == 'Bing-Road') && (!isset($globalBingMapKey) || $globalBingMapKey == '')) { |
| 17 | 23 | $MapType = 'OpenStreetMap'; |
| 18 | 24 | } |
| 19 | 25 | if ($MapType == 'Mapbox') { |
| 20 | - if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId; |
|
| 21 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 22 | -?> |
|
| 26 | + if ($_COOKIE['MapTypeId'] == 'default') { |
|
| 27 | + $MapBoxId = $globalMapboxId; |
|
| 28 | + } else { |
|
| 29 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 30 | + } |
|
| 31 | + ?> |
|
| 23 | 32 | var imProv = Cesium.MapboxImageryProvider({ |
| 24 | 33 | credit: 'Map data © OpenStreetMap contributors, ' + |
| 25 | 34 | 'CC-BY-SA, ' + |
@@ -124,13 +133,23 @@ discard block |
||
| 124 | 133 | */ |
| 125 | 134 | ?> |
| 126 | 135 | <?php |
| 127 | - } elseif (isset($globalMapCustomLayer[$MapType])) { |
|
| 136 | + } elseif (isset($globalMapCustomLayer[$MapType])) { |
|
| 128 | 137 | $customid = $MapType; |
| 129 | 138 | ?> |
| 130 | 139 | var imProv = Cesium.createOpenStreetMapImageryProvider({ |
| 131 | 140 | url : '<?php print $globalMapCustomLayer[$customid]['url']; ?>', |
| 132 | - maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '99'; ?>, |
|
| 133 | - minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>, |
|
| 141 | + maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) { |
|
| 142 | + print $globalMapCustomLayer[$customid]['maxZoom']; |
|
| 143 | +} else { |
|
| 144 | + print '99'; |
|
| 145 | +} |
|
| 146 | +?>, |
|
| 147 | + minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) { |
|
| 148 | + print $globalMapCustomLayer[$customid]['minZoom']; |
|
| 149 | +} else { |
|
| 150 | + print '0'; |
|
| 151 | +} |
|
| 152 | +?>, |
|
| 134 | 153 | credit: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
| 135 | 154 | }); |
| 136 | 155 | <?php |
@@ -414,8 +433,11 @@ discard block |
||
| 414 | 433 | if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) { |
| 415 | 434 | if (isset($_COOKIE['lastcentercoord'])) { |
| 416 | 435 | $lastcentercoord = explode(',',$_COOKIE['lastcentercoord']); |
| 417 | - if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0; |
|
| 418 | - else $zoom = $lastcentercoord[3]; |
|
| 436 | + if (!isset($lastcentercoord[3])) { |
|
| 437 | + $zoom = $lastcentercoord[2]*1000000.0; |
|
| 438 | + } else { |
|
| 439 | + $zoom = $lastcentercoord[3]; |
|
| 440 | + } |
|
| 419 | 441 | $viewcenterlatitude = $lastcentercoord[0]; |
| 420 | 442 | $viewcenterlongitude = $lastcentercoord[1]; |
| 421 | 443 | } else { |
@@ -517,7 +539,12 @@ discard block |
||
| 517 | 539 | } |
| 518 | 540 | |
| 519 | 541 | update_locationsLayer(); |
| 520 | -setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
|
| 542 | +setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) { |
|
| 543 | + print $globalMapRefresh*1000*2; |
|
| 544 | +} else { |
|
| 545 | + print '60000'; |
|
| 546 | +} |
|
| 547 | +?>); |
|
| 521 | 548 | /* |
| 522 | 549 | var handlera = new Cesium.ScreenSpaceEventHandler(viewer.canvas, false); |
| 523 | 550 | handlera.setInputAction( |
@@ -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'; |
@@ -1393,6 +1425,10 @@ discard block |
||
| 1393 | 1425 | return ''; |
| 1394 | 1426 | } |
| 1395 | 1427 | |
| 1428 | + /** |
|
| 1429 | + * @param string $filename |
|
| 1430 | + * @param string $tletype |
|
| 1431 | + */ |
|
| 1396 | 1432 | public static function tle($filename,$tletype) { |
| 1397 | 1433 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1398 | 1434 | global $tmp_dir, $globalTransaction; |
@@ -1442,6 +1478,9 @@ discard block |
||
| 1442 | 1478 | return ''; |
| 1443 | 1479 | } |
| 1444 | 1480 | |
| 1481 | + /** |
|
| 1482 | + * @param string $filename |
|
| 1483 | + */ |
|
| 1445 | 1484 | public static function satellite_ucsdb($filename) { |
| 1446 | 1485 | global $tmp_dir, $globalTransaction; |
| 1447 | 1486 | $query = "DELETE FROM satellite"; |
@@ -1488,6 +1527,9 @@ discard block |
||
| 1488 | 1527 | return ''; |
| 1489 | 1528 | } |
| 1490 | 1529 | |
| 1530 | + /** |
|
| 1531 | + * @param string $filename |
|
| 1532 | + */ |
|
| 1491 | 1533 | public static function satellite_celestrak($filename) { |
| 1492 | 1534 | global $tmp_dir, $globalTransaction; |
| 1493 | 1535 | $satcat_sources = array( |
@@ -1815,6 +1857,9 @@ discard block |
||
| 1815 | 1857 | |
| 1816 | 1858 | } |
| 1817 | 1859 | */ |
| 1860 | + /** |
|
| 1861 | + * @param string $filename |
|
| 1862 | + */ |
|
| 1818 | 1863 | public static function waypoints($filename) { |
| 1819 | 1864 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1820 | 1865 | global $tmp_dir, $globalTransaction; |
@@ -1883,6 +1928,9 @@ discard block |
||
| 1883 | 1928 | } |
| 1884 | 1929 | } |
| 1885 | 1930 | |
| 1931 | + /** |
|
| 1932 | + * @param string $filename |
|
| 1933 | + */ |
|
| 1886 | 1934 | public static function ivao_airlines($filename) { |
| 1887 | 1935 | //require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1888 | 1936 | 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(); |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | } |
| 1208 | 1208 | */ |
| 1209 | 1209 | return ''; |
| 1210 | - } |
|
| 1210 | + } |
|
| 1211 | 1211 | |
| 1212 | 1212 | public static function owner_fam() { |
| 1213 | 1213 | global $tmp_dir, $globalTransaction; |
@@ -1215,10 +1215,10 @@ discard block |
||
| 1215 | 1215 | try { |
| 1216 | 1216 | $Connection = new Connection(); |
| 1217 | 1217 | $sth = $Connection->db->prepare($query); |
| 1218 | - $sth->execute(array(':source' => 'website_fam')); |
|
| 1219 | - } catch(PDOException $e) { |
|
| 1220 | - return "error : ".$e->getMessage(); |
|
| 1221 | - } |
|
| 1218 | + $sth->execute(array(':source' => 'website_fam')); |
|
| 1219 | + } catch(PDOException $e) { |
|
| 1220 | + return "error : ".$e->getMessage(); |
|
| 1221 | + } |
|
| 1222 | 1222 | |
| 1223 | 1223 | $delimiter = "\t"; |
| 1224 | 1224 | $Connection = new Connection(); |
@@ -1244,7 +1244,7 @@ discard block |
||
| 1244 | 1244 | if ($globalTransaction) $Connection->db->commit(); |
| 1245 | 1245 | } |
| 1246 | 1246 | return ''; |
| 1247 | - } |
|
| 1247 | + } |
|
| 1248 | 1248 | |
| 1249 | 1249 | public static function routes_fam() { |
| 1250 | 1250 | global $tmp_dir, $globalTransaction, $globalDebug; |
@@ -1279,7 +1279,7 @@ discard block |
||
| 1279 | 1279 | if ($globalTransaction) $Connection->db->commit(); |
| 1280 | 1280 | } |
| 1281 | 1281 | return ''; |
| 1282 | - } |
|
| 1282 | + } |
|
| 1283 | 1283 | |
| 1284 | 1284 | public static function marine_identity_fam() { |
| 1285 | 1285 | global $tmp_dir, $globalTransaction; |
@@ -1287,10 +1287,10 @@ discard block |
||
| 1287 | 1287 | try { |
| 1288 | 1288 | $Connection = new Connection(); |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | - $sth->execute(); |
|
| 1291 | - } catch(PDOException $e) { |
|
| 1292 | - return "error : ".$e->getMessage(); |
|
| 1293 | - } |
|
| 1290 | + $sth->execute(); |
|
| 1291 | + } catch(PDOException $e) { |
|
| 1292 | + return "error : ".$e->getMessage(); |
|
| 1293 | + } |
|
| 1294 | 1294 | |
| 1295 | 1295 | |
| 1296 | 1296 | //update_db::unzip($out_file); |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | if ($globalTransaction) $Connection->db->commit(); |
| 1321 | 1321 | } |
| 1322 | 1322 | return ''; |
| 1323 | - } |
|
| 1323 | + } |
|
| 1324 | 1324 | |
| 1325 | 1325 | public static function satellite_fam() { |
| 1326 | 1326 | global $tmp_dir, $globalTransaction; |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | if ($globalTransaction) $Connection->db->commit(); |
| 1392 | 1392 | } |
| 1393 | 1393 | return ''; |
| 1394 | - } |
|
| 1394 | + } |
|
| 1395 | 1395 | |
| 1396 | 1396 | public static function tle($filename,$tletype) { |
| 1397 | 1397 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
@@ -1402,10 +1402,10 @@ discard block |
||
| 1402 | 1402 | try { |
| 1403 | 1403 | $Connection = new Connection(); |
| 1404 | 1404 | $sth = $Connection->db->prepare($query); |
| 1405 | - $sth->execute(array(':source' => $filename)); |
|
| 1406 | - } catch(PDOException $e) { |
|
| 1407 | - return "error : ".$e->getMessage(); |
|
| 1408 | - } |
|
| 1405 | + $sth->execute(array(':source' => $filename)); |
|
| 1406 | + } catch(PDOException $e) { |
|
| 1407 | + return "error : ".$e->getMessage(); |
|
| 1408 | + } |
|
| 1409 | 1409 | |
| 1410 | 1410 | $Connection = new Connection(); |
| 1411 | 1411 | if (($handle = fopen($filename, 'r')) !== FALSE) |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | //$Connection->db->commit(); |
| 1441 | 1441 | } |
| 1442 | 1442 | return ''; |
| 1443 | - } |
|
| 1443 | + } |
|
| 1444 | 1444 | |
| 1445 | 1445 | public static function satellite_ucsdb($filename) { |
| 1446 | 1446 | global $tmp_dir, $globalTransaction; |
@@ -1699,11 +1699,11 @@ discard block |
||
| 1699 | 1699 | try { |
| 1700 | 1700 | $sth = $Connection->db->prepare($query); |
| 1701 | 1701 | $sth->execute(array( |
| 1702 | - ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
| 1703 | - ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
| 1704 | - ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
| 1705 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | - ) |
|
| 1702 | + ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
| 1703 | + ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
| 1704 | + ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
| 1705 | + ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | + ) |
|
| 1707 | 1707 | ); |
| 1708 | 1708 | } catch(PDOException $e) { |
| 1709 | 1709 | return "error : ".$e->getMessage(); |
@@ -1727,13 +1727,13 @@ discard block |
||
| 1727 | 1727 | //$Connection->db->commit(); |
| 1728 | 1728 | } |
| 1729 | 1729 | return ''; |
| 1730 | - } |
|
| 1730 | + } |
|
| 1731 | 1731 | |
| 1732 | 1732 | /** |
| 1733 | - * Convert a HTML table to an array |
|
| 1734 | - * @param String $data HTML page |
|
| 1735 | - * @return Array array of the tables in HTML page |
|
| 1736 | - */ |
|
| 1733 | + * Convert a HTML table to an array |
|
| 1734 | + * @param String $data HTML page |
|
| 1735 | + * @return Array array of the tables in HTML page |
|
| 1736 | + */ |
|
| 1737 | 1737 | /* |
| 1738 | 1738 | private static function table2array($data) { |
| 1739 | 1739 | $html = str_get_html($data); |
@@ -1763,11 +1763,11 @@ discard block |
||
| 1763 | 1763 | return(array_filter($tabledata)); |
| 1764 | 1764 | } |
| 1765 | 1765 | */ |
| 1766 | - /** |
|
| 1767 | - * Get data from form result |
|
| 1768 | - * @param String $url form URL |
|
| 1769 | - * @return String the result |
|
| 1770 | - */ |
|
| 1766 | + /** |
|
| 1767 | + * Get data from form result |
|
| 1768 | + * @param String $url form URL |
|
| 1769 | + * @return String the result |
|
| 1770 | + */ |
|
| 1771 | 1771 | /* |
| 1772 | 1772 | private static function getData($url) { |
| 1773 | 1773 | $ch = curl_init(); |
@@ -1917,7 +1917,7 @@ discard block |
||
| 1917 | 1917 | if ($globalTransaction) $Connection->db->commit(); |
| 1918 | 1918 | } |
| 1919 | 1919 | return ''; |
| 1920 | - } |
|
| 1920 | + } |
|
| 1921 | 1921 | |
| 1922 | 1922 | public static function update_airspace() { |
| 1923 | 1923 | global $tmp_dir, $globalDBdriver; |
@@ -1927,11 +1927,11 @@ discard block |
||
| 1927 | 1927 | $query = 'DROP TABLE airspace'; |
| 1928 | 1928 | try { |
| 1929 | 1929 | $sth = $Connection->db->prepare($query); |
| 1930 | - $sth->execute(); |
|
| 1931 | - } catch(PDOException $e) { |
|
| 1930 | + $sth->execute(); |
|
| 1931 | + } catch(PDOException $e) { |
|
| 1932 | 1932 | return "error : ".$e->getMessage(); |
| 1933 | - } |
|
| 1934 | - } |
|
| 1933 | + } |
|
| 1934 | + } |
|
| 1935 | 1935 | |
| 1936 | 1936 | |
| 1937 | 1937 | if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
@@ -1996,10 +1996,10 @@ discard block |
||
| 1996 | 1996 | $query = 'DROP TABLE countries'; |
| 1997 | 1997 | try { |
| 1998 | 1998 | $sth = $Connection->db->prepare($query); |
| 1999 | - $sth->execute(); |
|
| 2000 | - } catch(PDOException $e) { |
|
| 2001 | - echo "error : ".$e->getMessage(); |
|
| 2002 | - } |
|
| 1999 | + $sth->execute(); |
|
| 2000 | + } catch(PDOException $e) { |
|
| 2001 | + echo "error : ".$e->getMessage(); |
|
| 2002 | + } |
|
| 2003 | 2003 | } |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
| 2005 | 2005 | update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
@@ -2458,7 +2458,7 @@ discard block |
||
| 2458 | 2458 | $error = update_db::airlines_fam(); |
| 2459 | 2459 | update_db::insert_airlines_version($airlines_md5); |
| 2460 | 2460 | } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
| 2461 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2461 | + } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2462 | 2462 | } elseif ($globalDebug) echo "No update."; |
| 2463 | 2463 | } else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
| 2464 | 2464 | if ($error != '') { |
@@ -2832,12 +2832,12 @@ discard block |
||
| 2832 | 2832 | echo $data; |
| 2833 | 2833 | */ |
| 2834 | 2834 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2835 | - //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
| 2836 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | - $result = fread($fh,100000000); |
|
| 2838 | - //echo $result; |
|
| 2839 | - //var_dump(str_get_html($result)); |
|
| 2840 | - //print_r(self::table2array($result)); |
|
| 2835 | + //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
| 2836 | + $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | + $result = fread($fh,100000000); |
|
| 2838 | + //echo $result; |
|
| 2839 | + //var_dump(str_get_html($result)); |
|
| 2840 | + //print_r(self::table2array($result)); |
|
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | 2843 | } |
@@ -2851,10 +2851,10 @@ discard block |
||
| 2851 | 2851 | try { |
| 2852 | 2852 | $Connection = new Connection(); |
| 2853 | 2853 | $sth = $Connection->db->prepare($query); |
| 2854 | - $sth->execute(); |
|
| 2855 | - } catch(PDOException $e) { |
|
| 2856 | - return "error : ".$e->getMessage(); |
|
| 2857 | - } |
|
| 2854 | + $sth->execute(); |
|
| 2855 | + } catch(PDOException $e) { |
|
| 2856 | + return "error : ".$e->getMessage(); |
|
| 2857 | + } |
|
| 2858 | 2858 | |
| 2859 | 2859 | $error = ''; |
| 2860 | 2860 | if ($globalDebug) echo "Notam : Download..."; |
@@ -2910,8 +2910,8 @@ discard block |
||
| 2910 | 2910 | $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
| 2911 | 2911 | $data['permanent'] = 0; |
| 2912 | 2912 | } else { |
| 2913 | - $data['date_end'] = NULL; |
|
| 2914 | - $data['permanent'] = 1; |
|
| 2913 | + $data['date_end'] = NULL; |
|
| 2914 | + $data['permanent'] = 1; |
|
| 2915 | 2915 | } |
| 2916 | 2916 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2917 | 2917 | $NOTAM = new NOTAM(); |
@@ -2985,13 +2985,13 @@ discard block |
||
| 2985 | 2985 | try { |
| 2986 | 2986 | $Connection = new Connection(); |
| 2987 | 2987 | $sth = $Connection->db->prepare($query); |
| 2988 | - $sth->execute(); |
|
| 2989 | - } catch(PDOException $e) { |
|
| 2990 | - return "error : ".$e->getMessage(); |
|
| 2991 | - } |
|
| 2992 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2993 | - if ($row['nb'] > 0) return false; |
|
| 2994 | - else return true; |
|
| 2988 | + $sth->execute(); |
|
| 2989 | + } catch(PDOException $e) { |
|
| 2990 | + return "error : ".$e->getMessage(); |
|
| 2991 | + } |
|
| 2992 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2993 | + if ($row['nb'] > 0) return false; |
|
| 2994 | + else return true; |
|
| 2995 | 2995 | } |
| 2996 | 2996 | |
| 2997 | 2997 | public static function insert_last_update() { |
@@ -3000,10 +3000,10 @@ discard block |
||
| 3000 | 3000 | try { |
| 3001 | 3001 | $Connection = new Connection(); |
| 3002 | 3002 | $sth = $Connection->db->prepare($query); |
| 3003 | - $sth->execute(); |
|
| 3004 | - } catch(PDOException $e) { |
|
| 3005 | - return "error : ".$e->getMessage(); |
|
| 3006 | - } |
|
| 3003 | + $sth->execute(); |
|
| 3004 | + } catch(PDOException $e) { |
|
| 3005 | + return "error : ".$e->getMessage(); |
|
| 3006 | + } |
|
| 3007 | 3007 | } |
| 3008 | 3008 | |
| 3009 | 3009 | public static function check_airspace_version($version) { |
@@ -3011,13 +3011,13 @@ discard block |
||
| 3011 | 3011 | try { |
| 3012 | 3012 | $Connection = new Connection(); |
| 3013 | 3013 | $sth = $Connection->db->prepare($query); |
| 3014 | - $sth->execute(array(':version' => $version)); |
|
| 3015 | - } catch(PDOException $e) { |
|
| 3016 | - return "error : ".$e->getMessage(); |
|
| 3017 | - } |
|
| 3018 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3019 | - if ($row['nb'] > 0) return true; |
|
| 3020 | - else return false; |
|
| 3014 | + $sth->execute(array(':version' => $version)); |
|
| 3015 | + } catch(PDOException $e) { |
|
| 3016 | + return "error : ".$e->getMessage(); |
|
| 3017 | + } |
|
| 3018 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3019 | + if ($row['nb'] > 0) return true; |
|
| 3020 | + else return false; |
|
| 3021 | 3021 | } |
| 3022 | 3022 | |
| 3023 | 3023 | public static function check_geoid_version($version) { |
@@ -3025,13 +3025,13 @@ discard block |
||
| 3025 | 3025 | try { |
| 3026 | 3026 | $Connection = new Connection(); |
| 3027 | 3027 | $sth = $Connection->db->prepare($query); |
| 3028 | - $sth->execute(array(':version' => $version)); |
|
| 3029 | - } catch(PDOException $e) { |
|
| 3030 | - return "error : ".$e->getMessage(); |
|
| 3031 | - } |
|
| 3032 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3033 | - if ($row['nb'] > 0) return true; |
|
| 3034 | - else return false; |
|
| 3028 | + $sth->execute(array(':version' => $version)); |
|
| 3029 | + } catch(PDOException $e) { |
|
| 3030 | + return "error : ".$e->getMessage(); |
|
| 3031 | + } |
|
| 3032 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3033 | + if ($row['nb'] > 0) return true; |
|
| 3034 | + else return false; |
|
| 3035 | 3035 | } |
| 3036 | 3036 | |
| 3037 | 3037 | public static function check_marine_identity_version($version) { |
@@ -3132,10 +3132,10 @@ discard block |
||
| 3132 | 3132 | try { |
| 3133 | 3133 | $Connection = new Connection(); |
| 3134 | 3134 | $sth = $Connection->db->prepare($query); |
| 3135 | - $sth->execute(array(':version' => $version)); |
|
| 3136 | - } catch(PDOException $e) { |
|
| 3137 | - return "error : ".$e->getMessage(); |
|
| 3138 | - } |
|
| 3135 | + $sth->execute(array(':version' => $version)); |
|
| 3136 | + } catch(PDOException $e) { |
|
| 3137 | + return "error : ".$e->getMessage(); |
|
| 3138 | + } |
|
| 3139 | 3139 | } |
| 3140 | 3140 | |
| 3141 | 3141 | public static function insert_marine_identity_version($version) { |
@@ -3172,13 +3172,13 @@ discard block |
||
| 3172 | 3172 | try { |
| 3173 | 3173 | $Connection = new Connection(); |
| 3174 | 3174 | $sth = $Connection->db->prepare($query); |
| 3175 | - $sth->execute(); |
|
| 3176 | - } catch(PDOException $e) { |
|
| 3177 | - return "error : ".$e->getMessage(); |
|
| 3178 | - } |
|
| 3179 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3180 | - if ($row['nb'] > 0) return false; |
|
| 3181 | - else return true; |
|
| 3175 | + $sth->execute(); |
|
| 3176 | + } catch(PDOException $e) { |
|
| 3177 | + return "error : ".$e->getMessage(); |
|
| 3178 | + } |
|
| 3179 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3180 | + if ($row['nb'] > 0) return false; |
|
| 3181 | + else return true; |
|
| 3182 | 3182 | } |
| 3183 | 3183 | |
| 3184 | 3184 | public static function insert_last_notam_update() { |
@@ -3187,10 +3187,10 @@ discard block |
||
| 3187 | 3187 | try { |
| 3188 | 3188 | $Connection = new Connection(); |
| 3189 | 3189 | $sth = $Connection->db->prepare($query); |
| 3190 | - $sth->execute(); |
|
| 3191 | - } catch(PDOException $e) { |
|
| 3192 | - return "error : ".$e->getMessage(); |
|
| 3193 | - } |
|
| 3190 | + $sth->execute(); |
|
| 3191 | + } catch(PDOException $e) { |
|
| 3192 | + return "error : ".$e->getMessage(); |
|
| 3193 | + } |
|
| 3194 | 3194 | } |
| 3195 | 3195 | |
| 3196 | 3196 | public static function check_last_airspace_update() { |
@@ -3203,13 +3203,13 @@ discard block |
||
| 3203 | 3203 | try { |
| 3204 | 3204 | $Connection = new Connection(); |
| 3205 | 3205 | $sth = $Connection->db->prepare($query); |
| 3206 | - $sth->execute(); |
|
| 3207 | - } catch(PDOException $e) { |
|
| 3208 | - return "error : ".$e->getMessage(); |
|
| 3209 | - } |
|
| 3210 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3211 | - if ($row['nb'] > 0) return false; |
|
| 3212 | - else return true; |
|
| 3206 | + $sth->execute(); |
|
| 3207 | + } catch(PDOException $e) { |
|
| 3208 | + return "error : ".$e->getMessage(); |
|
| 3209 | + } |
|
| 3210 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3211 | + if ($row['nb'] > 0) return false; |
|
| 3212 | + else return true; |
|
| 3213 | 3213 | } |
| 3214 | 3214 | |
| 3215 | 3215 | public static function insert_last_airspace_update() { |
@@ -3218,10 +3218,10 @@ discard block |
||
| 3218 | 3218 | try { |
| 3219 | 3219 | $Connection = new Connection(); |
| 3220 | 3220 | $sth = $Connection->db->prepare($query); |
| 3221 | - $sth->execute(); |
|
| 3222 | - } catch(PDOException $e) { |
|
| 3223 | - return "error : ".$e->getMessage(); |
|
| 3224 | - } |
|
| 3221 | + $sth->execute(); |
|
| 3222 | + } catch(PDOException $e) { |
|
| 3223 | + return "error : ".$e->getMessage(); |
|
| 3224 | + } |
|
| 3225 | 3225 | } |
| 3226 | 3226 | |
| 3227 | 3227 | public static function check_last_geoid_update() { |
@@ -3234,13 +3234,13 @@ discard block |
||
| 3234 | 3234 | try { |
| 3235 | 3235 | $Connection = new Connection(); |
| 3236 | 3236 | $sth = $Connection->db->prepare($query); |
| 3237 | - $sth->execute(); |
|
| 3238 | - } catch(PDOException $e) { |
|
| 3239 | - return "error : ".$e->getMessage(); |
|
| 3240 | - } |
|
| 3241 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3242 | - if ($row['nb'] > 0) return false; |
|
| 3243 | - else return true; |
|
| 3237 | + $sth->execute(); |
|
| 3238 | + } catch(PDOException $e) { |
|
| 3239 | + return "error : ".$e->getMessage(); |
|
| 3240 | + } |
|
| 3241 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3242 | + if ($row['nb'] > 0) return false; |
|
| 3243 | + else return true; |
|
| 3244 | 3244 | } |
| 3245 | 3245 | |
| 3246 | 3246 | public static function insert_last_geoid_update() { |
@@ -3249,10 +3249,10 @@ discard block |
||
| 3249 | 3249 | try { |
| 3250 | 3250 | $Connection = new Connection(); |
| 3251 | 3251 | $sth = $Connection->db->prepare($query); |
| 3252 | - $sth->execute(); |
|
| 3253 | - } catch(PDOException $e) { |
|
| 3254 | - return "error : ".$e->getMessage(); |
|
| 3255 | - } |
|
| 3252 | + $sth->execute(); |
|
| 3253 | + } catch(PDOException $e) { |
|
| 3254 | + return "error : ".$e->getMessage(); |
|
| 3255 | + } |
|
| 3256 | 3256 | } |
| 3257 | 3257 | |
| 3258 | 3258 | public static function check_last_owner_update() { |
@@ -3358,13 +3358,13 @@ discard block |
||
| 3358 | 3358 | try { |
| 3359 | 3359 | $Connection = new Connection(); |
| 3360 | 3360 | $sth = $Connection->db->prepare($query); |
| 3361 | - $sth->execute(); |
|
| 3362 | - } catch(PDOException $e) { |
|
| 3363 | - return "error : ".$e->getMessage(); |
|
| 3364 | - } |
|
| 3365 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3366 | - if ($row['nb'] > 0) return false; |
|
| 3367 | - else return true; |
|
| 3361 | + $sth->execute(); |
|
| 3362 | + } catch(PDOException $e) { |
|
| 3363 | + return "error : ".$e->getMessage(); |
|
| 3364 | + } |
|
| 3365 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3366 | + if ($row['nb'] > 0) return false; |
|
| 3367 | + else return true; |
|
| 3368 | 3368 | } |
| 3369 | 3369 | |
| 3370 | 3370 | public static function insert_last_schedules_update() { |
@@ -3544,10 +3544,10 @@ discard block |
||
| 3544 | 3544 | try { |
| 3545 | 3545 | $Connection = new Connection(); |
| 3546 | 3546 | $sth = $Connection->db->prepare($query); |
| 3547 | - $sth->execute(); |
|
| 3548 | - } catch(PDOException $e) { |
|
| 3549 | - return "error : ".$e->getMessage(); |
|
| 3550 | - } |
|
| 3547 | + $sth->execute(); |
|
| 3548 | + } catch(PDOException $e) { |
|
| 3549 | + return "error : ".$e->getMessage(); |
|
| 3550 | + } |
|
| 3551 | 3551 | } |
| 3552 | 3552 | public static function delete_duplicateowner() { |
| 3553 | 3553 | global $globalDBdriver; |
@@ -3559,10 +3559,10 @@ discard block |
||
| 3559 | 3559 | try { |
| 3560 | 3560 | $Connection = new Connection(); |
| 3561 | 3561 | $sth = $Connection->db->prepare($query); |
| 3562 | - $sth->execute(); |
|
| 3563 | - } catch(PDOException $e) { |
|
| 3564 | - return "error : ".$e->getMessage(); |
|
| 3565 | - } |
|
| 3562 | + $sth->execute(); |
|
| 3563 | + } catch(PDOException $e) { |
|
| 3564 | + return "error : ".$e->getMessage(); |
|
| 3565 | + } |
|
| 3566 | 3566 | } |
| 3567 | 3567 | |
| 3568 | 3568 | 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 | $delimiter = "\t"; |
@@ -1139,8 +1139,8 @@ discard block |
||
| 1139 | 1139 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1140 | 1140 | try { |
| 1141 | 1141 | $sth = $Connection->db->prepare($query); |
| 1142 | - $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')); |
|
| 1143 | - } catch(PDOException $e) { |
|
| 1142 | + $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')); |
|
| 1143 | + } catch (PDOException $e) { |
|
| 1144 | 1144 | return "error : ".$e->getMessage(); |
| 1145 | 1145 | } |
| 1146 | 1146 | } |
@@ -1172,7 +1172,7 @@ discard block |
||
| 1172 | 1172 | try { |
| 1173 | 1173 | $sth = $Connection->db->prepare($query); |
| 1174 | 1174 | $sth->execute(); |
| 1175 | - } catch(PDOException $e) { |
|
| 1175 | + } catch (PDOException $e) { |
|
| 1176 | 1176 | return "error : ".$e->getMessage(); |
| 1177 | 1177 | } |
| 1178 | 1178 | $delimiter = "\t"; |
@@ -1187,8 +1187,8 @@ discard block |
||
| 1187 | 1187 | $query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)'; |
| 1188 | 1188 | try { |
| 1189 | 1189 | $sth = $Connection->db->prepare($query); |
| 1190 | - $sth->execute(array(':name' => $data[0],':alias' => $data[1],':iata' => $data[2],':icao' => $data[3], ':callsign' => $data[4],':country' => $data[5],':active' => $data[6],':type' => $data[7],':home' => $data[8],':wikipedia_link' => $data[9],':alliance' => $data[10],':ban_eu' => $data[11])); |
|
| 1191 | - } catch(PDOException $e) { |
|
| 1190 | + $sth->execute(array(':name' => $data[0], ':alias' => $data[1], ':iata' => $data[2], ':icao' => $data[3], ':callsign' => $data[4], ':country' => $data[5], ':active' => $data[6], ':type' => $data[7], ':home' => $data[8], ':wikipedia_link' => $data[9], ':alliance' => $data[10], ':ban_eu' => $data[11])); |
|
| 1191 | + } catch (PDOException $e) { |
|
| 1192 | 1192 | return "error : ".$e->getMessage(); |
| 1193 | 1193 | } |
| 1194 | 1194 | } |
@@ -1216,7 +1216,7 @@ discard block |
||
| 1216 | 1216 | $Connection = new Connection(); |
| 1217 | 1217 | $sth = $Connection->db->prepare($query); |
| 1218 | 1218 | $sth->execute(array(':source' => 'website_fam')); |
| 1219 | - } catch(PDOException $e) { |
|
| 1219 | + } catch (PDOException $e) { |
|
| 1220 | 1220 | return "error : ".$e->getMessage(); |
| 1221 | 1221 | } |
| 1222 | 1222 | |
@@ -1232,8 +1232,8 @@ discard block |
||
| 1232 | 1232 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $Connection->db->prepare($query); |
| 1235 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1236 | - } catch(PDOException $e) { |
|
| 1235 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | //print_r($data); |
| 1238 | 1238 | return "error : ".$e->getMessage(); |
| 1239 | 1239 | } |
@@ -1253,7 +1253,7 @@ discard block |
||
| 1253 | 1253 | $Connection = new Connection(); |
| 1254 | 1254 | $sth = $Connection->db->prepare($query); |
| 1255 | 1255 | $sth->execute(array(':source' => 'website_fam')); |
| 1256 | - } catch(PDOException $e) { |
|
| 1256 | + } catch (PDOException $e) { |
|
| 1257 | 1257 | return "error : ".$e->getMessage(); |
| 1258 | 1258 | } |
| 1259 | 1259 | $delimiter = "\t"; |
@@ -1268,9 +1268,9 @@ discard block |
||
| 1268 | 1268 | $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)'; |
| 1269 | 1269 | try { |
| 1270 | 1270 | $sth = $Connection->db->prepare($query); |
| 1271 | - $sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam')); |
|
| 1272 | - } catch(PDOException $e) { |
|
| 1273 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1271 | + $sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam')); |
|
| 1272 | + } catch (PDOException $e) { |
|
| 1273 | + if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',', $data); |
|
| 1274 | 1274 | } |
| 1275 | 1275 | } |
| 1276 | 1276 | $i++; |
@@ -1288,7 +1288,7 @@ discard block |
||
| 1288 | 1288 | $Connection = new Connection(); |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | 1290 | $sth->execute(); |
| 1291 | - } catch(PDOException $e) { |
|
| 1291 | + } catch (PDOException $e) { |
|
| 1292 | 1292 | return "error : ".$e->getMessage(); |
| 1293 | 1293 | } |
| 1294 | 1294 | |
@@ -1309,8 +1309,8 @@ discard block |
||
| 1309 | 1309 | $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)'; |
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | - $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])); |
|
| 1313 | - } catch(PDOException $e) { |
|
| 1312 | + $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])); |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error : ".$e->getMessage(); |
| 1315 | 1315 | } |
| 1316 | 1316 | } |
@@ -1329,7 +1329,7 @@ discard block |
||
| 1329 | 1329 | $Connection = new Connection(); |
| 1330 | 1330 | $sth = $Connection->db->prepare($query); |
| 1331 | 1331 | $sth->execute(); |
| 1332 | - } catch(PDOException $e) { |
|
| 1332 | + } catch (PDOException $e) { |
|
| 1333 | 1333 | return "error : ".$e->getMessage(); |
| 1334 | 1334 | } |
| 1335 | 1335 | $delimiter = "\t"; |
@@ -1346,8 +1346,8 @@ discard block |
||
| 1346 | 1346 | 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)'; |
| 1347 | 1347 | try { |
| 1348 | 1348 | $sth = $Connection->db->prepare($query); |
| 1349 | - $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])); |
|
| 1350 | - } catch(PDOException $e) { |
|
| 1349 | + $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])); |
|
| 1350 | + } catch (PDOException $e) { |
|
| 1351 | 1351 | return "error : ".$e->getMessage(); |
| 1352 | 1352 | } |
| 1353 | 1353 | } |
@@ -1366,7 +1366,7 @@ discard block |
||
| 1366 | 1366 | $Connection = new Connection(); |
| 1367 | 1367 | $sth = $Connection->db->prepare($query); |
| 1368 | 1368 | $sth->execute(); |
| 1369 | - } catch(PDOException $e) { |
|
| 1369 | + } catch (PDOException $e) { |
|
| 1370 | 1370 | return "error : ".$e->getMessage(); |
| 1371 | 1371 | } |
| 1372 | 1372 | |
@@ -1382,7 +1382,7 @@ discard block |
||
| 1382 | 1382 | try { |
| 1383 | 1383 | $sth = $Connection->db->prepare($query); |
| 1384 | 1384 | $sth->execute(array(':icao' => $icao)); |
| 1385 | - } catch(PDOException $e) { |
|
| 1385 | + } catch (PDOException $e) { |
|
| 1386 | 1386 | return "error : ".$e->getMessage(); |
| 1387 | 1387 | } |
| 1388 | 1388 | } |
@@ -1393,7 +1393,7 @@ discard block |
||
| 1393 | 1393 | return ''; |
| 1394 | 1394 | } |
| 1395 | 1395 | |
| 1396 | - public static function tle($filename,$tletype) { |
|
| 1396 | + public static function tle($filename, $tletype) { |
|
| 1397 | 1397 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1398 | 1398 | global $tmp_dir, $globalTransaction; |
| 1399 | 1399 | //$Spotter = new Spotter(); |
@@ -1403,7 +1403,7 @@ discard block |
||
| 1403 | 1403 | $Connection = new Connection(); |
| 1404 | 1404 | $sth = $Connection->db->prepare($query); |
| 1405 | 1405 | $sth->execute(array(':source' => $filename)); |
| 1406 | - } catch(PDOException $e) { |
|
| 1406 | + } catch (PDOException $e) { |
|
| 1407 | 1407 | return "error : ".$e->getMessage(); |
| 1408 | 1408 | } |
| 1409 | 1409 | |
@@ -1428,8 +1428,8 @@ discard block |
||
| 1428 | 1428 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1429 | 1429 | try { |
| 1430 | 1430 | $sth = $Connection->db->prepare($query); |
| 1431 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1432 | - } catch(PDOException $e) { |
|
| 1431 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1432 | + } catch (PDOException $e) { |
|
| 1433 | 1433 | return "error : ".$e->getMessage(); |
| 1434 | 1434 | } |
| 1435 | 1435 | |
@@ -1449,7 +1449,7 @@ discard block |
||
| 1449 | 1449 | $Connection = new Connection(); |
| 1450 | 1450 | $sth = $Connection->db->prepare($query); |
| 1451 | 1451 | $sth->execute(array(':source' => $filename)); |
| 1452 | - } catch(PDOException $e) { |
|
| 1452 | + } catch (PDOException $e) { |
|
| 1453 | 1453 | return "error : ".$e->getMessage(); |
| 1454 | 1454 | } |
| 1455 | 1455 | |
@@ -1459,13 +1459,13 @@ discard block |
||
| 1459 | 1459 | $i = 0; |
| 1460 | 1460 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1461 | 1461 | //$Connection->db->beginTransaction(); |
| 1462 | - while (($data = fgetcsv($handle, 1000,"\t")) !== FALSE) |
|
| 1462 | + while (($data = fgetcsv($handle, 1000, "\t")) !== FALSE) |
|
| 1463 | 1463 | { |
| 1464 | 1464 | if ($i > 0 && $data[0] != '') { |
| 1465 | 1465 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
| 1466 | - $period = str_replace(',','',$data[14]); |
|
| 1467 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
| 1468 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1466 | + $period = str_replace(',', '', $data[14]); |
|
| 1467 | + if (!empty($period) && strpos($period, 'days')) $period = str_replace(' days', '', $period)*24*60; |
|
| 1468 | + if ($data[18] != '') $launch_date = date('Y-m-d', strtotime($data[18])); |
|
| 1469 | 1469 | else $launch_date = NULL; |
| 1470 | 1470 | $data = array_map(function($value) { |
| 1471 | 1471 | return trim($value) === '' ? null : $value; |
@@ -1475,8 +1475,8 @@ discard block |
||
| 1475 | 1475 | 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)'; |
| 1476 | 1476 | try { |
| 1477 | 1477 | $sth = $Connection->db->prepare($query); |
| 1478 | - $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)); |
|
| 1479 | - } catch(PDOException $e) { |
|
| 1478 | + $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)); |
|
| 1479 | + } catch (PDOException $e) { |
|
| 1480 | 1480 | return "error : ".$e->getMessage(); |
| 1481 | 1481 | } |
| 1482 | 1482 | } |
@@ -1516,7 +1516,7 @@ discard block |
||
| 1516 | 1516 | 'EGYP' => array('country' => 'Egypt', 'owner' => ''), |
| 1517 | 1517 | 'ESA' => array('country' => 'Multinational', 'owner' => 'European Space Agency'), |
| 1518 | 1518 | 'ESRO' => array('country' => 'Multinational', 'owner' => 'European Space Research Organization'), |
| 1519 | - 'EST' => array('country' => 'Estonia','owner' => ''), |
|
| 1519 | + 'EST' => array('country' => 'Estonia', 'owner' => ''), |
|
| 1520 | 1520 | 'EUME' => array('country' => 'Multinational', 'owner' => 'EUMETSAT (European Organization for the Exploitation of Meteorological Satellites)'), |
| 1521 | 1521 | 'EUTE' => array('country' => 'Multinational', 'owner' => 'European Telecommunications Satellite Consortium (EUTELSAT)'), |
| 1522 | 1522 | 'FGER' => array('country' => 'France/Germany', 'owner' => ''), |
@@ -1640,10 +1640,10 @@ discard block |
||
| 1640 | 1640 | { |
| 1641 | 1641 | if ($data != '') { |
| 1642 | 1642 | $result = array(); |
| 1643 | - $result['cospar'] = trim(substr($data,0,11)); |
|
| 1644 | - $result['norad'] = trim(substr($data,13,6)); |
|
| 1645 | - $result['operational'] = trim(substr($data,21,1)); |
|
| 1646 | - $result['name'] = trim(substr($data,23,24)); |
|
| 1643 | + $result['cospar'] = trim(substr($data, 0, 11)); |
|
| 1644 | + $result['norad'] = trim(substr($data, 13, 6)); |
|
| 1645 | + $result['operational'] = trim(substr($data, 21, 1)); |
|
| 1646 | + $result['name'] = trim(substr($data, 23, 24)); |
|
| 1647 | 1647 | /* |
| 1648 | 1648 | * R/B(1) = Rocket body, first stage |
| 1649 | 1649 | * R/B(2) = Rocket body, second stage |
@@ -1655,29 +1655,29 @@ discard block |
||
| 1655 | 1655 | * An ampersand (&) indicates two or more objects are attached |
| 1656 | 1656 | */ |
| 1657 | 1657 | |
| 1658 | - $owner_code = trim(substr($data,49,5)); |
|
| 1658 | + $owner_code = trim(substr($data, 49, 5)); |
|
| 1659 | 1659 | |
| 1660 | 1660 | if (!isset($satcat_sources[$owner_code])) { |
| 1661 | 1661 | echo $data; |
| 1662 | 1662 | echo 'owner_code: '.$owner_code."\n"; |
| 1663 | 1663 | } |
| 1664 | - if (!isset($satcat_launch_site[trim(substr($data,68,5))])) { |
|
| 1665 | - echo 'launch_site_code: '.trim(substr($data,68,5))."\n"; |
|
| 1664 | + if (!isset($satcat_launch_site[trim(substr($data, 68, 5))])) { |
|
| 1665 | + echo 'launch_site_code: '.trim(substr($data, 68, 5))."\n"; |
|
| 1666 | 1666 | } |
| 1667 | 1667 | |
| 1668 | - if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data,68,5))])) { |
|
| 1668 | + if ($owner_code != 'TBD' && isset($satcat_sources[$owner_code]) && isset($satcat_launch_site[trim(substr($data, 68, 5))])) { |
|
| 1669 | 1669 | $result['country_owner'] = $satcat_sources[$owner_code]['country']; |
| 1670 | 1670 | $result['owner'] = $satcat_sources[$owner_code]['owner']; |
| 1671 | - $result['launch_date'] = trim(substr($data,56,10)); |
|
| 1672 | - $launch_site_code = trim(substr($data,68,5)); |
|
| 1671 | + $result['launch_date'] = trim(substr($data, 56, 10)); |
|
| 1672 | + $launch_site_code = trim(substr($data, 68, 5)); |
|
| 1673 | 1673 | $result['launch_site'] = $satcat_launch_site[$launch_site_code]; |
| 1674 | - $result['lifetime'] = trim(substr($data,75,10)); |
|
| 1675 | - $result['period'] = trim(substr($data,87,7)); |
|
| 1676 | - $result['inclination'] = trim(substr($data,96,5)); |
|
| 1677 | - $result['apogee'] = trim(substr($data,103,6)); |
|
| 1678 | - $result['perigee'] = trim(substr($data,111,6)); |
|
| 1674 | + $result['lifetime'] = trim(substr($data, 75, 10)); |
|
| 1675 | + $result['period'] = trim(substr($data, 87, 7)); |
|
| 1676 | + $result['inclination'] = trim(substr($data, 96, 5)); |
|
| 1677 | + $result['apogee'] = trim(substr($data, 103, 6)); |
|
| 1678 | + $result['perigee'] = trim(substr($data, 111, 6)); |
|
| 1679 | 1679 | //$result['radarcross'] = trim(substr($data,119,8)); |
| 1680 | - $result['status'] = trim(substr($data,129,3)); |
|
| 1680 | + $result['status'] = trim(substr($data, 129, 3)); |
|
| 1681 | 1681 | //print_r($result); |
| 1682 | 1682 | $result = array_map(function($value) { |
| 1683 | 1683 | return trim($value) === '' ? null : $value; |
@@ -1690,7 +1690,7 @@ discard block |
||
| 1690 | 1690 | $sth = $Connection->db->prepare($query); |
| 1691 | 1691 | $sth->execute(array(':cospar' => $result['cospar'])); |
| 1692 | 1692 | $exist = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1693 | - } catch(PDOException $e) { |
|
| 1693 | + } catch (PDOException $e) { |
|
| 1694 | 1694 | return "error : ".$e->getMessage(); |
| 1695 | 1695 | } |
| 1696 | 1696 | if (empty($exist)) { |
@@ -1702,10 +1702,10 @@ discard block |
||
| 1702 | 1702 | ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
| 1703 | 1703 | ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
| 1704 | 1704 | ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
| 1705 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1705 | + ':contractor' => '', ':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | 1706 | ) |
| 1707 | 1707 | ); |
| 1708 | - } catch(PDOException $e) { |
|
| 1708 | + } catch (PDOException $e) { |
|
| 1709 | 1709 | return "error : ".$e->getMessage(); |
| 1710 | 1710 | } |
| 1711 | 1711 | } elseif ($exist[0]['name'] != $result['name'] && $exist[0]['name_alternate'] != $result['name']) { |
@@ -1713,8 +1713,8 @@ discard block |
||
| 1713 | 1713 | try { |
| 1714 | 1714 | $Connection = new Connection(); |
| 1715 | 1715 | $sth = $Connection->db->prepare($query); |
| 1716 | - $sth->execute(array(':name_alternate' => $result['name'],':cospar' => $result['cospar'])); |
|
| 1717 | - } catch(PDOException $e) { |
|
| 1716 | + $sth->execute(array(':name_alternate' => $result['name'], ':cospar' => $result['cospar'])); |
|
| 1717 | + } catch (PDOException $e) { |
|
| 1718 | 1718 | return "error : ".$e->getMessage(); |
| 1719 | 1719 | } |
| 1720 | 1720 | } |
@@ -1833,13 +1833,13 @@ discard block |
||
| 1833 | 1833 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1834 | 1834 | { |
| 1835 | 1835 | $i++; |
| 1836 | - if($i > 3 && count($row) > 2) { |
|
| 1836 | + if ($i > 3 && count($row) > 2) { |
|
| 1837 | 1837 | $data = array_values(array_filter($row)); |
| 1838 | 1838 | $cntdata = count($data); |
| 1839 | 1839 | if ($cntdata > 10) { |
| 1840 | 1840 | $value = $data[9]; |
| 1841 | 1841 | |
| 1842 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1842 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1843 | 1843 | $value .= ' '.$data[$i]; |
| 1844 | 1844 | } |
| 1845 | 1845 | $data[9] = $value; |
@@ -1849,8 +1849,8 @@ discard block |
||
| 1849 | 1849 | $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)'; |
| 1850 | 1850 | try { |
| 1851 | 1851 | $sth = $Connection->db->prepare($query); |
| 1852 | - $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])); |
|
| 1853 | - } catch(PDOException $e) { |
|
| 1852 | + $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])); |
|
| 1853 | + } catch (PDOException $e) { |
|
| 1854 | 1854 | return "error : ".$e->getMessage(); |
| 1855 | 1855 | } |
| 1856 | 1856 | } |
@@ -1867,16 +1867,16 @@ discard block |
||
| 1867 | 1867 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
| 1868 | 1868 | $delimiter = ','; |
| 1869 | 1869 | $Common = new Common(); |
| 1870 | - $Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv',$tmp_dir.'fires.csv'); |
|
| 1870 | + $Common->download('http://firms.modaps.eosdis.nasa.gov/active_fire/viirs/text/VNP14IMGTDL_NRT_Global_24h.csv', $tmp_dir.'fires.csv'); |
|
| 1871 | 1871 | $Connection = new Connection(); |
| 1872 | 1872 | $Source = new Source(); |
| 1873 | 1873 | $Source->deleteLocationByType('fires'); |
| 1874 | 1874 | $i = 0; |
| 1875 | - if (($handle = fopen($tmp_dir.'fires.csv','r')) !== false) { |
|
| 1876 | - while (($row = fgetcsv($handle,1000)) !== false) { |
|
| 1875 | + if (($handle = fopen($tmp_dir.'fires.csv', 'r')) !== false) { |
|
| 1876 | + while (($row = fgetcsv($handle, 1000)) !== false) { |
|
| 1877 | 1877 | if ($i > 0 && $row[0] != '' && $row[8] != 'low') { |
| 1878 | - $description = array('bright_t14' => $row[2],'scan' => $row[3],'track' => $row[4],'sat' => $row[7],'confidence' => $row[8],'version' => $row[9],'bright_t15' => $row[10],'frp' => $row[11],'daynight' => $row[12]); |
|
| 1879 | - $Source->addLocation('',$row[0],$row[1],null,'','','fires','fire.png','fires',0,0,$row[5].' '.substr($row[6],0,2).':'.substr($row[6],2,2),json_encode($description)); |
|
| 1878 | + $description = array('bright_t14' => $row[2], 'scan' => $row[3], 'track' => $row[4], 'sat' => $row[7], 'confidence' => $row[8], 'version' => $row[9], 'bright_t15' => $row[10], 'frp' => $row[11], 'daynight' => $row[12]); |
|
| 1879 | + $Source->addLocation('', $row[0], $row[1], null, '', '', 'fires', 'fire.png', 'fires', 0, 0, $row[5].' '.substr($row[6], 0, 2).':'.substr($row[6], 2, 2), json_encode($description)); |
|
| 1880 | 1880 | } |
| 1881 | 1881 | $i++; |
| 1882 | 1882 | } |
@@ -1892,7 +1892,7 @@ discard block |
||
| 1892 | 1892 | $Connection = new Connection(); |
| 1893 | 1893 | $sth = $Connection->db->prepare($query); |
| 1894 | 1894 | $sth->execute(); |
| 1895 | - } catch(PDOException $e) { |
|
| 1895 | + } catch (PDOException $e) { |
|
| 1896 | 1896 | return "error : ".$e->getMessage(); |
| 1897 | 1897 | } |
| 1898 | 1898 | $header = NULL; |
@@ -1903,12 +1903,12 @@ discard block |
||
| 1903 | 1903 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1904 | 1904 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1905 | 1905 | { |
| 1906 | - if(count($row) > 1) { |
|
| 1906 | + if (count($row) > 1) { |
|
| 1907 | 1907 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1908 | 1908 | try { |
| 1909 | 1909 | $sth = $Connection->db->prepare($query); |
| 1910 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1911 | - } catch(PDOException $e) { |
|
| 1910 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1911 | + } catch (PDOException $e) { |
|
| 1912 | 1912 | return "error : ".$e->getMessage(); |
| 1913 | 1913 | } |
| 1914 | 1914 | } |
@@ -1928,21 +1928,21 @@ discard block |
||
| 1928 | 1928 | try { |
| 1929 | 1929 | $sth = $Connection->db->prepare($query); |
| 1930 | 1930 | $sth->execute(); |
| 1931 | - } catch(PDOException $e) { |
|
| 1931 | + } catch (PDOException $e) { |
|
| 1932 | 1932 | return "error : ".$e->getMessage(); |
| 1933 | 1933 | } |
| 1934 | 1934 | } |
| 1935 | 1935 | |
| 1936 | 1936 | |
| 1937 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1937 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1938 | 1938 | else { |
| 1939 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1939 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1940 | 1940 | $query = "CREATE EXTENSION postgis"; |
| 1941 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1941 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1942 | 1942 | try { |
| 1943 | 1943 | $sth = $Connection->db->prepare($query); |
| 1944 | 1944 | $sth->execute(); |
| 1945 | - } catch(PDOException $e) { |
|
| 1945 | + } catch (PDOException $e) { |
|
| 1946 | 1946 | return "error : ".$e->getMessage(); |
| 1947 | 1947 | } |
| 1948 | 1948 | } |
@@ -1955,13 +1955,13 @@ discard block |
||
| 1955 | 1955 | include_once('class.create_db.php'); |
| 1956 | 1956 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1957 | 1957 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1958 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5'); |
|
| 1958 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5', $tmp_dir.'notam.txt.gz.md5'); |
|
| 1959 | 1959 | $error = ''; |
| 1960 | 1960 | if (file_exists($tmp_dir.'notam.txt.gz.md5')) { |
| 1961 | - $notam_md5_file = explode(' ',file_get_contents($tmp_dir.'notam.txt.gz.md5')); |
|
| 1961 | + $notam_md5_file = explode(' ', file_get_contents($tmp_dir.'notam.txt.gz.md5')); |
|
| 1962 | 1962 | $notam_md5 = $notam_md5_file[0]; |
| 1963 | 1963 | if (!update_db::check_notam_version($notam_md5)) { |
| 1964 | - update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1964 | + update_db::download('http://data.flightairmap.com/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1965 | 1965 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1966 | 1966 | if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) { |
| 1967 | 1967 | if ($globalDebug) echo "Gunzip..."; |
@@ -1997,14 +1997,14 @@ discard block |
||
| 1997 | 1997 | try { |
| 1998 | 1998 | $sth = $Connection->db->prepare($query); |
| 1999 | 1999 | $sth->execute(); |
| 2000 | - } catch(PDOException $e) { |
|
| 2000 | + } catch (PDOException $e) { |
|
| 2001 | 2001 | echo "error : ".$e->getMessage(); |
| 2002 | 2002 | } |
| 2003 | 2003 | } |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
| 2005 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 2005 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 2006 | 2006 | } else { |
| 2007 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 2007 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 2008 | 2008 | } |
| 2009 | 2009 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 2010 | 2010 | return $error; |
@@ -2017,7 +2017,7 @@ discard block |
||
| 2017 | 2017 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 2018 | 2018 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 2019 | 2019 | // 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'); |
| 2020 | - 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'); |
|
| 2020 | + 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'); |
|
| 2021 | 2021 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 2022 | 2022 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 2023 | 2023 | return $error; |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 2039 | 2039 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 2040 | 2040 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 2041 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2041 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2042 | 2042 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 2043 | 2043 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 2044 | 2044 | } else $error = "ZIP module not loaded but required for IVAO."; |
@@ -2052,7 +2052,7 @@ discard block |
||
| 2052 | 2052 | global $tmp_dir, $globalDebug; |
| 2053 | 2053 | $error = ''; |
| 2054 | 2054 | if ($globalDebug) echo "Routes : Download..."; |
| 2055 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 2055 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 2056 | 2056 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 2057 | 2057 | if ($globalDebug) echo "Gunzip..."; |
| 2058 | 2058 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -2068,7 +2068,7 @@ discard block |
||
| 2068 | 2068 | global $tmp_dir, $globalDebug; |
| 2069 | 2069 | $error = ''; |
| 2070 | 2070 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 2071 | - update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 2071 | + update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 2072 | 2072 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 2073 | 2073 | if ($globalDebug) echo "Gunzip..."; |
| 2074 | 2074 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -2084,7 +2084,7 @@ discard block |
||
| 2084 | 2084 | global $tmp_dir, $globalDebug; |
| 2085 | 2085 | $error = ''; |
| 2086 | 2086 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 2087 | - update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 2087 | + update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 2088 | 2088 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 2089 | 2089 | if ($globalDebug) echo "Gunzip..."; |
| 2090 | 2090 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -2112,7 +2112,7 @@ discard block |
||
| 2112 | 2112 | */ |
| 2113 | 2113 | if ($globalDebug) echo "Modes : Download..."; |
| 2114 | 2114 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 2115 | - update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 2115 | + update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 2116 | 2116 | |
| 2117 | 2117 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 2118 | 2118 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -2132,7 +2132,7 @@ discard block |
||
| 2132 | 2132 | public static function update_ModeS_faa() { |
| 2133 | 2133 | global $tmp_dir, $globalDebug; |
| 2134 | 2134 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 2135 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 2135 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 2136 | 2136 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 2137 | 2137 | if ($globalDebug) echo "Unzip..."; |
| 2138 | 2138 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -2148,7 +2148,7 @@ discard block |
||
| 2148 | 2148 | public static function update_ModeS_flarm() { |
| 2149 | 2149 | global $tmp_dir, $globalDebug; |
| 2150 | 2150 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 2151 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 2151 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 2152 | 2152 | if (file_exists($tmp_dir.'data.fln')) { |
| 2153 | 2153 | if ($globalDebug) echo "Add to DB..."; |
| 2154 | 2154 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -2162,7 +2162,7 @@ discard block |
||
| 2162 | 2162 | public static function update_ModeS_ogn() { |
| 2163 | 2163 | global $tmp_dir, $globalDebug; |
| 2164 | 2164 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 2165 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 2165 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 2166 | 2166 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 2167 | 2167 | if ($globalDebug) echo "Add to DB..."; |
| 2168 | 2168 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -2177,201 +2177,201 @@ discard block |
||
| 2177 | 2177 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 2178 | 2178 | |
| 2179 | 2179 | if ($globalDebug) echo "Owner France: Download..."; |
| 2180 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 2180 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 2181 | 2181 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 2182 | 2182 | if ($globalDebug) echo "Add to DB..."; |
| 2183 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 2183 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 2184 | 2184 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 2185 | 2185 | if ($error != '') { |
| 2186 | 2186 | return $error; |
| 2187 | 2187 | } elseif ($globalDebug) echo "Done\n"; |
| 2188 | 2188 | |
| 2189 | 2189 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 2190 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 2190 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 2191 | 2191 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 2192 | 2192 | if ($globalDebug) echo "Add to DB..."; |
| 2193 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 2193 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 2194 | 2194 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 2195 | 2195 | if ($error != '') { |
| 2196 | 2196 | return $error; |
| 2197 | 2197 | } elseif ($globalDebug) echo "Done\n"; |
| 2198 | 2198 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 2199 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 2199 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 2200 | 2200 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 2201 | 2201 | if ($globalDebug) echo "Add to DB..."; |
| 2202 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 2202 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 2203 | 2203 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 2204 | 2204 | if ($error != '') { |
| 2205 | 2205 | return $error; |
| 2206 | 2206 | } elseif ($globalDebug) echo "Done\n"; |
| 2207 | 2207 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 2208 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 2208 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 2209 | 2209 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 2210 | 2210 | if ($globalDebug) echo "Add to DB..."; |
| 2211 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 2211 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 2212 | 2212 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 2213 | 2213 | if ($error != '') { |
| 2214 | 2214 | return $error; |
| 2215 | 2215 | } elseif ($globalDebug) echo "Done\n"; |
| 2216 | 2216 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 2217 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 2217 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 2218 | 2218 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 2219 | 2219 | if ($globalDebug) echo "Add to DB..."; |
| 2220 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 2220 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 2221 | 2221 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 2222 | 2222 | if ($error != '') { |
| 2223 | 2223 | return $error; |
| 2224 | 2224 | } elseif ($globalDebug) echo "Done\n"; |
| 2225 | 2225 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 2226 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 2226 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 2227 | 2227 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 2228 | 2228 | if ($globalDebug) echo "Add to DB..."; |
| 2229 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 2229 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 2230 | 2230 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 2231 | 2231 | if ($error != '') { |
| 2232 | 2232 | return $error; |
| 2233 | 2233 | } elseif ($globalDebug) echo "Done\n"; |
| 2234 | 2234 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 2235 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 2235 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 2236 | 2236 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 2237 | 2237 | if ($globalDebug) echo "Add to DB..."; |
| 2238 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 2238 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 2239 | 2239 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 2240 | 2240 | if ($error != '') { |
| 2241 | 2241 | return $error; |
| 2242 | 2242 | } elseif ($globalDebug) echo "Done\n"; |
| 2243 | 2243 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 2244 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 2244 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 2245 | 2245 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 2246 | 2246 | if ($globalDebug) echo "Add to DB..."; |
| 2247 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 2247 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 2248 | 2248 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 2249 | 2249 | if ($error != '') { |
| 2250 | 2250 | return $error; |
| 2251 | 2251 | } elseif ($globalDebug) echo "Done\n"; |
| 2252 | 2252 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 2253 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 2253 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 2254 | 2254 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 2255 | 2255 | if ($globalDebug) echo "Add to DB..."; |
| 2256 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 2256 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 2257 | 2257 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 2258 | 2258 | if ($error != '') { |
| 2259 | 2259 | return $error; |
| 2260 | 2260 | } elseif ($globalDebug) echo "Done\n"; |
| 2261 | 2261 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 2262 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 2262 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 2263 | 2263 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 2264 | 2264 | if ($globalDebug) echo "Add to DB..."; |
| 2265 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 2265 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 2266 | 2266 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 2267 | 2267 | if ($error != '') { |
| 2268 | 2268 | return $error; |
| 2269 | 2269 | } elseif ($globalDebug) echo "Done\n"; |
| 2270 | 2270 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 2271 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 2271 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 2272 | 2272 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 2273 | 2273 | if ($globalDebug) echo "Add to DB..."; |
| 2274 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 2274 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 2275 | 2275 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 2276 | 2276 | if ($error != '') { |
| 2277 | 2277 | return $error; |
| 2278 | 2278 | } elseif ($globalDebug) echo "Done\n"; |
| 2279 | 2279 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 2280 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 2280 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 2281 | 2281 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 2282 | 2282 | if ($globalDebug) echo "Add to DB..."; |
| 2283 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 2283 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 2284 | 2284 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 2285 | 2285 | if ($error != '') { |
| 2286 | 2286 | return $error; |
| 2287 | 2287 | } elseif ($globalDebug) echo "Done\n"; |
| 2288 | 2288 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 2289 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 2289 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 2290 | 2290 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 2291 | 2291 | if ($globalDebug) echo "Add to DB..."; |
| 2292 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 2292 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 2293 | 2293 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 2294 | 2294 | if ($error != '') { |
| 2295 | 2295 | return $error; |
| 2296 | 2296 | } elseif ($globalDebug) echo "Done\n"; |
| 2297 | 2297 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 2298 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 2298 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 2299 | 2299 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 2300 | 2300 | if ($globalDebug) echo "Add to DB..."; |
| 2301 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 2301 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 2302 | 2302 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 2303 | 2303 | if ($error != '') { |
| 2304 | 2304 | return $error; |
| 2305 | 2305 | } elseif ($globalDebug) echo "Done\n"; |
| 2306 | 2306 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 2307 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 2307 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 2308 | 2308 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 2309 | 2309 | if ($globalDebug) echo "Add to DB..."; |
| 2310 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 2310 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 2311 | 2311 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 2312 | 2312 | if ($error != '') { |
| 2313 | 2313 | return $error; |
| 2314 | 2314 | } elseif ($globalDebug) echo "Done\n"; |
| 2315 | 2315 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 2316 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 2316 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 2317 | 2317 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 2318 | 2318 | if ($globalDebug) echo "Add to DB..."; |
| 2319 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 2319 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 2320 | 2320 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 2321 | 2321 | if ($error != '') { |
| 2322 | 2322 | return $error; |
| 2323 | 2323 | } elseif ($globalDebug) echo "Done\n"; |
| 2324 | 2324 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 2325 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 2325 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 2326 | 2326 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 2327 | 2327 | if ($globalDebug) echo "Add to DB..."; |
| 2328 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 2328 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 2329 | 2329 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 2330 | 2330 | if ($error != '') { |
| 2331 | 2331 | return $error; |
| 2332 | 2332 | } elseif ($globalDebug) echo "Done\n"; |
| 2333 | 2333 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 2334 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 2334 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 2335 | 2335 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 2336 | 2336 | if ($globalDebug) echo "Add to DB..."; |
| 2337 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 2337 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 2338 | 2338 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 2339 | 2339 | if ($error != '') { |
| 2340 | 2340 | return $error; |
| 2341 | 2341 | } elseif ($globalDebug) echo "Done\n"; |
| 2342 | 2342 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 2343 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 2343 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 2344 | 2344 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 2345 | 2345 | if ($globalDebug) echo "Add to DB..."; |
| 2346 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 2346 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 2347 | 2347 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 2348 | 2348 | if ($error != '') { |
| 2349 | 2349 | return $error; |
| 2350 | 2350 | } elseif ($globalDebug) echo "Done\n"; |
| 2351 | 2351 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 2352 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 2352 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 2353 | 2353 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 2354 | 2354 | if ($globalDebug) echo "Add to DB..."; |
| 2355 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 2355 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 2356 | 2356 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 2357 | 2357 | if ($error != '') { |
| 2358 | 2358 | return $error; |
| 2359 | 2359 | } elseif ($globalDebug) echo "Done\n"; |
| 2360 | 2360 | if ($globalMasterSource) { |
| 2361 | 2361 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 2362 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 2362 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 2363 | 2363 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 2364 | 2364 | if ($globalDebug) echo "Add to DB..."; |
| 2365 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 2365 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 2366 | 2366 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 2367 | 2367 | if ($error != '') { |
| 2368 | 2368 | return $error; |
| 2369 | 2369 | } elseif ($globalDebug) echo "Done\n"; |
| 2370 | 2370 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 2371 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 2371 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 2372 | 2372 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 2373 | 2373 | if ($globalDebug) echo "Add to DB..."; |
| 2374 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 2374 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 2375 | 2375 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 2376 | 2376 | if ($error != '') { |
| 2377 | 2377 | return $error; |
@@ -2384,7 +2384,7 @@ discard block |
||
| 2384 | 2384 | global $tmp_dir, $globalDebug; |
| 2385 | 2385 | $error = ''; |
| 2386 | 2386 | if ($globalDebug) echo "Translation : Download..."; |
| 2387 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 2387 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 2388 | 2388 | if (file_exists($tmp_dir.'translation.zip')) { |
| 2389 | 2389 | if ($globalDebug) echo "Unzip..."; |
| 2390 | 2390 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -2401,10 +2401,10 @@ discard block |
||
| 2401 | 2401 | global $tmp_dir, $globalDebug; |
| 2402 | 2402 | $error = ''; |
| 2403 | 2403 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 2404 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 2405 | - update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5'); |
|
| 2404 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 2405 | + update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5', $tmp_dir.'translation.tsv.gz.md5'); |
|
| 2406 | 2406 | if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) { |
| 2407 | - $translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
|
| 2407 | + $translation_md5_file = explode(' ', file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
|
| 2408 | 2408 | $translation_md5 = $translation_md5_file[0]; |
| 2409 | 2409 | if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) { |
| 2410 | 2410 | if ($globalDebug) echo "Gunzip..."; |
@@ -2422,10 +2422,10 @@ discard block |
||
| 2422 | 2422 | global $tmp_dir, $globalDebug; |
| 2423 | 2423 | $error = ''; |
| 2424 | 2424 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 2425 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 2426 | - update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5'); |
|
| 2425 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 2426 | + update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5', $tmp_dir.'modes.tsv.gz.md5'); |
|
| 2427 | 2427 | if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) { |
| 2428 | - $modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
|
| 2428 | + $modes_md5_file = explode(' ', file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
|
| 2429 | 2429 | $modes_md5 = $modes_md5_file[0]; |
| 2430 | 2430 | if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) { |
| 2431 | 2431 | if ($globalDebug) echo "Gunzip..."; |
@@ -2444,12 +2444,12 @@ discard block |
||
| 2444 | 2444 | global $tmp_dir, $globalDebug; |
| 2445 | 2445 | $error = ''; |
| 2446 | 2446 | if ($globalDebug) echo "Airlines from FlightAirMap website : Download..."; |
| 2447 | - update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5'); |
|
| 2447 | + update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5', $tmp_dir.'airlines.tsv.gz.md5'); |
|
| 2448 | 2448 | if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) { |
| 2449 | - $airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
|
| 2449 | + $airlines_md5_file = explode(' ', file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
|
| 2450 | 2450 | $airlines_md5 = $airlines_md5_file[0]; |
| 2451 | 2451 | if (!update_db::check_airlines_version($airlines_md5)) { |
| 2452 | - update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz'); |
|
| 2452 | + update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz', $tmp_dir.'airlines.tsv.gz'); |
|
| 2453 | 2453 | if (file_exists($tmp_dir.'airlines.tsv.gz')) { |
| 2454 | 2454 | if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) { |
| 2455 | 2455 | if ($globalDebug) echo "Gunzip..."; |
@@ -2474,14 +2474,14 @@ discard block |
||
| 2474 | 2474 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 2475 | 2475 | $error = ''; |
| 2476 | 2476 | if ($globalOwner === TRUE) { |
| 2477 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2478 | - update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5'); |
|
| 2477 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2478 | + update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5'); |
|
| 2479 | 2479 | } else { |
| 2480 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 2481 | - update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5',$tmp_dir.'owners.tsv.gz.md5'); |
|
| 2480 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 2481 | + update_db::download('http://data.flightairmap.com/data/owners.tsv.gz.md5', $tmp_dir.'owners.tsv.gz.md5'); |
|
| 2482 | 2482 | } |
| 2483 | 2483 | if (file_exists($tmp_dir.'owners.tsv.gz') && file_exists($tmp_dir.'owners.tsv.gz.md5')) { |
| 2484 | - $owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
|
| 2484 | + $owners_md5_file = explode(' ', file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
|
| 2485 | 2485 | $owners_md5 = $owners_md5_file[0]; |
| 2486 | 2486 | if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) { |
| 2487 | 2487 | if ($globalDebug) echo "Gunzip..."; |
@@ -2498,10 +2498,10 @@ discard block |
||
| 2498 | 2498 | public static function update_routes_fam() { |
| 2499 | 2499 | global $tmp_dir, $globalDebug; |
| 2500 | 2500 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 2501 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 2502 | - update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5'); |
|
| 2501 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 2502 | + update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5', $tmp_dir.'routes.tsv.gz.md5'); |
|
| 2503 | 2503 | if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) { |
| 2504 | - $routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
|
| 2504 | + $routes_md5_file = explode(' ', file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
|
| 2505 | 2505 | $routes_md5 = $routes_md5_file[0]; |
| 2506 | 2506 | if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) { |
| 2507 | 2507 | if ($globalDebug) echo "Gunzip..."; |
@@ -2517,13 +2517,13 @@ discard block |
||
| 2517 | 2517 | } |
| 2518 | 2518 | public static function update_marine_identity_fam() { |
| 2519 | 2519 | global $tmp_dir, $globalDebug; |
| 2520 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2520 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2521 | 2521 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
| 2522 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2522 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2523 | 2523 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2524 | 2524 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2525 | 2525 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
| 2526 | - update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
| 2526 | + update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
| 2527 | 2527 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2528 | 2528 | if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) { |
| 2529 | 2529 | if ($globalDebug) echo "Gunzip..."; |
@@ -2545,13 +2545,13 @@ discard block |
||
| 2545 | 2545 | |
| 2546 | 2546 | public static function update_satellite_fam() { |
| 2547 | 2547 | global $tmp_dir, $globalDebug; |
| 2548 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5',$tmp_dir.'satellite.tsv.gz.md5'); |
|
| 2548 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz.md5', $tmp_dir.'satellite.tsv.gz.md5'); |
|
| 2549 | 2549 | if (file_exists($tmp_dir.'satellite.tsv.gz.md5')) { |
| 2550 | - $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
| 2550 | + $satellite_md5_file = explode(' ', file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
|
| 2551 | 2551 | $satellite_md5 = $satellite_md5_file[0]; |
| 2552 | 2552 | if (!update_db::check_satellite_version($satellite_md5)) { |
| 2553 | 2553 | if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
| 2554 | - update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
|
| 2554 | + update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz', $tmp_dir.'satellite.tsv.gz'); |
|
| 2555 | 2555 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
| 2556 | 2556 | if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) { |
| 2557 | 2557 | if ($globalDebug) echo "Gunzip..."; |
@@ -2573,7 +2573,7 @@ discard block |
||
| 2573 | 2573 | public static function update_banned_fam() { |
| 2574 | 2574 | global $tmp_dir, $globalDebug; |
| 2575 | 2575 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 2576 | - update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 2576 | + update_db::download('http://data.flightairmap.com/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 2577 | 2577 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2578 | 2578 | //if ($globalDebug) echo "Gunzip..."; |
| 2579 | 2579 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2592,18 +2592,18 @@ discard block |
||
| 2592 | 2592 | $error = ''; |
| 2593 | 2593 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2594 | 2594 | if ($globalDBdriver == 'mysql') { |
| 2595 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2595 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2596 | 2596 | } else { |
| 2597 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2597 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2598 | 2598 | } |
| 2599 | 2599 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2600 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2600 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2601 | 2601 | $airspace_md5 = $airspace_md5_file[0]; |
| 2602 | 2602 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2603 | 2603 | if ($globalDBdriver == 'mysql') { |
| 2604 | - update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2604 | + update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2605 | 2605 | } else { |
| 2606 | - update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2606 | + update_db::download('http://data.flightairmap.com/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2607 | 2607 | } |
| 2608 | 2608 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2609 | 2609 | if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) { |
@@ -2616,7 +2616,7 @@ discard block |
||
| 2616 | 2616 | try { |
| 2617 | 2617 | $sth = $Connection->db->prepare($query); |
| 2618 | 2618 | $sth->execute(); |
| 2619 | - } catch(PDOException $e) { |
|
| 2619 | + } catch (PDOException $e) { |
|
| 2620 | 2620 | return "error : ".$e->getMessage(); |
| 2621 | 2621 | } |
| 2622 | 2622 | } |
@@ -2636,16 +2636,16 @@ discard block |
||
| 2636 | 2636 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2637 | 2637 | $error = ''; |
| 2638 | 2638 | if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
| 2639 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2639 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5', $tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
|
| 2640 | 2640 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2641 | - $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2641 | + $geoid_md5_file = explode(' ', file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
|
| 2642 | 2642 | $geoid_md5 = $geoid_md5_file[0]; |
| 2643 | 2643 | if (!update_db::check_geoid_version($geoid_md5)) { |
| 2644 | - update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2644 | + update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz', $tmp_dir.$globalGeoidSource.'.pgm.gz'); |
|
| 2645 | 2645 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2646 | 2646 | if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) { |
| 2647 | 2647 | if ($globalDebug) echo "Gunzip..."; |
| 2648 | - update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2648 | + update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz', dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
|
| 2649 | 2649 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2650 | 2650 | update_db::insert_geoid_version($geoid_md5); |
| 2651 | 2651 | } |
@@ -2662,15 +2662,15 @@ discard block |
||
| 2662 | 2662 | public static function update_tle() { |
| 2663 | 2663 | global $tmp_dir, $globalDebug; |
| 2664 | 2664 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2665 | - $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', |
|
| 2666 | - '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', |
|
| 2667 | - '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'); |
|
| 2665 | + $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', |
|
| 2666 | + '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', |
|
| 2667 | + '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'); |
|
| 2668 | 2668 | foreach ($alltle as $filename) { |
| 2669 | 2669 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2670 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2670 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2671 | 2671 | if (file_exists($tmp_dir.$filename)) { |
| 2672 | 2672 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2673 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2673 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2674 | 2674 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2675 | 2675 | if ($error != '') { |
| 2676 | 2676 | echo $error."\n"; |
@@ -2682,7 +2682,7 @@ discard block |
||
| 2682 | 2682 | public static function update_ucsdb() { |
| 2683 | 2683 | global $tmp_dir, $globalDebug; |
| 2684 | 2684 | if ($globalDebug) echo "Download UCS DB : Download..."; |
| 2685 | - 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'); |
|
| 2685 | + 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'); |
|
| 2686 | 2686 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
| 2687 | 2687 | if ($globalDebug) echo "Add to DB..."; |
| 2688 | 2688 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
@@ -2696,7 +2696,7 @@ discard block |
||
| 2696 | 2696 | public static function update_celestrak() { |
| 2697 | 2697 | global $tmp_dir, $globalDebug; |
| 2698 | 2698 | if ($globalDebug) echo "Download Celestrak DB : Download..."; |
| 2699 | - update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
|
| 2699 | + update_db::download('http://celestrak.com/pub/satcat.txt', $tmp_dir.'satcat.txt'); |
|
| 2700 | 2700 | if (file_exists($tmp_dir.'satcat.txt')) { |
| 2701 | 2701 | if ($globalDebug) echo "Add to DB..."; |
| 2702 | 2702 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
@@ -2711,63 +2711,63 @@ discard block |
||
| 2711 | 2711 | global $tmp_dir, $globalDebug; |
| 2712 | 2712 | $error = ''; |
| 2713 | 2713 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2714 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2714 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2715 | 2715 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2716 | 2716 | if ($globalDebug) echo "Check files...\n"; |
| 2717 | 2717 | $newmodelsdb = array(); |
| 2718 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2719 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2718 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2719 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2720 | 2720 | $model = trim($row[2]); |
| 2721 | 2721 | $newmodelsdb[$model] = trim($row[0]); |
| 2722 | 2722 | } |
| 2723 | 2723 | } |
| 2724 | 2724 | $modelsdb = array(); |
| 2725 | 2725 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2726 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2727 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2726 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2727 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2728 | 2728 | $model = trim($row[2]); |
| 2729 | 2729 | $modelsdb[$model] = trim($row[0]); |
| 2730 | 2730 | } |
| 2731 | 2731 | } |
| 2732 | 2732 | } |
| 2733 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2733 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2734 | 2734 | foreach ($diff as $key => $value) { |
| 2735 | 2735 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2736 | - update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2736 | + update_db::download('http://data.flightairmap.com/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2737 | 2737 | |
| 2738 | 2738 | } |
| 2739 | - update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2739 | + update_db::download('http://data.flightairmap.com/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2740 | 2740 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2741 | 2741 | if ($error != '') { |
| 2742 | 2742 | return $error; |
| 2743 | 2743 | } elseif ($globalDebug) echo "Done\n"; |
| 2744 | 2744 | if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download..."; |
| 2745 | - update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum'); |
|
| 2745 | + update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum', $tmp_dir.'modelsgltf2.md5sum'); |
|
| 2746 | 2746 | if (file_exists($tmp_dir.'modelsgltf2.md5sum')) { |
| 2747 | 2747 | if ($globalDebug) echo "Check files...\n"; |
| 2748 | 2748 | $newmodelsdb = array(); |
| 2749 | - if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) { |
|
| 2750 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2749 | + if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum', 'r')) !== FALSE) { |
|
| 2750 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2751 | 2751 | $model = trim($row[2]); |
| 2752 | 2752 | $newmodelsdb[$model] = trim($row[0]); |
| 2753 | 2753 | } |
| 2754 | 2754 | } |
| 2755 | 2755 | $modelsdb = array(); |
| 2756 | 2756 | if (file_exists(dirname(__FILE__).'/../models/gltf2/models.md5sum')) { |
| 2757 | - if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum','r')) !== FALSE) { |
|
| 2758 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2757 | + if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/models.md5sum', 'r')) !== FALSE) { |
|
| 2758 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2759 | 2759 | $model = trim($row[2]); |
| 2760 | 2760 | $modelsdb[$model] = trim($row[0]); |
| 2761 | 2761 | } |
| 2762 | 2762 | } |
| 2763 | 2763 | } |
| 2764 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2764 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2765 | 2765 | foreach ($diff as $key => $value) { |
| 2766 | 2766 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2767 | - update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key); |
|
| 2767 | + update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key, dirname(__FILE__).'/../models/gltf2/'.$key); |
|
| 2768 | 2768 | |
| 2769 | 2769 | } |
| 2770 | - update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum'); |
|
| 2770 | + update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum', dirname(__FILE__).'/../models/gltf2/models.md5sum'); |
|
| 2771 | 2771 | } else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed."; |
| 2772 | 2772 | if ($error != '') { |
| 2773 | 2773 | return $error; |
@@ -2779,32 +2779,32 @@ discard block |
||
| 2779 | 2779 | global $tmp_dir, $globalDebug; |
| 2780 | 2780 | $error = ''; |
| 2781 | 2781 | if ($globalDebug) echo "Liveries from FlightAirMap website : Download..."; |
| 2782 | - update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum'); |
|
| 2782 | + update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum', $tmp_dir.'liveries.md5sum'); |
|
| 2783 | 2783 | if (file_exists($tmp_dir.'liveries.md5sum')) { |
| 2784 | 2784 | if ($globalDebug) echo "Check files...\n"; |
| 2785 | 2785 | $newmodelsdb = array(); |
| 2786 | - if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) { |
|
| 2787 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2786 | + if (($handle = fopen($tmp_dir.'liveries.md5sum', 'r')) !== FALSE) { |
|
| 2787 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2788 | 2788 | $model = trim($row[2]); |
| 2789 | 2789 | $newmodelsdb[$model] = trim($row[0]); |
| 2790 | 2790 | } |
| 2791 | 2791 | } |
| 2792 | 2792 | $modelsdb = array(); |
| 2793 | 2793 | if (file_exists(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum')) { |
| 2794 | - if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum','r')) !== FALSE) { |
|
| 2795 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2794 | + if (($handle = fopen(dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum', 'r')) !== FALSE) { |
|
| 2795 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2796 | 2796 | $model = trim($row[2]); |
| 2797 | 2797 | $modelsdb[$model] = trim($row[0]); |
| 2798 | 2798 | } |
| 2799 | 2799 | } |
| 2800 | 2800 | } |
| 2801 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2801 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2802 | 2802 | foreach ($diff as $key => $value) { |
| 2803 | 2803 | if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n"; |
| 2804 | - update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key); |
|
| 2804 | + update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key, dirname(__FILE__).'/../models/gltf2/liveries/'.$key); |
|
| 2805 | 2805 | |
| 2806 | 2806 | } |
| 2807 | - update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum'); |
|
| 2807 | + update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum', dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum'); |
|
| 2808 | 2808 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2809 | 2809 | if ($error != '') { |
| 2810 | 2810 | return $error; |
@@ -2816,32 +2816,32 @@ discard block |
||
| 2816 | 2816 | global $tmp_dir, $globalDebug; |
| 2817 | 2817 | $error = ''; |
| 2818 | 2818 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2819 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2819 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2820 | 2820 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2821 | 2821 | if ($globalDebug) echo "Check files...\n"; |
| 2822 | 2822 | $newmodelsdb = array(); |
| 2823 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2824 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2823 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2824 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2825 | 2825 | $model = trim($row[2]); |
| 2826 | 2826 | $newmodelsdb[$model] = trim($row[0]); |
| 2827 | 2827 | } |
| 2828 | 2828 | } |
| 2829 | 2829 | $modelsdb = array(); |
| 2830 | 2830 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2831 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2832 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2831 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2832 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2833 | 2833 | $model = trim($row[2]); |
| 2834 | 2834 | $modelsdb[$model] = trim($row[0]); |
| 2835 | 2835 | } |
| 2836 | 2836 | } |
| 2837 | 2837 | } |
| 2838 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2838 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2839 | 2839 | foreach ($diff as $key => $value) { |
| 2840 | 2840 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2841 | - update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2841 | + update_db::download('http://data.flightairmap.com/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2842 | 2842 | |
| 2843 | 2843 | } |
| 2844 | - update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2844 | + update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2845 | 2845 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2846 | 2846 | if ($error != '') { |
| 2847 | 2847 | return $error; |
@@ -2853,32 +2853,32 @@ discard block |
||
| 2853 | 2853 | global $tmp_dir, $globalDebug; |
| 2854 | 2854 | $error = ''; |
| 2855 | 2855 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2856 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2856 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2857 | 2857 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2858 | 2858 | if ($globalDebug) echo "Check files...\n"; |
| 2859 | 2859 | $newmodelsdb = array(); |
| 2860 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2861 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2860 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2861 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2862 | 2862 | $model = trim($row[2]); |
| 2863 | 2863 | $newmodelsdb[$model] = trim($row[0]); |
| 2864 | 2864 | } |
| 2865 | 2865 | } |
| 2866 | 2866 | $modelsdb = array(); |
| 2867 | 2867 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2868 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2869 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2868 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2869 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2870 | 2870 | $model = trim($row[2]); |
| 2871 | 2871 | $modelsdb[$model] = trim($row[0]); |
| 2872 | 2872 | } |
| 2873 | 2873 | } |
| 2874 | 2874 | } |
| 2875 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2875 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2876 | 2876 | foreach ($diff as $key => $value) { |
| 2877 | 2877 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2878 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2878 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2879 | 2879 | |
| 2880 | 2880 | } |
| 2881 | - update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2881 | + update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2882 | 2882 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2883 | 2883 | if ($error != '') { |
| 2884 | 2884 | return $error; |
@@ -2901,8 +2901,8 @@ discard block |
||
| 2901 | 2901 | */ |
| 2902 | 2902 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2903 | 2903 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2904 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2905 | - $result = fread($fh,100000000); |
|
| 2904 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2905 | + $result = fread($fh, 100000000); |
|
| 2906 | 2906 | //echo $result; |
| 2907 | 2907 | //var_dump(str_get_html($result)); |
| 2908 | 2908 | //print_r(self::table2array($result)); |
@@ -2920,23 +2920,23 @@ discard block |
||
| 2920 | 2920 | $Connection = new Connection(); |
| 2921 | 2921 | $sth = $Connection->db->prepare($query); |
| 2922 | 2922 | $sth->execute(); |
| 2923 | - } catch(PDOException $e) { |
|
| 2923 | + } catch (PDOException $e) { |
|
| 2924 | 2924 | return "error : ".$e->getMessage(); |
| 2925 | 2925 | } |
| 2926 | 2926 | |
| 2927 | 2927 | $error = ''; |
| 2928 | 2928 | if ($globalDebug) echo "Notam : Download..."; |
| 2929 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2929 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2930 | 2930 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2931 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2931 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2932 | 2932 | foreach ($notams['channel']['item'] as $notam) { |
| 2933 | - $title = explode(':',$notam['title']); |
|
| 2933 | + $title = explode(':', $notam['title']); |
|
| 2934 | 2934 | $data['ref'] = trim($title[0]); |
| 2935 | 2935 | unset($title[0]); |
| 2936 | - $data['title'] = trim(implode(':',$title)); |
|
| 2937 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2938 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2939 | - $q = explode('/',$match[1]); |
|
| 2936 | + $data['title'] = trim(implode(':', $title)); |
|
| 2937 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2938 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2939 | + $q = explode('/', $match[1]); |
|
| 2940 | 2940 | $data['fir'] = $q[0]; |
| 2941 | 2941 | $data['code'] = $q[1]; |
| 2942 | 2942 | $ifrvfr = $q[2]; |
@@ -2952,30 +2952,30 @@ discard block |
||
| 2952 | 2952 | $data['lower_limit'] = $q[5]; |
| 2953 | 2953 | $data['upper_limit'] = $q[6]; |
| 2954 | 2954 | $latlonrad = $q[7]; |
| 2955 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2956 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2957 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2955 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2956 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2957 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2958 | 2958 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2959 | 2959 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2960 | 2960 | $data['center_latitude'] = $latitude; |
| 2961 | 2961 | $data['center_longitude'] = $longitude; |
| 2962 | 2962 | $data['radius'] = intval($radius); |
| 2963 | 2963 | |
| 2964 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2964 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2965 | 2965 | $data['text'] = $match[1]; |
| 2966 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2966 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2967 | 2967 | $fromto = $match[1]; |
| 2968 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2968 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2969 | 2969 | $fromall = trim($match[1]); |
| 2970 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2970 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2971 | 2971 | $from = trim($match[1]); |
| 2972 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2973 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2972 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2973 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2974 | 2974 | $toall = trim($match[1]); |
| 2975 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2976 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2975 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2976 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2977 | 2977 | $to = trim($match[1]); |
| 2978 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2978 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2979 | 2979 | $data['permanent'] = 0; |
| 2980 | 2980 | } else { |
| 2981 | 2981 | $data['date_end'] = NULL; |
@@ -2983,7 +2983,7 @@ discard block |
||
| 2983 | 2983 | } |
| 2984 | 2984 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2985 | 2985 | $NOTAM = new NOTAM(); |
| 2986 | - $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']); |
|
| 2986 | + $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']); |
|
| 2987 | 2987 | unset($data); |
| 2988 | 2988 | } |
| 2989 | 2989 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -3006,16 +3006,16 @@ discard block |
||
| 3006 | 3006 | $Connection = new Connection(); |
| 3007 | 3007 | $sth = $Connection->db->prepare($query); |
| 3008 | 3008 | $sth->execute(); |
| 3009 | - } catch(PDOException $e) { |
|
| 3009 | + } catch (PDOException $e) { |
|
| 3010 | 3010 | return "error : ".$e->getMessage(); |
| 3011 | 3011 | } |
| 3012 | 3012 | } |
| 3013 | 3013 | $Common = new Common(); |
| 3014 | 3014 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 3015 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 3015 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 3016 | 3016 | foreach ($airspace_json['records'] as $airspace) { |
| 3017 | 3017 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 3018 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 3018 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 3019 | 3019 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 3020 | 3020 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 3021 | 3021 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -3037,7 +3037,7 @@ discard block |
||
| 3037 | 3037 | $Connection = new Connection(); |
| 3038 | 3038 | $sth = $Connection->db->prepare($query); |
| 3039 | 3039 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 3040 | - } catch(PDOException $e) { |
|
| 3040 | + } catch (PDOException $e) { |
|
| 3041 | 3041 | return "error : ".$e->getMessage(); |
| 3042 | 3042 | } |
| 3043 | 3043 | } |
@@ -3054,7 +3054,7 @@ discard block |
||
| 3054 | 3054 | $Connection = new Connection(); |
| 3055 | 3055 | $sth = $Connection->db->prepare($query); |
| 3056 | 3056 | $sth->execute(); |
| 3057 | - } catch(PDOException $e) { |
|
| 3057 | + } catch (PDOException $e) { |
|
| 3058 | 3058 | return "error : ".$e->getMessage(); |
| 3059 | 3059 | } |
| 3060 | 3060 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3069,7 +3069,7 @@ discard block |
||
| 3069 | 3069 | $Connection = new Connection(); |
| 3070 | 3070 | $sth = $Connection->db->prepare($query); |
| 3071 | 3071 | $sth->execute(); |
| 3072 | - } catch(PDOException $e) { |
|
| 3072 | + } catch (PDOException $e) { |
|
| 3073 | 3073 | return "error : ".$e->getMessage(); |
| 3074 | 3074 | } |
| 3075 | 3075 | } |
@@ -3080,7 +3080,7 @@ discard block |
||
| 3080 | 3080 | $Connection = new Connection(); |
| 3081 | 3081 | $sth = $Connection->db->prepare($query); |
| 3082 | 3082 | $sth->execute(array(':version' => $version)); |
| 3083 | - } catch(PDOException $e) { |
|
| 3083 | + } catch (PDOException $e) { |
|
| 3084 | 3084 | return "error : ".$e->getMessage(); |
| 3085 | 3085 | } |
| 3086 | 3086 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3094,7 +3094,7 @@ discard block |
||
| 3094 | 3094 | $Connection = new Connection(); |
| 3095 | 3095 | $sth = $Connection->db->prepare($query); |
| 3096 | 3096 | $sth->execute(array(':version' => $version)); |
| 3097 | - } catch(PDOException $e) { |
|
| 3097 | + } catch (PDOException $e) { |
|
| 3098 | 3098 | return "error : ".$e->getMessage(); |
| 3099 | 3099 | } |
| 3100 | 3100 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3108,7 +3108,7 @@ discard block |
||
| 3108 | 3108 | $Connection = new Connection(); |
| 3109 | 3109 | $sth = $Connection->db->prepare($query); |
| 3110 | 3110 | $sth->execute(array(':version' => $version)); |
| 3111 | - } catch(PDOException $e) { |
|
| 3111 | + } catch (PDOException $e) { |
|
| 3112 | 3112 | return "error : ".$e->getMessage(); |
| 3113 | 3113 | } |
| 3114 | 3114 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3122,7 +3122,7 @@ discard block |
||
| 3122 | 3122 | $Connection = new Connection(); |
| 3123 | 3123 | $sth = $Connection->db->prepare($query); |
| 3124 | 3124 | $sth->execute(array(':version' => $version)); |
| 3125 | - } catch(PDOException $e) { |
|
| 3125 | + } catch (PDOException $e) { |
|
| 3126 | 3126 | return "error : ".$e->getMessage(); |
| 3127 | 3127 | } |
| 3128 | 3128 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3136,7 +3136,7 @@ discard block |
||
| 3136 | 3136 | $Connection = new Connection(); |
| 3137 | 3137 | $sth = $Connection->db->prepare($query); |
| 3138 | 3138 | $sth->execute(array(':version' => $version)); |
| 3139 | - } catch(PDOException $e) { |
|
| 3139 | + } catch (PDOException $e) { |
|
| 3140 | 3140 | return "error : ".$e->getMessage(); |
| 3141 | 3141 | } |
| 3142 | 3142 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3150,7 +3150,7 @@ discard block |
||
| 3150 | 3150 | $Connection = new Connection(); |
| 3151 | 3151 | $sth = $Connection->db->prepare($query); |
| 3152 | 3152 | $sth->execute(array(':version' => $version)); |
| 3153 | - } catch(PDOException $e) { |
|
| 3153 | + } catch (PDOException $e) { |
|
| 3154 | 3154 | return "error : ".$e->getMessage(); |
| 3155 | 3155 | } |
| 3156 | 3156 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3165,7 +3165,7 @@ discard block |
||
| 3165 | 3165 | $Connection = new Connection(); |
| 3166 | 3166 | $sth = $Connection->db->prepare($query); |
| 3167 | 3167 | $sth->execute(array(':version' => $version)); |
| 3168 | - } catch(PDOException $e) { |
|
| 3168 | + } catch (PDOException $e) { |
|
| 3169 | 3169 | return "error : ".$e->getMessage(); |
| 3170 | 3170 | } |
| 3171 | 3171 | } |
@@ -3177,7 +3177,7 @@ discard block |
||
| 3177 | 3177 | $Connection = new Connection(); |
| 3178 | 3178 | $sth = $Connection->db->prepare($query); |
| 3179 | 3179 | $sth->execute(array(':version' => $version)); |
| 3180 | - } catch(PDOException $e) { |
|
| 3180 | + } catch (PDOException $e) { |
|
| 3181 | 3181 | return "error : ".$e->getMessage(); |
| 3182 | 3182 | } |
| 3183 | 3183 | } |
@@ -3189,7 +3189,7 @@ discard block |
||
| 3189 | 3189 | $Connection = new Connection(); |
| 3190 | 3190 | $sth = $Connection->db->prepare($query); |
| 3191 | 3191 | $sth->execute(array(':version' => $version)); |
| 3192 | - } catch(PDOException $e) { |
|
| 3192 | + } catch (PDOException $e) { |
|
| 3193 | 3193 | return "error : ".$e->getMessage(); |
| 3194 | 3194 | } |
| 3195 | 3195 | } |
@@ -3201,7 +3201,7 @@ discard block |
||
| 3201 | 3201 | $Connection = new Connection(); |
| 3202 | 3202 | $sth = $Connection->db->prepare($query); |
| 3203 | 3203 | $sth->execute(array(':version' => $version)); |
| 3204 | - } catch(PDOException $e) { |
|
| 3204 | + } catch (PDOException $e) { |
|
| 3205 | 3205 | return "error : ".$e->getMessage(); |
| 3206 | 3206 | } |
| 3207 | 3207 | } |
@@ -3213,7 +3213,7 @@ discard block |
||
| 3213 | 3213 | $Connection = new Connection(); |
| 3214 | 3214 | $sth = $Connection->db->prepare($query); |
| 3215 | 3215 | $sth->execute(array(':version' => $version)); |
| 3216 | - } catch(PDOException $e) { |
|
| 3216 | + } catch (PDOException $e) { |
|
| 3217 | 3217 | return "error : ".$e->getMessage(); |
| 3218 | 3218 | } |
| 3219 | 3219 | } |
@@ -3225,7 +3225,7 @@ discard block |
||
| 3225 | 3225 | $Connection = new Connection(); |
| 3226 | 3226 | $sth = $Connection->db->prepare($query); |
| 3227 | 3227 | $sth->execute(array(':version' => $version)); |
| 3228 | - } catch(PDOException $e) { |
|
| 3228 | + } catch (PDOException $e) { |
|
| 3229 | 3229 | return "error : ".$e->getMessage(); |
| 3230 | 3230 | } |
| 3231 | 3231 | } |
@@ -3241,7 +3241,7 @@ discard block |
||
| 3241 | 3241 | $Connection = new Connection(); |
| 3242 | 3242 | $sth = $Connection->db->prepare($query); |
| 3243 | 3243 | $sth->execute(); |
| 3244 | - } catch(PDOException $e) { |
|
| 3244 | + } catch (PDOException $e) { |
|
| 3245 | 3245 | return "error : ".$e->getMessage(); |
| 3246 | 3246 | } |
| 3247 | 3247 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3256,7 +3256,7 @@ discard block |
||
| 3256 | 3256 | $Connection = new Connection(); |
| 3257 | 3257 | $sth = $Connection->db->prepare($query); |
| 3258 | 3258 | $sth->execute(); |
| 3259 | - } catch(PDOException $e) { |
|
| 3259 | + } catch (PDOException $e) { |
|
| 3260 | 3260 | return "error : ".$e->getMessage(); |
| 3261 | 3261 | } |
| 3262 | 3262 | } |
@@ -3272,7 +3272,7 @@ discard block |
||
| 3272 | 3272 | $Connection = new Connection(); |
| 3273 | 3273 | $sth = $Connection->db->prepare($query); |
| 3274 | 3274 | $sth->execute(); |
| 3275 | - } catch(PDOException $e) { |
|
| 3275 | + } catch (PDOException $e) { |
|
| 3276 | 3276 | return "error : ".$e->getMessage(); |
| 3277 | 3277 | } |
| 3278 | 3278 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3287,7 +3287,7 @@ discard block |
||
| 3287 | 3287 | $Connection = new Connection(); |
| 3288 | 3288 | $sth = $Connection->db->prepare($query); |
| 3289 | 3289 | $sth->execute(); |
| 3290 | - } catch(PDOException $e) { |
|
| 3290 | + } catch (PDOException $e) { |
|
| 3291 | 3291 | return "error : ".$e->getMessage(); |
| 3292 | 3292 | } |
| 3293 | 3293 | } |
@@ -3303,7 +3303,7 @@ discard block |
||
| 3303 | 3303 | $Connection = new Connection(); |
| 3304 | 3304 | $sth = $Connection->db->prepare($query); |
| 3305 | 3305 | $sth->execute(); |
| 3306 | - } catch(PDOException $e) { |
|
| 3306 | + } catch (PDOException $e) { |
|
| 3307 | 3307 | return "error : ".$e->getMessage(); |
| 3308 | 3308 | } |
| 3309 | 3309 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3318,7 +3318,7 @@ discard block |
||
| 3318 | 3318 | $Connection = new Connection(); |
| 3319 | 3319 | $sth = $Connection->db->prepare($query); |
| 3320 | 3320 | $sth->execute(); |
| 3321 | - } catch(PDOException $e) { |
|
| 3321 | + } catch (PDOException $e) { |
|
| 3322 | 3322 | return "error : ".$e->getMessage(); |
| 3323 | 3323 | } |
| 3324 | 3324 | } |
@@ -3334,7 +3334,7 @@ discard block |
||
| 3334 | 3334 | $Connection = new Connection(); |
| 3335 | 3335 | $sth = $Connection->db->prepare($query); |
| 3336 | 3336 | $sth->execute(); |
| 3337 | - } catch(PDOException $e) { |
|
| 3337 | + } catch (PDOException $e) { |
|
| 3338 | 3338 | return "error : ".$e->getMessage(); |
| 3339 | 3339 | } |
| 3340 | 3340 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3349,7 +3349,7 @@ discard block |
||
| 3349 | 3349 | $Connection = new Connection(); |
| 3350 | 3350 | $sth = $Connection->db->prepare($query); |
| 3351 | 3351 | $sth->execute(); |
| 3352 | - } catch(PDOException $e) { |
|
| 3352 | + } catch (PDOException $e) { |
|
| 3353 | 3353 | return "error : ".$e->getMessage(); |
| 3354 | 3354 | } |
| 3355 | 3355 | } |
@@ -3365,7 +3365,7 @@ discard block |
||
| 3365 | 3365 | $Connection = new Connection(); |
| 3366 | 3366 | $sth = $Connection->db->prepare($query); |
| 3367 | 3367 | $sth->execute(); |
| 3368 | - } catch(PDOException $e) { |
|
| 3368 | + } catch (PDOException $e) { |
|
| 3369 | 3369 | return "error : ".$e->getMessage(); |
| 3370 | 3370 | } |
| 3371 | 3371 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3380,7 +3380,7 @@ discard block |
||
| 3380 | 3380 | $Connection = new Connection(); |
| 3381 | 3381 | $sth = $Connection->db->prepare($query); |
| 3382 | 3382 | $sth->execute(); |
| 3383 | - } catch(PDOException $e) { |
|
| 3383 | + } catch (PDOException $e) { |
|
| 3384 | 3384 | return "error : ".$e->getMessage(); |
| 3385 | 3385 | } |
| 3386 | 3386 | } |
@@ -3396,7 +3396,7 @@ discard block |
||
| 3396 | 3396 | $Connection = new Connection(); |
| 3397 | 3397 | $sth = $Connection->db->prepare($query); |
| 3398 | 3398 | $sth->execute(); |
| 3399 | - } catch(PDOException $e) { |
|
| 3399 | + } catch (PDOException $e) { |
|
| 3400 | 3400 | return "error : ".$e->getMessage(); |
| 3401 | 3401 | } |
| 3402 | 3402 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3411,7 +3411,7 @@ discard block |
||
| 3411 | 3411 | $Connection = new Connection(); |
| 3412 | 3412 | $sth = $Connection->db->prepare($query); |
| 3413 | 3413 | $sth->execute(); |
| 3414 | - } catch(PDOException $e) { |
|
| 3414 | + } catch (PDOException $e) { |
|
| 3415 | 3415 | return "error : ".$e->getMessage(); |
| 3416 | 3416 | } |
| 3417 | 3417 | } |
@@ -3427,7 +3427,7 @@ discard block |
||
| 3427 | 3427 | $Connection = new Connection(); |
| 3428 | 3428 | $sth = $Connection->db->prepare($query); |
| 3429 | 3429 | $sth->execute(); |
| 3430 | - } catch(PDOException $e) { |
|
| 3430 | + } catch (PDOException $e) { |
|
| 3431 | 3431 | return "error : ".$e->getMessage(); |
| 3432 | 3432 | } |
| 3433 | 3433 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3442,7 +3442,7 @@ discard block |
||
| 3442 | 3442 | $Connection = new Connection(); |
| 3443 | 3443 | $sth = $Connection->db->prepare($query); |
| 3444 | 3444 | $sth->execute(); |
| 3445 | - } catch(PDOException $e) { |
|
| 3445 | + } catch (PDOException $e) { |
|
| 3446 | 3446 | return "error : ".$e->getMessage(); |
| 3447 | 3447 | } |
| 3448 | 3448 | } |
@@ -3458,7 +3458,7 @@ discard block |
||
| 3458 | 3458 | $Connection = new Connection(); |
| 3459 | 3459 | $sth = $Connection->db->prepare($query); |
| 3460 | 3460 | $sth->execute(); |
| 3461 | - } catch(PDOException $e) { |
|
| 3461 | + } catch (PDOException $e) { |
|
| 3462 | 3462 | return "error : ".$e->getMessage(); |
| 3463 | 3463 | } |
| 3464 | 3464 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3473,7 +3473,7 @@ discard block |
||
| 3473 | 3473 | $Connection = new Connection(); |
| 3474 | 3474 | $sth = $Connection->db->prepare($query); |
| 3475 | 3475 | $sth->execute(); |
| 3476 | - } catch(PDOException $e) { |
|
| 3476 | + } catch (PDOException $e) { |
|
| 3477 | 3477 | return "error : ".$e->getMessage(); |
| 3478 | 3478 | } |
| 3479 | 3479 | } |
@@ -3489,7 +3489,7 @@ discard block |
||
| 3489 | 3489 | $Connection = new Connection(); |
| 3490 | 3490 | $sth = $Connection->db->prepare($query); |
| 3491 | 3491 | $sth->execute(); |
| 3492 | - } catch(PDOException $e) { |
|
| 3492 | + } catch (PDOException $e) { |
|
| 3493 | 3493 | return "error : ".$e->getMessage(); |
| 3494 | 3494 | } |
| 3495 | 3495 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3504,7 +3504,7 @@ discard block |
||
| 3504 | 3504 | $Connection = new Connection(); |
| 3505 | 3505 | $sth = $Connection->db->prepare($query); |
| 3506 | 3506 | $sth->execute(); |
| 3507 | - } catch(PDOException $e) { |
|
| 3507 | + } catch (PDOException $e) { |
|
| 3508 | 3508 | return "error : ".$e->getMessage(); |
| 3509 | 3509 | } |
| 3510 | 3510 | } |
@@ -3520,7 +3520,7 @@ discard block |
||
| 3520 | 3520 | $Connection = new Connection(); |
| 3521 | 3521 | $sth = $Connection->db->prepare($query); |
| 3522 | 3522 | $sth->execute(); |
| 3523 | - } catch(PDOException $e) { |
|
| 3523 | + } catch (PDOException $e) { |
|
| 3524 | 3524 | return "error : ".$e->getMessage(); |
| 3525 | 3525 | } |
| 3526 | 3526 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3535,7 +3535,7 @@ discard block |
||
| 3535 | 3535 | $Connection = new Connection(); |
| 3536 | 3536 | $sth = $Connection->db->prepare($query); |
| 3537 | 3537 | $sth->execute(); |
| 3538 | - } catch(PDOException $e) { |
|
| 3538 | + } catch (PDOException $e) { |
|
| 3539 | 3539 | return "error : ".$e->getMessage(); |
| 3540 | 3540 | } |
| 3541 | 3541 | } |
@@ -3551,7 +3551,7 @@ discard block |
||
| 3551 | 3551 | $Connection = new Connection(); |
| 3552 | 3552 | $sth = $Connection->db->prepare($query); |
| 3553 | 3553 | $sth->execute(); |
| 3554 | - } catch(PDOException $e) { |
|
| 3554 | + } catch (PDOException $e) { |
|
| 3555 | 3555 | return "error : ".$e->getMessage(); |
| 3556 | 3556 | } |
| 3557 | 3557 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3570,7 +3570,7 @@ discard block |
||
| 3570 | 3570 | $Connection = new Connection(); |
| 3571 | 3571 | $sth = $Connection->db->prepare($query); |
| 3572 | 3572 | $sth->execute(); |
| 3573 | - } catch(PDOException $e) { |
|
| 3573 | + } catch (PDOException $e) { |
|
| 3574 | 3574 | return "error : ".$e->getMessage(); |
| 3575 | 3575 | } |
| 3576 | 3576 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -3585,7 +3585,7 @@ discard block |
||
| 3585 | 3585 | $Connection = new Connection(); |
| 3586 | 3586 | $sth = $Connection->db->prepare($query); |
| 3587 | 3587 | $sth->execute(); |
| 3588 | - } catch(PDOException $e) { |
|
| 3588 | + } catch (PDOException $e) { |
|
| 3589 | 3589 | return "error : ".$e->getMessage(); |
| 3590 | 3590 | } |
| 3591 | 3591 | } |
@@ -3597,7 +3597,7 @@ discard block |
||
| 3597 | 3597 | $Connection = new Connection(); |
| 3598 | 3598 | $sth = $Connection->db->prepare($query); |
| 3599 | 3599 | $sth->execute(); |
| 3600 | - } catch(PDOException $e) { |
|
| 3600 | + } catch (PDOException $e) { |
|
| 3601 | 3601 | return "error : ".$e->getMessage(); |
| 3602 | 3602 | } |
| 3603 | 3603 | } |
@@ -3613,7 +3613,7 @@ discard block |
||
| 3613 | 3613 | $Connection = new Connection(); |
| 3614 | 3614 | $sth = $Connection->db->prepare($query); |
| 3615 | 3615 | $sth->execute(); |
| 3616 | - } catch(PDOException $e) { |
|
| 3616 | + } catch (PDOException $e) { |
|
| 3617 | 3617 | return "error : ".$e->getMessage(); |
| 3618 | 3618 | } |
| 3619 | 3619 | } |
@@ -3628,7 +3628,7 @@ discard block |
||
| 3628 | 3628 | $Connection = new Connection(); |
| 3629 | 3629 | $sth = $Connection->db->prepare($query); |
| 3630 | 3630 | $sth->execute(); |
| 3631 | - } catch(PDOException $e) { |
|
| 3631 | + } catch (PDOException $e) { |
|
| 3632 | 3632 | return "error : ".$e->getMessage(); |
| 3633 | 3633 | } |
| 3634 | 3634 | } |
@@ -26,7 +26,9 @@ discard block |
||
| 26 | 26 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); |
| 27 | 27 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
| 28 | 28 | curl_setopt($ch, CURLOPT_TIMEOUT, 20); |
| 29 | - if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
| 29 | + if ($referer != '') { |
|
| 30 | + curl_setopt($ch, CURLOPT_REFERER, $referer); |
|
| 31 | + } |
|
| 30 | 32 | curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5'); |
| 31 | 33 | curl_setopt($ch, CURLOPT_FILE, $fp); |
| 32 | 34 | curl_exec($ch); |
@@ -37,12 +39,16 @@ discard block |
||
| 37 | 39 | public static function gunzip($in_file,$out_file_name = '') { |
| 38 | 40 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 39 | 41 | $buffer_size = 4096; // read 4kb at a time |
| 40 | - if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
|
| 42 | + if ($out_file_name == '') { |
|
| 43 | + $out_file_name = str_replace('.gz', '', $in_file); |
|
| 44 | + } |
|
| 41 | 45 | if ($in_file != '' && file_exists($in_file)) { |
| 42 | 46 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 43 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 44 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 45 | - else { |
|
| 47 | + if (function_exists('gzopen')) { |
|
| 48 | + $file = gzopen($in_file,'rb'); |
|
| 49 | + } elseif (function_exists('gzopen64')) { |
|
| 50 | + $file = gzopen64($in_file,'rb'); |
|
| 51 | + } else { |
|
| 46 | 52 | echo 'gzopen not available'; |
| 47 | 53 | die; |
| 48 | 54 | } |
@@ -63,8 +69,12 @@ discard block |
||
| 63 | 69 | if ($res === TRUE) { |
| 64 | 70 | $zip->extractTo($path); |
| 65 | 71 | $zip->close(); |
| 66 | - } else return false; |
|
| 67 | - } else return false; |
|
| 72 | + } else { |
|
| 73 | + return false; |
|
| 74 | + } |
|
| 75 | + } else { |
|
| 76 | + return false; |
|
| 77 | + } |
|
| 68 | 78 | } |
| 69 | 79 | |
| 70 | 80 | public static function connect_sqlite($database) { |
@@ -79,7 +89,9 @@ discard block |
||
| 79 | 89 | public static function retrieve_route_sqlite_to_dest($database_file) { |
| 80 | 90 | global $globalDebug, $globalTransaction; |
| 81 | 91 | //$query = 'TRUNCATE TABLE routes'; |
| 82 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 92 | + if ($globalDebug) { |
|
| 93 | + echo " - Delete previous routes from DB -"; |
|
| 94 | + } |
|
| 83 | 95 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 84 | 96 | $Connection = new Connection(); |
| 85 | 97 | try { |
@@ -90,7 +102,9 @@ discard block |
||
| 90 | 102 | return "error : ".$e->getMessage(); |
| 91 | 103 | } |
| 92 | 104 | |
| 93 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 105 | + if ($globalDebug) { |
|
| 106 | + echo " - Add routes to DB -"; |
|
| 107 | + } |
|
| 94 | 108 | update_db::connect_sqlite($database_file); |
| 95 | 109 | //$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID'; |
| 96 | 110 | $query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID"; |
@@ -105,15 +119,21 @@ discard block |
||
| 105 | 119 | $Connection = new Connection(); |
| 106 | 120 | $sth_dest = $Connection->db->prepare($query_dest); |
| 107 | 121 | try { |
| 108 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 122 | + if ($globalTransaction) { |
|
| 123 | + $Connection->db->beginTransaction(); |
|
| 124 | + } |
|
| 109 | 125 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 110 | 126 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 111 | 127 | $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 112 | 128 | $sth_dest->execute($query_dest_values); |
| 113 | 129 | } |
| 114 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 130 | + if ($globalTransaction) { |
|
| 131 | + $Connection->db->commit(); |
|
| 132 | + } |
|
| 115 | 133 | } catch(PDOException $e) { |
| 116 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 134 | + if ($globalTransaction) { |
|
| 135 | + $Connection->db->rollBack(); |
|
| 136 | + } |
|
| 117 | 137 | return "error : ".$e->getMessage(); |
| 118 | 138 | } |
| 119 | 139 | return ''; |
@@ -121,7 +141,9 @@ discard block |
||
| 121 | 141 | public static function retrieve_route_oneworld($database_file) { |
| 122 | 142 | global $globalDebug, $globalTransaction; |
| 123 | 143 | //$query = 'TRUNCATE TABLE routes'; |
| 124 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 144 | + if ($globalDebug) { |
|
| 145 | + echo " - Delete previous routes from DB -"; |
|
| 146 | + } |
|
| 125 | 147 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 126 | 148 | $Connection = new Connection(); |
| 127 | 149 | try { |
@@ -132,14 +154,18 @@ discard block |
||
| 132 | 154 | return "error : ".$e->getMessage(); |
| 133 | 155 | } |
| 134 | 156 | |
| 135 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 157 | + if ($globalDebug) { |
|
| 158 | + echo " - Add routes to DB -"; |
|
| 159 | + } |
|
| 136 | 160 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 137 | 161 | $Spotter = new Spotter(); |
| 138 | 162 | if ($fh = fopen($database_file,"r")) { |
| 139 | 163 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 140 | 164 | $Connection = new Connection(); |
| 141 | 165 | $sth_dest = $Connection->db->prepare($query_dest); |
| 142 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 166 | + if ($globalTransaction) { |
|
| 167 | + $Connection->db->beginTransaction(); |
|
| 168 | + } |
|
| 143 | 169 | while (!feof($fh)) { |
| 144 | 170 | $line = fgetcsv($fh,9999,','); |
| 145 | 171 | if ($line[0] != '') { |
@@ -148,13 +174,17 @@ discard block |
||
| 148 | 174 | $query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld'); |
| 149 | 175 | $sth_dest->execute($query_dest_values); |
| 150 | 176 | } catch(PDOException $e) { |
| 151 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 177 | + if ($globalTransaction) { |
|
| 178 | + $Connection->db->rollBack(); |
|
| 179 | + } |
|
| 152 | 180 | return "error : ".$e->getMessage(); |
| 153 | 181 | } |
| 154 | 182 | } |
| 155 | 183 | } |
| 156 | 184 | } |
| 157 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 185 | + if ($globalTransaction) { |
|
| 186 | + $Connection->db->commit(); |
|
| 187 | + } |
|
| 158 | 188 | } |
| 159 | 189 | return ''; |
| 160 | 190 | } |
@@ -162,7 +192,9 @@ discard block |
||
| 162 | 192 | public static function retrieve_route_skyteam($database_file) { |
| 163 | 193 | global $globalDebug, $globalTransaction; |
| 164 | 194 | //$query = 'TRUNCATE TABLE routes'; |
| 165 | - if ($globalDebug) echo " - Delete previous routes from DB -"; |
|
| 195 | + if ($globalDebug) { |
|
| 196 | + echo " - Delete previous routes from DB -"; |
|
| 197 | + } |
|
| 166 | 198 | $query = "DELETE FROM routes WHERE Source = '' OR Source = :source"; |
| 167 | 199 | $Connection = new Connection(); |
| 168 | 200 | try { |
@@ -173,7 +205,9 @@ discard block |
||
| 173 | 205 | return "error : ".$e->getMessage(); |
| 174 | 206 | } |
| 175 | 207 | |
| 176 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 208 | + if ($globalDebug) { |
|
| 209 | + echo " - Add routes to DB -"; |
|
| 210 | + } |
|
| 177 | 211 | |
| 178 | 212 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 179 | 213 | $Spotter = new Spotter(); |
@@ -182,7 +216,9 @@ discard block |
||
| 182 | 216 | $Connection = new Connection(); |
| 183 | 217 | $sth_dest = $Connection->db->prepare($query_dest); |
| 184 | 218 | try { |
| 185 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 219 | + if ($globalTransaction) { |
|
| 220 | + $Connection->db->beginTransaction(); |
|
| 221 | + } |
|
| 186 | 222 | while (!feof($fh)) { |
| 187 | 223 | $line = fgetcsv($fh,9999,','); |
| 188 | 224 | if ($line[0] != '') { |
@@ -193,9 +229,13 @@ discard block |
||
| 193 | 229 | } |
| 194 | 230 | } |
| 195 | 231 | } |
| 196 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 232 | + if ($globalTransaction) { |
|
| 233 | + $Connection->db->commit(); |
|
| 234 | + } |
|
| 197 | 235 | } catch(PDOException $e) { |
| 198 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 236 | + if ($globalTransaction) { |
|
| 237 | + $Connection->db->rollBack(); |
|
| 238 | + } |
|
| 199 | 239 | return "error : ".$e->getMessage(); |
| 200 | 240 | } |
| 201 | 241 | } |
@@ -238,11 +278,16 @@ discard block |
||
| 238 | 278 | $sth_dest = $Connection->db->prepare($query_dest); |
| 239 | 279 | $sth_dest_owner = $Connection->db->prepare($query_dest_owner); |
| 240 | 280 | try { |
| 241 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 281 | + if ($globalTransaction) { |
|
| 282 | + $Connection->db->beginTransaction(); |
|
| 283 | + } |
|
| 242 | 284 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 243 | 285 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 244 | - if ($values['UserString4'] == 'M') $type = 'military'; |
|
| 245 | - else $type = null; |
|
| 286 | + if ($values['UserString4'] == 'M') { |
|
| 287 | + $type = 'military'; |
|
| 288 | + } else { |
|
| 289 | + $type = null; |
|
| 290 | + } |
|
| 246 | 291 | $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
| 247 | 292 | $sth_dest->execute($query_dest_values); |
| 248 | 293 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
@@ -250,7 +295,9 @@ discard block |
||
| 250 | 295 | $sth_dest_owner->execute($query_dest_owner_values); |
| 251 | 296 | } |
| 252 | 297 | } |
| 253 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 298 | + if ($globalTransaction) { |
|
| 299 | + $Connection->db->commit(); |
|
| 300 | + } |
|
| 254 | 301 | } catch(PDOException $e) { |
| 255 | 302 | return "error : ".$e->getMessage(); |
| 256 | 303 | } |
@@ -287,7 +334,9 @@ discard block |
||
| 287 | 334 | $Connection = new Connection(); |
| 288 | 335 | $sth_dest = $Connection->db->prepare($query_dest); |
| 289 | 336 | try { |
| 290 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 337 | + if ($globalTransaction) { |
|
| 338 | + $Connection->db->beginTransaction(); |
|
| 339 | + } |
|
| 291 | 340 | while (!feof($fh)) { |
| 292 | 341 | $values = array(); |
| 293 | 342 | $line = $Common->hex2str(fgets($fh,9999)); |
@@ -298,7 +347,9 @@ discard block |
||
| 298 | 347 | // Check if we can find ICAO, else set it to GLID |
| 299 | 348 | $aircraft_name_split = explode(' ',$aircraft_name); |
| 300 | 349 | $search_more = ''; |
| 301 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 350 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) { |
|
| 351 | + $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 352 | + } |
|
| 302 | 353 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
| 303 | 354 | $sth_search = $Connection->db->prepare($query_search); |
| 304 | 355 | try { |
@@ -311,7 +362,9 @@ discard block |
||
| 311 | 362 | } catch(PDOException $e) { |
| 312 | 363 | return "error : ".$e->getMessage(); |
| 313 | 364 | } |
| 314 | - if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
|
| 365 | + if (!isset($values['ICAOTypeCode'])) { |
|
| 366 | + $values['ICAOTypeCode'] = 'GLID'; |
|
| 367 | + } |
|
| 315 | 368 | // Add data to db |
| 316 | 369 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 317 | 370 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
@@ -320,7 +373,9 @@ discard block |
||
| 320 | 373 | $sth_dest->execute($query_dest_values); |
| 321 | 374 | } |
| 322 | 375 | } |
| 323 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 376 | + if ($globalTransaction) { |
|
| 377 | + $Connection->db->commit(); |
|
| 378 | + } |
|
| 324 | 379 | } catch(PDOException $e) { |
| 325 | 380 | return "error : ".$e->getMessage(); |
| 326 | 381 | } |
@@ -356,7 +411,9 @@ discard block |
||
| 356 | 411 | $Connection = new Connection(); |
| 357 | 412 | $sth_dest = $Connection->db->prepare($query_dest); |
| 358 | 413 | try { |
| 359 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 414 | + if ($globalTransaction) { |
|
| 415 | + $Connection->db->beginTransaction(); |
|
| 416 | + } |
|
| 360 | 417 | $tmp = fgetcsv($fh,9999,',',"'"); |
| 361 | 418 | while (!feof($fh)) { |
| 362 | 419 | $line = fgetcsv($fh,9999,',',"'"); |
@@ -370,13 +427,17 @@ discard block |
||
| 370 | 427 | // Check if we can find ICAO, else set it to GLID |
| 371 | 428 | $aircraft_name_split = explode(' ',$aircraft_name); |
| 372 | 429 | $search_more = ''; |
| 373 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 430 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) { |
|
| 431 | + $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 432 | + } |
|
| 374 | 433 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
| 375 | 434 | $sth_search = $Connection->db->prepare($query_search); |
| 376 | 435 | try { |
| 377 | 436 | $sth_search->execute(); |
| 378 | 437 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 379 | - if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 438 | + if (isset($result['icao']) && $result['icao'] != '') { |
|
| 439 | + $values['ICAOTypeCode'] = $result['icao']; |
|
| 440 | + } |
|
| 380 | 441 | } catch(PDOException $e) { |
| 381 | 442 | return "error : ".$e->getMessage(); |
| 382 | 443 | } |
@@ -389,7 +450,9 @@ discard block |
||
| 389 | 450 | $sth_dest->execute($query_dest_values); |
| 390 | 451 | } |
| 391 | 452 | } |
| 392 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 453 | + if ($globalTransaction) { |
|
| 454 | + $Connection->db->commit(); |
|
| 455 | + } |
|
| 393 | 456 | } catch(PDOException $e) { |
| 394 | 457 | return "error : ".$e->getMessage(); |
| 395 | 458 | } |
@@ -428,7 +491,9 @@ discard block |
||
| 428 | 491 | $sth_dest = $Connection->db->prepare($query_dest); |
| 429 | 492 | $sth_modes = $Connection->db->prepare($query_modes); |
| 430 | 493 | try { |
| 431 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 494 | + if ($globalTransaction) { |
|
| 495 | + $Connection->db->beginTransaction(); |
|
| 496 | + } |
|
| 432 | 497 | $tmp = fgetcsv($fh,9999,',','"'); |
| 433 | 498 | while (!feof($fh)) { |
| 434 | 499 | $line = fgetcsv($fh,9999,',','"'); |
@@ -438,16 +503,22 @@ discard block |
||
| 438 | 503 | $values['registration'] = $line[0]; |
| 439 | 504 | $values['base'] = $line[4]; |
| 440 | 505 | $values['owner'] = $line[5]; |
| 441 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 506 | + if ($line[6] == '') { |
|
| 507 | + $values['date_first_reg'] = null; |
|
| 508 | + } else { |
|
| 509 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 510 | + } |
|
| 443 | 511 | $values['cancel'] = $line[7]; |
| 444 | 512 | } elseif ($country == 'EI') { |
| 445 | 513 | // TODO : add modeS & reg to aircraft_modes |
| 446 | 514 | $values['registration'] = $line[0]; |
| 447 | 515 | $values['base'] = $line[3]; |
| 448 | 516 | $values['owner'] = $line[2]; |
| 449 | - if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 517 | + if ($line[1] == '') { |
|
| 518 | + $values['date_first_reg'] = null; |
|
| 519 | + } else { |
|
| 520 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 521 | + } |
|
| 451 | 522 | $values['cancel'] = ''; |
| 452 | 523 | $values['modes'] = $line[7]; |
| 453 | 524 | $values['icao'] = $line[8]; |
@@ -466,16 +537,22 @@ discard block |
||
| 466 | 537 | $values['registration'] = $line[3]; |
| 467 | 538 | $values['base'] = null; |
| 468 | 539 | $values['owner'] = $line[5]; |
| 469 | - if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 540 | + if ($line[18] == '') { |
|
| 541 | + $values['date_first_reg'] = null; |
|
| 542 | + } else { |
|
| 543 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 544 | + } |
|
| 471 | 545 | $values['cancel'] = ''; |
| 472 | 546 | } elseif ($country == 'VH') { |
| 473 | 547 | // TODO : add modeS & reg to aircraft_modes |
| 474 | 548 | $values['registration'] = $line[0]; |
| 475 | 549 | $values['base'] = null; |
| 476 | 550 | $values['owner'] = $line[12]; |
| 477 | - if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 551 | + if ($line[28] == '') { |
|
| 552 | + $values['date_first_reg'] = null; |
|
| 553 | + } else { |
|
| 554 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 555 | + } |
|
| 479 | 556 | |
| 480 | 557 | $values['cancel'] = $line[39]; |
| 481 | 558 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -494,29 +571,41 @@ discard block |
||
| 494 | 571 | $values['registration'] = $line[0]; |
| 495 | 572 | $values['base'] = null; |
| 496 | 573 | $values['owner'] = $line[8]; |
| 497 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 574 | + if ($line[7] == '') { |
|
| 575 | + $values['date_first_reg'] = null; |
|
| 576 | + } else { |
|
| 577 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 578 | + } |
|
| 499 | 579 | $values['cancel'] = ''; |
| 500 | 580 | } elseif ($country == 'PP') { |
| 501 | 581 | $values['registration'] = $line[0]; |
| 502 | 582 | $values['base'] = null; |
| 503 | 583 | $values['owner'] = $line[4]; |
| 504 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 584 | + if ($line[6] == '') { |
|
| 585 | + $values['date_first_reg'] = null; |
|
| 586 | + } else { |
|
| 587 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 588 | + } |
|
| 506 | 589 | $values['cancel'] = $line[7]; |
| 507 | 590 | } elseif ($country == 'E7') { |
| 508 | 591 | $values['registration'] = $line[0]; |
| 509 | 592 | $values['base'] = null; |
| 510 | 593 | $values['owner'] = $line[4]; |
| 511 | - if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 594 | + if ($line[5] == '') { |
|
| 595 | + $values['date_first_reg'] = null; |
|
| 596 | + } else { |
|
| 597 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 598 | + } |
|
| 513 | 599 | $values['cancel'] = ''; |
| 514 | 600 | } elseif ($country == '8Q') { |
| 515 | 601 | $values['registration'] = $line[0]; |
| 516 | 602 | $values['base'] = null; |
| 517 | 603 | $values['owner'] = $line[3]; |
| 518 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 604 | + if ($line[7] == '') { |
|
| 605 | + $values['date_first_reg'] = null; |
|
| 606 | + } else { |
|
| 607 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 608 | + } |
|
| 520 | 609 | $values['cancel'] = ''; |
| 521 | 610 | } elseif ($country == 'ZK') { |
| 522 | 611 | $values['registration'] = $line[0]; |
@@ -561,7 +650,9 @@ discard block |
||
| 561 | 650 | $sth_modes->execute($query_modes_values); |
| 562 | 651 | } |
| 563 | 652 | } |
| 564 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 653 | + if ($globalTransaction) { |
|
| 654 | + $Connection->db->commit(); |
|
| 655 | + } |
|
| 565 | 656 | } catch(PDOException $e) { |
| 566 | 657 | return "error : ".$e->getMessage(); |
| 567 | 658 | } |
@@ -697,25 +788,45 @@ discard block |
||
| 697 | 788 | VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)"; |
| 698 | 789 | $Connection = new Connection(); |
| 699 | 790 | $sth_dest = $Connection->db->prepare($query_dest); |
| 700 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 791 | + if ($globalTransaction) { |
|
| 792 | + $Connection->db->beginTransaction(); |
|
| 793 | + } |
|
| 701 | 794 | |
| 702 | 795 | $i = 0; |
| 703 | 796 | while($row = sparql_fetch_array($result)) |
| 704 | 797 | { |
| 705 | 798 | if ($i >= 1) { |
| 706 | 799 | //print_r($row); |
| 707 | - if (!isset($row['iata'])) $row['iata'] = ''; |
|
| 708 | - if (!isset($row['icao'])) $row['icao'] = ''; |
|
| 709 | - if (!isset($row['type'])) $row['type'] = ''; |
|
| 710 | - if (!isset($row['altitude'])) $row['altitude'] = ''; |
|
| 800 | + if (!isset($row['iata'])) { |
|
| 801 | + $row['iata'] = ''; |
|
| 802 | + } |
|
| 803 | + if (!isset($row['icao'])) { |
|
| 804 | + $row['icao'] = ''; |
|
| 805 | + } |
|
| 806 | + if (!isset($row['type'])) { |
|
| 807 | + $row['type'] = ''; |
|
| 808 | + } |
|
| 809 | + if (!isset($row['altitude'])) { |
|
| 810 | + $row['altitude'] = ''; |
|
| 811 | + } |
|
| 711 | 812 | if (isset($row['city_bis'])) { |
| 712 | 813 | $row['city'] = $row['city_bis']; |
| 713 | 814 | } |
| 714 | - if (!isset($row['city'])) $row['city'] = ''; |
|
| 715 | - if (!isset($row['country'])) $row['country'] = ''; |
|
| 716 | - if (!isset($row['homepage'])) $row['homepage'] = ''; |
|
| 717 | - if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = ''; |
|
| 718 | - if (!isset($row['name'])) continue; |
|
| 815 | + if (!isset($row['city'])) { |
|
| 816 | + $row['city'] = ''; |
|
| 817 | + } |
|
| 818 | + if (!isset($row['country'])) { |
|
| 819 | + $row['country'] = ''; |
|
| 820 | + } |
|
| 821 | + if (!isset($row['homepage'])) { |
|
| 822 | + $row['homepage'] = ''; |
|
| 823 | + } |
|
| 824 | + if (!isset($row['wikipedia_page'])) { |
|
| 825 | + $row['wikipedia_page'] = ''; |
|
| 826 | + } |
|
| 827 | + if (!isset($row['name'])) { |
|
| 828 | + continue; |
|
| 829 | + } |
|
| 719 | 830 | if (!isset($row['image'])) { |
| 720 | 831 | $row['image'] = ''; |
| 721 | 832 | $row['image_thumb'] = ''; |
@@ -771,7 +882,9 @@ discard block |
||
| 771 | 882 | |
| 772 | 883 | $i++; |
| 773 | 884 | } |
| 774 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 885 | + if ($globalTransaction) { |
|
| 886 | + $Connection->db->commit(); |
|
| 887 | + } |
|
| 775 | 888 | /* |
| 776 | 889 | echo "Delete duplicate rows...\n"; |
| 777 | 890 | $query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)'; |
@@ -814,7 +927,9 @@ discard block |
||
| 814 | 927 | $delimiter = ','; |
| 815 | 928 | $out_file = $tmp_dir.'airports.csv'; |
| 816 | 929 | update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
| 817 | - if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
|
| 930 | + if (!file_exists($out_file) || !is_readable($out_file)) { |
|
| 931 | + return FALSE; |
|
| 932 | + } |
|
| 818 | 933 | echo "Add data from ourairports.com...\n"; |
| 819 | 934 | |
| 820 | 935 | $header = NULL; |
@@ -824,8 +939,9 @@ discard block |
||
| 824 | 939 | //$Connection->db->beginTransaction(); |
| 825 | 940 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 826 | 941 | { |
| 827 | - if(!$header) $header = $row; |
|
| 828 | - else { |
|
| 942 | + if(!$header) { |
|
| 943 | + $header = $row; |
|
| 944 | + } else { |
|
| 829 | 945 | $data = array(); |
| 830 | 946 | $data = array_combine($header, $row); |
| 831 | 947 | try { |
@@ -866,7 +982,9 @@ discard block |
||
| 866 | 982 | echo "Download data from another free database...\n"; |
| 867 | 983 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 868 | 984 | update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
| 869 | - if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
|
| 985 | + if (!file_exists($out_file) || !is_readable($out_file)) { |
|
| 986 | + return FALSE; |
|
| 987 | + } |
|
| 870 | 988 | update_db::unzip($out_file); |
| 871 | 989 | $header = NULL; |
| 872 | 990 | echo "Add data from another free database...\n"; |
@@ -877,8 +995,9 @@ discard block |
||
| 877 | 995 | //$Connection->db->beginTransaction(); |
| 878 | 996 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 879 | 997 | { |
| 880 | - if(!$header) $header = $row; |
|
| 881 | - else { |
|
| 998 | + if(!$header) { |
|
| 999 | + $header = $row; |
|
| 1000 | + } else { |
|
| 882 | 1001 | $data = $row; |
| 883 | 1002 | |
| 884 | 1003 | $query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao'; |
@@ -1047,7 +1166,9 @@ discard block |
||
| 1047 | 1166 | if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE) |
| 1048 | 1167 | { |
| 1049 | 1168 | $i = 0; |
| 1050 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1169 | + if ($globalTransaction) { |
|
| 1170 | + $Connection->db->beginTransaction(); |
|
| 1171 | + } |
|
| 1051 | 1172 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1052 | 1173 | { |
| 1053 | 1174 | if ($i > 0) { |
@@ -1060,7 +1181,9 @@ discard block |
||
| 1060 | 1181 | } |
| 1061 | 1182 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
| 1062 | 1183 | if (!empty($result_search)) { |
| 1063 | - if ($globalDebug) echo '.'; |
|
| 1184 | + if ($globalDebug) { |
|
| 1185 | + echo '.'; |
|
| 1186 | + } |
|
| 1064 | 1187 | //if ($globalDBdriver == 'mysql') { |
| 1065 | 1188 | // $queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao'; |
| 1066 | 1189 | //} else { |
@@ -1082,8 +1205,12 @@ discard block |
||
| 1082 | 1205 | } |
| 1083 | 1206 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
| 1084 | 1207 | if (!empty($result_search_mfr)) { |
| 1085 | - if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23]; |
|
| 1086 | - if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15]; |
|
| 1208 | + if (trim($data[16]) == '' && trim($data[23]) != '') { |
|
| 1209 | + $data[16] = $data[23]; |
|
| 1210 | + } |
|
| 1211 | + if (trim($data[16]) == '' && trim($data[15]) != '') { |
|
| 1212 | + $data[16] = $data[15]; |
|
| 1213 | + } |
|
| 1087 | 1214 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1088 | 1215 | try { |
| 1089 | 1216 | $sthf = $Connection->db->prepare($queryf); |
@@ -1094,7 +1221,9 @@ discard block |
||
| 1094 | 1221 | } |
| 1095 | 1222 | } |
| 1096 | 1223 | if (strtotime($data[29]) > time()) { |
| 1097 | - if ($globalDebug) echo 'i'; |
|
| 1224 | + if ($globalDebug) { |
|
| 1225 | + echo 'i'; |
|
| 1226 | + } |
|
| 1098 | 1227 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1099 | 1228 | try { |
| 1100 | 1229 | $sth = $Connection->db->prepare($query); |
@@ -1105,13 +1234,19 @@ discard block |
||
| 1105 | 1234 | } |
| 1106 | 1235 | } |
| 1107 | 1236 | if ($i % 90 == 0) { |
| 1108 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1109 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1237 | + if ($globalTransaction) { |
|
| 1238 | + $Connection->db->commit(); |
|
| 1239 | + } |
|
| 1240 | + if ($globalTransaction) { |
|
| 1241 | + $Connection->db->beginTransaction(); |
|
| 1242 | + } |
|
| 1110 | 1243 | } |
| 1111 | 1244 | $i++; |
| 1112 | 1245 | } |
| 1113 | 1246 | fclose($handle); |
| 1114 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1247 | + if ($globalTransaction) { |
|
| 1248 | + $Connection->db->commit(); |
|
| 1249 | + } |
|
| 1115 | 1250 | } |
| 1116 | 1251 | return ''; |
| 1117 | 1252 | } |
@@ -1131,11 +1266,15 @@ discard block |
||
| 1131 | 1266 | if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE) |
| 1132 | 1267 | { |
| 1133 | 1268 | $i = 0; |
| 1134 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1269 | + if ($globalTransaction) { |
|
| 1270 | + $Connection->db->beginTransaction(); |
|
| 1271 | + } |
|
| 1135 | 1272 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1136 | 1273 | { |
| 1137 | 1274 | if ($i > 0) { |
| 1138 | - if ($data[1] == 'NULL') $data[1] = $data[0]; |
|
| 1275 | + if ($data[1] == 'NULL') { |
|
| 1276 | + $data[1] = $data[0]; |
|
| 1277 | + } |
|
| 1139 | 1278 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1140 | 1279 | try { |
| 1141 | 1280 | $sth = $Connection->db->prepare($query); |
@@ -1147,7 +1286,9 @@ discard block |
||
| 1147 | 1286 | $i++; |
| 1148 | 1287 | } |
| 1149 | 1288 | fclose($handle); |
| 1150 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1289 | + if ($globalTransaction) { |
|
| 1290 | + $Connection->db->commit(); |
|
| 1291 | + } |
|
| 1151 | 1292 | } |
| 1152 | 1293 | return ''; |
| 1153 | 1294 | } |
@@ -1179,11 +1320,15 @@ discard block |
||
| 1179 | 1320 | if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE) |
| 1180 | 1321 | { |
| 1181 | 1322 | $i = 0; |
| 1182 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1323 | + if ($globalTransaction) { |
|
| 1324 | + $Connection->db->beginTransaction(); |
|
| 1325 | + } |
|
| 1183 | 1326 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1184 | 1327 | { |
| 1185 | 1328 | if ($i > 0) { |
| 1186 | - if ($data[1] == 'NULL') $data[1] = $data[0]; |
|
| 1329 | + if ($data[1] == 'NULL') { |
|
| 1330 | + $data[1] = $data[0]; |
|
| 1331 | + } |
|
| 1187 | 1332 | $query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)'; |
| 1188 | 1333 | try { |
| 1189 | 1334 | $sth = $Connection->db->prepare($query); |
@@ -1195,7 +1340,9 @@ discard block |
||
| 1195 | 1340 | $i++; |
| 1196 | 1341 | } |
| 1197 | 1342 | fclose($handle); |
| 1198 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1343 | + if ($globalTransaction) { |
|
| 1344 | + $Connection->db->commit(); |
|
| 1345 | + } |
|
| 1199 | 1346 | } |
| 1200 | 1347 | /* |
| 1201 | 1348 | $query = "UNLOCK TABLES"; |
@@ -1225,7 +1372,9 @@ discard block |
||
| 1225 | 1372 | if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE) |
| 1226 | 1373 | { |
| 1227 | 1374 | $i = 0; |
| 1228 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1375 | + if ($globalTransaction) { |
|
| 1376 | + $Connection->db->beginTransaction(); |
|
| 1377 | + } |
|
| 1229 | 1378 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1230 | 1379 | { |
| 1231 | 1380 | if ($i > 0) { |
@@ -1241,7 +1390,9 @@ discard block |
||
| 1241 | 1390 | $i++; |
| 1242 | 1391 | } |
| 1243 | 1392 | fclose($handle); |
| 1244 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1393 | + if ($globalTransaction) { |
|
| 1394 | + $Connection->db->commit(); |
|
| 1395 | + } |
|
| 1245 | 1396 | } |
| 1246 | 1397 | return ''; |
| 1247 | 1398 | } |
@@ -1261,7 +1412,9 @@ discard block |
||
| 1261 | 1412 | if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE) |
| 1262 | 1413 | { |
| 1263 | 1414 | $i = 0; |
| 1264 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1415 | + if ($globalTransaction) { |
|
| 1416 | + $Connection->db->beginTransaction(); |
|
| 1417 | + } |
|
| 1265 | 1418 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1266 | 1419 | { |
| 1267 | 1420 | if ($i > 0) { |
@@ -1270,13 +1423,17 @@ discard block |
||
| 1270 | 1423 | $sth = $Connection->db->prepare($query); |
| 1271 | 1424 | $sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam')); |
| 1272 | 1425 | } catch(PDOException $e) { |
| 1273 | - if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1426 | + if ($globalDebug) { |
|
| 1427 | + echo "error: ".$e->getMessage()." - data: ".implode(',',$data); |
|
| 1428 | + } |
|
| 1274 | 1429 | } |
| 1275 | 1430 | } |
| 1276 | 1431 | $i++; |
| 1277 | 1432 | } |
| 1278 | 1433 | fclose($handle); |
| 1279 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1434 | + if ($globalTransaction) { |
|
| 1435 | + $Connection->db->commit(); |
|
| 1436 | + } |
|
| 1280 | 1437 | } |
| 1281 | 1438 | return ''; |
| 1282 | 1439 | } |
@@ -1301,7 +1458,9 @@ discard block |
||
| 1301 | 1458 | $i = 0; |
| 1302 | 1459 | //$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE); |
| 1303 | 1460 | //$Connection->db->beginTransaction(); |
| 1304 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1461 | + if ($globalTransaction) { |
|
| 1462 | + $Connection->db->beginTransaction(); |
|
| 1463 | + } |
|
| 1305 | 1464 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1306 | 1465 | { |
| 1307 | 1466 | if ($i > 0) { |
@@ -1317,7 +1476,9 @@ discard block |
||
| 1317 | 1476 | $i++; |
| 1318 | 1477 | } |
| 1319 | 1478 | fclose($handle); |
| 1320 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1479 | + if ($globalTransaction) { |
|
| 1480 | + $Connection->db->commit(); |
|
| 1481 | + } |
|
| 1321 | 1482 | } |
| 1322 | 1483 | return ''; |
| 1323 | 1484 | } |
@@ -1337,7 +1498,9 @@ discard block |
||
| 1337 | 1498 | if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE) |
| 1338 | 1499 | { |
| 1339 | 1500 | $i = 0; |
| 1340 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1501 | + if ($globalTransaction) { |
|
| 1502 | + $Connection->db->beginTransaction(); |
|
| 1503 | + } |
|
| 1341 | 1504 | while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1342 | 1505 | { |
| 1343 | 1506 | if ($i > 0) { |
@@ -1354,7 +1517,9 @@ discard block |
||
| 1354 | 1517 | $i++; |
| 1355 | 1518 | } |
| 1356 | 1519 | fclose($handle); |
| 1357 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1520 | + if ($globalTransaction) { |
|
| 1521 | + $Connection->db->commit(); |
|
| 1522 | + } |
|
| 1358 | 1523 | } |
| 1359 | 1524 | return ''; |
| 1360 | 1525 | } |
@@ -1373,7 +1538,9 @@ discard block |
||
| 1373 | 1538 | $Connection = new Connection(); |
| 1374 | 1539 | if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE) |
| 1375 | 1540 | { |
| 1376 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 1541 | + if ($globalTransaction) { |
|
| 1542 | + $Connection->db->beginTransaction(); |
|
| 1543 | + } |
|
| 1377 | 1544 | while (($data = fgetcsv($handle, 1000)) !== FALSE) |
| 1378 | 1545 | { |
| 1379 | 1546 | $query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL'; |
@@ -1388,7 +1555,9 @@ discard block |
||
| 1388 | 1555 | } |
| 1389 | 1556 | } |
| 1390 | 1557 | fclose($handle); |
| 1391 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 1558 | + if ($globalTransaction) { |
|
| 1559 | + $Connection->db->commit(); |
|
| 1560 | + } |
|
| 1392 | 1561 | } |
| 1393 | 1562 | return ''; |
| 1394 | 1563 | } |
@@ -1464,9 +1633,14 @@ discard block |
||
| 1464 | 1633 | if ($i > 0 && $data[0] != '') { |
| 1465 | 1634 | $sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]); |
| 1466 | 1635 | $period = str_replace(',','',$data[14]); |
| 1467 | - if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60; |
|
| 1468 | - if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1469 | - else $launch_date = NULL; |
|
| 1636 | + if (!empty($period) && strpos($period,'days')) { |
|
| 1637 | + $period = str_replace(' days','',$period)*24*60; |
|
| 1638 | + } |
|
| 1639 | + if ($data[18] != '') { |
|
| 1640 | + $launch_date = date('Y-m-d',strtotime($data[18])); |
|
| 1641 | + } else { |
|
| 1642 | + $launch_date = NULL; |
|
| 1643 | + } |
|
| 1470 | 1644 | $data = array_map(function($value) { |
| 1471 | 1645 | return trim($value) === '' ? null : $value; |
| 1472 | 1646 | }, $data); |
@@ -1829,7 +2003,9 @@ discard block |
||
| 1829 | 2003 | if (($handle = fopen($filename, 'r')) !== FALSE) |
| 1830 | 2004 | { |
| 1831 | 2005 | $i = 0; |
| 1832 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 2006 | + if ($globalTransaction) { |
|
| 2007 | + $Connection->db->beginTransaction(); |
|
| 2008 | + } |
|
| 1833 | 2009 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1834 | 2010 | { |
| 1835 | 2011 | $i++; |
@@ -1857,7 +2033,9 @@ discard block |
||
| 1857 | 2033 | } |
| 1858 | 2034 | } |
| 1859 | 2035 | fclose($handle); |
| 1860 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 2036 | + if ($globalTransaction) { |
|
| 2037 | + $Connection->db->commit(); |
|
| 2038 | + } |
|
| 1861 | 2039 | } |
| 1862 | 2040 | return ''; |
| 1863 | 2041 | } |
@@ -1900,7 +2078,9 @@ discard block |
||
| 1900 | 2078 | $Connection = new Connection(); |
| 1901 | 2079 | if (($handle = fopen($filename, 'r')) !== FALSE) |
| 1902 | 2080 | { |
| 1903 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 2081 | + if ($globalTransaction) { |
|
| 2082 | + $Connection->db->beginTransaction(); |
|
| 2083 | + } |
|
| 1904 | 2084 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1905 | 2085 | { |
| 1906 | 2086 | if(count($row) > 1) { |
@@ -1914,7 +2094,9 @@ discard block |
||
| 1914 | 2094 | } |
| 1915 | 2095 | } |
| 1916 | 2096 | fclose($handle); |
| 1917 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 2097 | + if ($globalTransaction) { |
|
| 2098 | + $Connection->db->commit(); |
|
| 2099 | + } |
|
| 1918 | 2100 | } |
| 1919 | 2101 | return ''; |
| 1920 | 2102 | } |
@@ -1934,8 +2116,9 @@ discard block |
||
| 1934 | 2116 | } |
| 1935 | 2117 | |
| 1936 | 2118 | |
| 1937 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1938 | - else { |
|
| 2119 | + if ($globalDBdriver == 'mysql') { |
|
| 2120 | + update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 2121 | + } else { |
|
| 1939 | 2122 | update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
| 1940 | 2123 | $query = "CREATE EXTENSION postgis"; |
| 1941 | 2124 | $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
@@ -1954,7 +2137,9 @@ discard block |
||
| 1954 | 2137 | global $tmp_dir, $globalDebug; |
| 1955 | 2138 | include_once('class.create_db.php'); |
| 1956 | 2139 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1957 | - if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
|
| 2140 | + if ($globalDebug) { |
|
| 2141 | + echo "NOTAM from FlightAirMap website : Download..."; |
|
| 2142 | + } |
|
| 1958 | 2143 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5'); |
| 1959 | 2144 | $error = ''; |
| 1960 | 2145 | if (file_exists($tmp_dir.'notam.txt.gz.md5')) { |
@@ -1964,20 +2149,34 @@ discard block |
||
| 1964 | 2149 | update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
| 1965 | 2150 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1966 | 2151 | if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) { |
| 1967 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2152 | + if ($globalDebug) { |
|
| 2153 | + echo "Gunzip..."; |
|
| 2154 | + } |
|
| 1968 | 2155 | update_db::gunzip($tmp_dir.'notam.txt.gz'); |
| 1969 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2156 | + if ($globalDebug) { |
|
| 2157 | + echo "Add to DB..."; |
|
| 2158 | + } |
|
| 1970 | 2159 | //$error = create_db::import_file($tmp_dir.'notam.sql'); |
| 1971 | 2160 | $NOTAM = new NOTAM(); |
| 1972 | 2161 | $NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt'); |
| 1973 | 2162 | update_db::insert_notam_version($notam_md5); |
| 1974 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed."; |
|
| 1975 | - } else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
| 1976 | - } elseif ($globalDebug) echo "No new version."; |
|
| 1977 | - } else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed."; |
|
| 2163 | + } else { |
|
| 2164 | + $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed."; |
|
| 2165 | + } |
|
| 2166 | + } else { |
|
| 2167 | + $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed."; |
|
| 2168 | + } |
|
| 2169 | + } elseif ($globalDebug) { |
|
| 2170 | + echo "No new version."; |
|
| 2171 | + } |
|
| 2172 | + } else { |
|
| 2173 | + $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed."; |
|
| 2174 | + } |
|
| 1978 | 2175 | if ($error != '') { |
| 1979 | 2176 | return $error; |
| 1980 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2177 | + } elseif ($globalDebug) { |
|
| 2178 | + echo "Done\n"; |
|
| 2179 | + } |
|
| 1981 | 2180 | return ''; |
| 1982 | 2181 | } |
| 1983 | 2182 | |
@@ -2032,68 +2231,114 @@ discard block |
||
| 2032 | 2231 | //update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip'); |
| 2033 | 2232 | if (extension_loaded('zip')) { |
| 2034 | 2233 | if (file_exists($tmp_dir.'ivae_feb2013.zip')) { |
| 2035 | - if ($globalDebug) echo "Unzip..."; |
|
| 2234 | + if ($globalDebug) { |
|
| 2235 | + echo "Unzip..."; |
|
| 2236 | + } |
|
| 2036 | 2237 | update_db::unzip($tmp_dir.'ivae_feb2013.zip'); |
| 2037 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2238 | + if ($globalDebug) { |
|
| 2239 | + echo "Add to DB..."; |
|
| 2240 | + } |
|
| 2038 | 2241 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 2039 | - if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
|
| 2242 | + if ($globalDebug) { |
|
| 2243 | + echo "Copy airlines logos to airlines images directory..."; |
|
| 2244 | + } |
|
| 2040 | 2245 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 2041 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 2042 | - } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
| 2043 | - } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
| 2044 | - } else $error = "ZIP module not loaded but required for IVAO."; |
|
| 2246 | + if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) { |
|
| 2247 | + $error = "Failed to copy airlines logo."; |
|
| 2248 | + } |
|
| 2249 | + } else { |
|
| 2250 | + $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
|
| 2251 | + } |
|
| 2252 | + } else { |
|
| 2253 | + $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
|
| 2254 | + } |
|
| 2255 | + } else { |
|
| 2256 | + $error = "ZIP module not loaded but required for IVAO."; |
|
| 2257 | + } |
|
| 2045 | 2258 | if ($error != '') { |
| 2046 | 2259 | return $error; |
| 2047 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2260 | + } elseif ($globalDebug) { |
|
| 2261 | + echo "Done\n"; |
|
| 2262 | + } |
|
| 2048 | 2263 | return ''; |
| 2049 | 2264 | } |
| 2050 | 2265 | |
| 2051 | 2266 | public static function update_routes() { |
| 2052 | 2267 | global $tmp_dir, $globalDebug; |
| 2053 | 2268 | $error = ''; |
| 2054 | - if ($globalDebug) echo "Routes : Download..."; |
|
| 2269 | + if ($globalDebug) { |
|
| 2270 | + echo "Routes : Download..."; |
|
| 2271 | + } |
|
| 2055 | 2272 | update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
| 2056 | 2273 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 2057 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2274 | + if ($globalDebug) { |
|
| 2275 | + echo "Gunzip..."; |
|
| 2276 | + } |
|
| 2058 | 2277 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
| 2059 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2278 | + if ($globalDebug) { |
|
| 2279 | + echo "Add to DB..."; |
|
| 2280 | + } |
|
| 2060 | 2281 | $error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb'); |
| 2061 | - } else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
| 2282 | + } else { |
|
| 2283 | + $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed."; |
|
| 2284 | + } |
|
| 2062 | 2285 | if ($error != '') { |
| 2063 | 2286 | return $error; |
| 2064 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2287 | + } elseif ($globalDebug) { |
|
| 2288 | + echo "Done\n"; |
|
| 2289 | + } |
|
| 2065 | 2290 | return ''; |
| 2066 | 2291 | } |
| 2067 | 2292 | public static function update_oneworld() { |
| 2068 | 2293 | global $tmp_dir, $globalDebug; |
| 2069 | 2294 | $error = ''; |
| 2070 | - if ($globalDebug) echo "Schedules Oneworld : Download..."; |
|
| 2295 | + if ($globalDebug) { |
|
| 2296 | + echo "Schedules Oneworld : Download..."; |
|
| 2297 | + } |
|
| 2071 | 2298 | update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
| 2072 | 2299 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 2073 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2300 | + if ($globalDebug) { |
|
| 2301 | + echo "Gunzip..."; |
|
| 2302 | + } |
|
| 2074 | 2303 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
| 2075 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2304 | + if ($globalDebug) { |
|
| 2305 | + echo "Add to DB..."; |
|
| 2306 | + } |
|
| 2076 | 2307 | $error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv'); |
| 2077 | - } else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
| 2308 | + } else { |
|
| 2309 | + $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed."; |
|
| 2310 | + } |
|
| 2078 | 2311 | if ($error != '') { |
| 2079 | 2312 | return $error; |
| 2080 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2313 | + } elseif ($globalDebug) { |
|
| 2314 | + echo "Done\n"; |
|
| 2315 | + } |
|
| 2081 | 2316 | return ''; |
| 2082 | 2317 | } |
| 2083 | 2318 | public static function update_skyteam() { |
| 2084 | 2319 | global $tmp_dir, $globalDebug; |
| 2085 | 2320 | $error = ''; |
| 2086 | - if ($globalDebug) echo "Schedules Skyteam : Download..."; |
|
| 2321 | + if ($globalDebug) { |
|
| 2322 | + echo "Schedules Skyteam : Download..."; |
|
| 2323 | + } |
|
| 2087 | 2324 | update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
| 2088 | 2325 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 2089 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2326 | + if ($globalDebug) { |
|
| 2327 | + echo "Gunzip..."; |
|
| 2328 | + } |
|
| 2090 | 2329 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
| 2091 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2330 | + if ($globalDebug) { |
|
| 2331 | + echo "Add to DB..."; |
|
| 2332 | + } |
|
| 2092 | 2333 | $error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv'); |
| 2093 | - } else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
| 2334 | + } else { |
|
| 2335 | + $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed."; |
|
| 2336 | + } |
|
| 2094 | 2337 | if ($error != '') { |
| 2095 | 2338 | return $error; |
| 2096 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2339 | + } elseif ($globalDebug) { |
|
| 2340 | + echo "Done\n"; |
|
| 2341 | + } |
|
| 2097 | 2342 | return ''; |
| 2098 | 2343 | } |
| 2099 | 2344 | public static function update_ModeS() { |
@@ -2110,340 +2355,590 @@ discard block |
||
| 2110 | 2355 | exit; |
| 2111 | 2356 | } elseif ($globalDebug) echo "Done\n"; |
| 2112 | 2357 | */ |
| 2113 | - if ($globalDebug) echo "Modes : Download..."; |
|
| 2114 | -// update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
| 2358 | + if ($globalDebug) { |
|
| 2359 | + echo "Modes : Download..."; |
|
| 2360 | + } |
|
| 2361 | + // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
|
| 2115 | 2362 | update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
| 2116 | 2363 | |
| 2117 | 2364 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 2118 | 2365 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
| 2119 | - if ($globalDebug) echo "Unzip..."; |
|
| 2120 | -// update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
| 2366 | + if ($globalDebug) { |
|
| 2367 | + echo "Unzip..."; |
|
| 2368 | + } |
|
| 2369 | + // update_db::unzip($tmp_dir.'basestation_latest.zip'); |
|
| 2121 | 2370 | update_db::gunzip($tmp_dir.'BaseStation.sqb.gz'); |
| 2122 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2371 | + if ($globalDebug) { |
|
| 2372 | + echo "Add to DB..."; |
|
| 2373 | + } |
|
| 2123 | 2374 | $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb'); |
| 2124 | 2375 | // $error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb'); |
| 2125 | - } else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
| 2376 | + } else { |
|
| 2377 | + $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed."; |
|
| 2378 | + } |
|
| 2126 | 2379 | if ($error != '') { |
| 2127 | 2380 | return $error; |
| 2128 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2381 | + } elseif ($globalDebug) { |
|
| 2382 | + echo "Done\n"; |
|
| 2383 | + } |
|
| 2129 | 2384 | return ''; |
| 2130 | 2385 | } |
| 2131 | 2386 | |
| 2132 | 2387 | public static function update_ModeS_faa() { |
| 2133 | 2388 | global $tmp_dir, $globalDebug; |
| 2134 | - if ($globalDebug) echo "Modes FAA: Download..."; |
|
| 2389 | + if ($globalDebug) { |
|
| 2390 | + echo "Modes FAA: Download..."; |
|
| 2391 | + } |
|
| 2135 | 2392 | update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
| 2136 | 2393 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 2137 | - if ($globalDebug) echo "Unzip..."; |
|
| 2394 | + if ($globalDebug) { |
|
| 2395 | + echo "Unzip..."; |
|
| 2396 | + } |
|
| 2138 | 2397 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
| 2139 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2398 | + if ($globalDebug) { |
|
| 2399 | + echo "Add to DB..."; |
|
| 2400 | + } |
|
| 2140 | 2401 | $error = update_db::modes_faa(); |
| 2141 | - } else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
| 2402 | + } else { |
|
| 2403 | + $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed."; |
|
| 2404 | + } |
|
| 2142 | 2405 | if ($error != '') { |
| 2143 | 2406 | return $error; |
| 2144 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2407 | + } elseif ($globalDebug) { |
|
| 2408 | + echo "Done\n"; |
|
| 2409 | + } |
|
| 2145 | 2410 | return ''; |
| 2146 | 2411 | } |
| 2147 | 2412 | |
| 2148 | 2413 | public static function update_ModeS_flarm() { |
| 2149 | 2414 | global $tmp_dir, $globalDebug; |
| 2150 | - if ($globalDebug) echo "Modes Flarmnet: Download..."; |
|
| 2415 | + if ($globalDebug) { |
|
| 2416 | + echo "Modes Flarmnet: Download..."; |
|
| 2417 | + } |
|
| 2151 | 2418 | update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
| 2152 | 2419 | if (file_exists($tmp_dir.'data.fln')) { |
| 2153 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2420 | + if ($globalDebug) { |
|
| 2421 | + echo "Add to DB..."; |
|
| 2422 | + } |
|
| 2154 | 2423 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
| 2155 | - } else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
| 2424 | + } else { |
|
| 2425 | + $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed."; |
|
| 2426 | + } |
|
| 2156 | 2427 | if ($error != '') { |
| 2157 | 2428 | return $error; |
| 2158 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2429 | + } elseif ($globalDebug) { |
|
| 2430 | + echo "Done\n"; |
|
| 2431 | + } |
|
| 2159 | 2432 | return ''; |
| 2160 | 2433 | } |
| 2161 | 2434 | |
| 2162 | 2435 | public static function update_ModeS_ogn() { |
| 2163 | 2436 | global $tmp_dir, $globalDebug; |
| 2164 | - if ($globalDebug) echo "Modes OGN: Download..."; |
|
| 2437 | + if ($globalDebug) { |
|
| 2438 | + echo "Modes OGN: Download..."; |
|
| 2439 | + } |
|
| 2165 | 2440 | update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
| 2166 | 2441 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 2167 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2442 | + if ($globalDebug) { |
|
| 2443 | + echo "Add to DB..."; |
|
| 2444 | + } |
|
| 2168 | 2445 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
| 2169 | - } else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
| 2446 | + } else { |
|
| 2447 | + $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed."; |
|
| 2448 | + } |
|
| 2170 | 2449 | if ($error != '') { |
| 2171 | 2450 | return $error; |
| 2172 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2451 | + } elseif ($globalDebug) { |
|
| 2452 | + echo "Done\n"; |
|
| 2453 | + } |
|
| 2173 | 2454 | return ''; |
| 2174 | 2455 | } |
| 2175 | 2456 | |
| 2176 | 2457 | public static function update_owner() { |
| 2177 | 2458 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 2178 | 2459 | |
| 2179 | - if ($globalDebug) echo "Owner France: Download..."; |
|
| 2460 | + if ($globalDebug) { |
|
| 2461 | + echo "Owner France: Download..."; |
|
| 2462 | + } |
|
| 2180 | 2463 | update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
| 2181 | 2464 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 2182 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2465 | + if ($globalDebug) { |
|
| 2466 | + echo "Add to DB..."; |
|
| 2467 | + } |
|
| 2183 | 2468 | $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
| 2184 | - } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
| 2469 | + } else { |
|
| 2470 | + $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
|
| 2471 | + } |
|
| 2185 | 2472 | if ($error != '') { |
| 2186 | 2473 | return $error; |
| 2187 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2474 | + } elseif ($globalDebug) { |
|
| 2475 | + echo "Done\n"; |
|
| 2476 | + } |
|
| 2188 | 2477 | |
| 2189 | - if ($globalDebug) echo "Owner Ireland: Download..."; |
|
| 2478 | + if ($globalDebug) { |
|
| 2479 | + echo "Owner Ireland: Download..."; |
|
| 2480 | + } |
|
| 2190 | 2481 | update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
| 2191 | 2482 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 2192 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2483 | + if ($globalDebug) { |
|
| 2484 | + echo "Add to DB..."; |
|
| 2485 | + } |
|
| 2193 | 2486 | $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
| 2194 | - } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
| 2487 | + } else { |
|
| 2488 | + $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
|
| 2489 | + } |
|
| 2195 | 2490 | if ($error != '') { |
| 2196 | 2491 | return $error; |
| 2197 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2198 | - if ($globalDebug) echo "Owner Switzerland: Download..."; |
|
| 2492 | + } elseif ($globalDebug) { |
|
| 2493 | + echo "Done\n"; |
|
| 2494 | + } |
|
| 2495 | + if ($globalDebug) { |
|
| 2496 | + echo "Owner Switzerland: Download..."; |
|
| 2497 | + } |
|
| 2199 | 2498 | update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
| 2200 | 2499 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 2201 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2500 | + if ($globalDebug) { |
|
| 2501 | + echo "Add to DB..."; |
|
| 2502 | + } |
|
| 2202 | 2503 | $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
| 2203 | - } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
| 2504 | + } else { |
|
| 2505 | + $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
|
| 2506 | + } |
|
| 2204 | 2507 | if ($error != '') { |
| 2205 | 2508 | return $error; |
| 2206 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2207 | - if ($globalDebug) echo "Owner Czech Republic: Download..."; |
|
| 2509 | + } elseif ($globalDebug) { |
|
| 2510 | + echo "Done\n"; |
|
| 2511 | + } |
|
| 2512 | + if ($globalDebug) { |
|
| 2513 | + echo "Owner Czech Republic: Download..."; |
|
| 2514 | + } |
|
| 2208 | 2515 | update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
| 2209 | 2516 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 2210 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2517 | + if ($globalDebug) { |
|
| 2518 | + echo "Add to DB..."; |
|
| 2519 | + } |
|
| 2211 | 2520 | $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
| 2212 | - } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
| 2521 | + } else { |
|
| 2522 | + $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
|
| 2523 | + } |
|
| 2213 | 2524 | if ($error != '') { |
| 2214 | 2525 | return $error; |
| 2215 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2216 | - if ($globalDebug) echo "Owner Australia: Download..."; |
|
| 2526 | + } elseif ($globalDebug) { |
|
| 2527 | + echo "Done\n"; |
|
| 2528 | + } |
|
| 2529 | + if ($globalDebug) { |
|
| 2530 | + echo "Owner Australia: Download..."; |
|
| 2531 | + } |
|
| 2217 | 2532 | update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
| 2218 | 2533 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 2219 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2534 | + if ($globalDebug) { |
|
| 2535 | + echo "Add to DB..."; |
|
| 2536 | + } |
|
| 2220 | 2537 | $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
| 2221 | - } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
| 2538 | + } else { |
|
| 2539 | + $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
|
| 2540 | + } |
|
| 2222 | 2541 | if ($error != '') { |
| 2223 | 2542 | return $error; |
| 2224 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2225 | - if ($globalDebug) echo "Owner Austria: Download..."; |
|
| 2543 | + } elseif ($globalDebug) { |
|
| 2544 | + echo "Done\n"; |
|
| 2545 | + } |
|
| 2546 | + if ($globalDebug) { |
|
| 2547 | + echo "Owner Austria: Download..."; |
|
| 2548 | + } |
|
| 2226 | 2549 | update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
| 2227 | 2550 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 2228 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2551 | + if ($globalDebug) { |
|
| 2552 | + echo "Add to DB..."; |
|
| 2553 | + } |
|
| 2229 | 2554 | $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
| 2230 | - } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
| 2555 | + } else { |
|
| 2556 | + $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
|
| 2557 | + } |
|
| 2231 | 2558 | if ($error != '') { |
| 2232 | 2559 | return $error; |
| 2233 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2234 | - if ($globalDebug) echo "Owner Chile: Download..."; |
|
| 2560 | + } elseif ($globalDebug) { |
|
| 2561 | + echo "Done\n"; |
|
| 2562 | + } |
|
| 2563 | + if ($globalDebug) { |
|
| 2564 | + echo "Owner Chile: Download..."; |
|
| 2565 | + } |
|
| 2235 | 2566 | update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
| 2236 | 2567 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 2237 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2568 | + if ($globalDebug) { |
|
| 2569 | + echo "Add to DB..."; |
|
| 2570 | + } |
|
| 2238 | 2571 | $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
| 2239 | - } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
| 2572 | + } else { |
|
| 2573 | + $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
|
| 2574 | + } |
|
| 2240 | 2575 | if ($error != '') { |
| 2241 | 2576 | return $error; |
| 2242 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2243 | - if ($globalDebug) echo "Owner Colombia: Download..."; |
|
| 2577 | + } elseif ($globalDebug) { |
|
| 2578 | + echo "Done\n"; |
|
| 2579 | + } |
|
| 2580 | + if ($globalDebug) { |
|
| 2581 | + echo "Owner Colombia: Download..."; |
|
| 2582 | + } |
|
| 2244 | 2583 | update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
| 2245 | 2584 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 2246 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2585 | + if ($globalDebug) { |
|
| 2586 | + echo "Add to DB..."; |
|
| 2587 | + } |
|
| 2247 | 2588 | $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
| 2248 | - } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
| 2589 | + } else { |
|
| 2590 | + $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
|
| 2591 | + } |
|
| 2249 | 2592 | if ($error != '') { |
| 2250 | 2593 | return $error; |
| 2251 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2252 | - if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
|
| 2594 | + } elseif ($globalDebug) { |
|
| 2595 | + echo "Done\n"; |
|
| 2596 | + } |
|
| 2597 | + if ($globalDebug) { |
|
| 2598 | + echo "Owner Bosnia Herzegobina: Download..."; |
|
| 2599 | + } |
|
| 2253 | 2600 | update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
| 2254 | 2601 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 2255 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2602 | + if ($globalDebug) { |
|
| 2603 | + echo "Add to DB..."; |
|
| 2604 | + } |
|
| 2256 | 2605 | $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
| 2257 | - } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
| 2606 | + } else { |
|
| 2607 | + $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
|
| 2608 | + } |
|
| 2258 | 2609 | if ($error != '') { |
| 2259 | 2610 | return $error; |
| 2260 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2261 | - if ($globalDebug) echo "Owner Brazil: Download..."; |
|
| 2611 | + } elseif ($globalDebug) { |
|
| 2612 | + echo "Done\n"; |
|
| 2613 | + } |
|
| 2614 | + if ($globalDebug) { |
|
| 2615 | + echo "Owner Brazil: Download..."; |
|
| 2616 | + } |
|
| 2262 | 2617 | update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
| 2263 | 2618 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 2264 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2619 | + if ($globalDebug) { |
|
| 2620 | + echo "Add to DB..."; |
|
| 2621 | + } |
|
| 2265 | 2622 | $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
| 2266 | - } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
| 2623 | + } else { |
|
| 2624 | + $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
|
| 2625 | + } |
|
| 2267 | 2626 | if ($error != '') { |
| 2268 | 2627 | return $error; |
| 2269 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2270 | - if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
|
| 2628 | + } elseif ($globalDebug) { |
|
| 2629 | + echo "Done\n"; |
|
| 2630 | + } |
|
| 2631 | + if ($globalDebug) { |
|
| 2632 | + echo "Owner Cayman Islands: Download..."; |
|
| 2633 | + } |
|
| 2271 | 2634 | update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
| 2272 | 2635 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 2273 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2636 | + if ($globalDebug) { |
|
| 2637 | + echo "Add to DB..."; |
|
| 2638 | + } |
|
| 2274 | 2639 | $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
| 2275 | - } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
| 2640 | + } else { |
|
| 2641 | + $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
|
| 2642 | + } |
|
| 2276 | 2643 | if ($error != '') { |
| 2277 | 2644 | return $error; |
| 2278 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2279 | - if ($globalDebug) echo "Owner Croatia: Download..."; |
|
| 2645 | + } elseif ($globalDebug) { |
|
| 2646 | + echo "Done\n"; |
|
| 2647 | + } |
|
| 2648 | + if ($globalDebug) { |
|
| 2649 | + echo "Owner Croatia: Download..."; |
|
| 2650 | + } |
|
| 2280 | 2651 | update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
| 2281 | 2652 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 2282 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2653 | + if ($globalDebug) { |
|
| 2654 | + echo "Add to DB..."; |
|
| 2655 | + } |
|
| 2283 | 2656 | $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
| 2284 | - } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
| 2657 | + } else { |
|
| 2658 | + $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
|
| 2659 | + } |
|
| 2285 | 2660 | if ($error != '') { |
| 2286 | 2661 | return $error; |
| 2287 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2288 | - if ($globalDebug) echo "Owner Luxembourg: Download..."; |
|
| 2662 | + } elseif ($globalDebug) { |
|
| 2663 | + echo "Done\n"; |
|
| 2664 | + } |
|
| 2665 | + if ($globalDebug) { |
|
| 2666 | + echo "Owner Luxembourg: Download..."; |
|
| 2667 | + } |
|
| 2289 | 2668 | update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
| 2290 | 2669 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 2291 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2670 | + if ($globalDebug) { |
|
| 2671 | + echo "Add to DB..."; |
|
| 2672 | + } |
|
| 2292 | 2673 | $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
| 2293 | - } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
| 2674 | + } else { |
|
| 2675 | + $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
|
| 2676 | + } |
|
| 2294 | 2677 | if ($error != '') { |
| 2295 | 2678 | return $error; |
| 2296 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2297 | - if ($globalDebug) echo "Owner Maldives: Download..."; |
|
| 2679 | + } elseif ($globalDebug) { |
|
| 2680 | + echo "Done\n"; |
|
| 2681 | + } |
|
| 2682 | + if ($globalDebug) { |
|
| 2683 | + echo "Owner Maldives: Download..."; |
|
| 2684 | + } |
|
| 2298 | 2685 | update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
| 2299 | 2686 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 2300 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2687 | + if ($globalDebug) { |
|
| 2688 | + echo "Add to DB..."; |
|
| 2689 | + } |
|
| 2301 | 2690 | $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
| 2302 | - } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
| 2691 | + } else { |
|
| 2692 | + $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
|
| 2693 | + } |
|
| 2303 | 2694 | if ($error != '') { |
| 2304 | 2695 | return $error; |
| 2305 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2306 | - if ($globalDebug) echo "Owner New Zealand: Download..."; |
|
| 2696 | + } elseif ($globalDebug) { |
|
| 2697 | + echo "Done\n"; |
|
| 2698 | + } |
|
| 2699 | + if ($globalDebug) { |
|
| 2700 | + echo "Owner New Zealand: Download..."; |
|
| 2701 | + } |
|
| 2307 | 2702 | update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
| 2308 | 2703 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 2309 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2704 | + if ($globalDebug) { |
|
| 2705 | + echo "Add to DB..."; |
|
| 2706 | + } |
|
| 2310 | 2707 | $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
| 2311 | - } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
| 2708 | + } else { |
|
| 2709 | + $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
|
| 2710 | + } |
|
| 2312 | 2711 | if ($error != '') { |
| 2313 | 2712 | return $error; |
| 2314 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2315 | - if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
|
| 2713 | + } elseif ($globalDebug) { |
|
| 2714 | + echo "Done\n"; |
|
| 2715 | + } |
|
| 2716 | + if ($globalDebug) { |
|
| 2717 | + echo "Owner Papua New Guinea: Download..."; |
|
| 2718 | + } |
|
| 2316 | 2719 | update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
| 2317 | 2720 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 2318 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2721 | + if ($globalDebug) { |
|
| 2722 | + echo "Add to DB..."; |
|
| 2723 | + } |
|
| 2319 | 2724 | $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
| 2320 | - } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
| 2725 | + } else { |
|
| 2726 | + $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
|
| 2727 | + } |
|
| 2321 | 2728 | if ($error != '') { |
| 2322 | 2729 | return $error; |
| 2323 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2324 | - if ($globalDebug) echo "Owner Slovakia: Download..."; |
|
| 2730 | + } elseif ($globalDebug) { |
|
| 2731 | + echo "Done\n"; |
|
| 2732 | + } |
|
| 2733 | + if ($globalDebug) { |
|
| 2734 | + echo "Owner Slovakia: Download..."; |
|
| 2735 | + } |
|
| 2325 | 2736 | update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
| 2326 | 2737 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 2327 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2738 | + if ($globalDebug) { |
|
| 2739 | + echo "Add to DB..."; |
|
| 2740 | + } |
|
| 2328 | 2741 | $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
| 2329 | - } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
| 2742 | + } else { |
|
| 2743 | + $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
|
| 2744 | + } |
|
| 2330 | 2745 | if ($error != '') { |
| 2331 | 2746 | return $error; |
| 2332 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2333 | - if ($globalDebug) echo "Owner Ecuador: Download..."; |
|
| 2747 | + } elseif ($globalDebug) { |
|
| 2748 | + echo "Done\n"; |
|
| 2749 | + } |
|
| 2750 | + if ($globalDebug) { |
|
| 2751 | + echo "Owner Ecuador: Download..."; |
|
| 2752 | + } |
|
| 2334 | 2753 | update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
| 2335 | 2754 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 2336 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2755 | + if ($globalDebug) { |
|
| 2756 | + echo "Add to DB..."; |
|
| 2757 | + } |
|
| 2337 | 2758 | $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
| 2338 | - } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
| 2759 | + } else { |
|
| 2760 | + $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
|
| 2761 | + } |
|
| 2339 | 2762 | if ($error != '') { |
| 2340 | 2763 | return $error; |
| 2341 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2342 | - if ($globalDebug) echo "Owner Iceland: Download..."; |
|
| 2764 | + } elseif ($globalDebug) { |
|
| 2765 | + echo "Done\n"; |
|
| 2766 | + } |
|
| 2767 | + if ($globalDebug) { |
|
| 2768 | + echo "Owner Iceland: Download..."; |
|
| 2769 | + } |
|
| 2343 | 2770 | update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
| 2344 | 2771 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 2345 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2772 | + if ($globalDebug) { |
|
| 2773 | + echo "Add to DB..."; |
|
| 2774 | + } |
|
| 2346 | 2775 | $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
| 2347 | - } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
| 2776 | + } else { |
|
| 2777 | + $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
|
| 2778 | + } |
|
| 2348 | 2779 | if ($error != '') { |
| 2349 | 2780 | return $error; |
| 2350 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2351 | - if ($globalDebug) echo "Owner Isle of Man: Download..."; |
|
| 2781 | + } elseif ($globalDebug) { |
|
| 2782 | + echo "Done\n"; |
|
| 2783 | + } |
|
| 2784 | + if ($globalDebug) { |
|
| 2785 | + echo "Owner Isle of Man: Download..."; |
|
| 2786 | + } |
|
| 2352 | 2787 | update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
| 2353 | 2788 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 2354 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2789 | + if ($globalDebug) { |
|
| 2790 | + echo "Add to DB..."; |
|
| 2791 | + } |
|
| 2355 | 2792 | $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
| 2356 | - } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
| 2793 | + } else { |
|
| 2794 | + $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
|
| 2795 | + } |
|
| 2357 | 2796 | if ($error != '') { |
| 2358 | 2797 | return $error; |
| 2359 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2798 | + } elseif ($globalDebug) { |
|
| 2799 | + echo "Done\n"; |
|
| 2800 | + } |
|
| 2360 | 2801 | if ($globalMasterSource) { |
| 2361 | - if ($globalDebug) echo "ModeS Netherlands: Download..."; |
|
| 2802 | + if ($globalDebug) { |
|
| 2803 | + echo "ModeS Netherlands: Download..."; |
|
| 2804 | + } |
|
| 2362 | 2805 | update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
| 2363 | 2806 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 2364 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2807 | + if ($globalDebug) { |
|
| 2808 | + echo "Add to DB..."; |
|
| 2809 | + } |
|
| 2365 | 2810 | $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
| 2366 | - } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
| 2811 | + } else { |
|
| 2812 | + $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
|
| 2813 | + } |
|
| 2367 | 2814 | if ($error != '') { |
| 2368 | 2815 | return $error; |
| 2369 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2370 | - if ($globalDebug) echo "ModeS Denmark: Download..."; |
|
| 2816 | + } elseif ($globalDebug) { |
|
| 2817 | + echo "Done\n"; |
|
| 2818 | + } |
|
| 2819 | + if ($globalDebug) { |
|
| 2820 | + echo "ModeS Denmark: Download..."; |
|
| 2821 | + } |
|
| 2371 | 2822 | update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
| 2372 | 2823 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 2373 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2824 | + if ($globalDebug) { |
|
| 2825 | + echo "Add to DB..."; |
|
| 2826 | + } |
|
| 2374 | 2827 | $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
| 2375 | - } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
| 2828 | + } else { |
|
| 2829 | + $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
|
| 2830 | + } |
|
| 2376 | 2831 | if ($error != '') { |
| 2377 | 2832 | return $error; |
| 2378 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2379 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2833 | + } elseif ($globalDebug) { |
|
| 2834 | + echo "Done\n"; |
|
| 2835 | + } |
|
| 2836 | + } elseif ($globalDebug) { |
|
| 2837 | + echo "Done\n"; |
|
| 2838 | + } |
|
| 2380 | 2839 | return ''; |
| 2381 | 2840 | } |
| 2382 | 2841 | |
| 2383 | 2842 | public static function update_translation() { |
| 2384 | 2843 | global $tmp_dir, $globalDebug; |
| 2385 | 2844 | $error = ''; |
| 2386 | - if ($globalDebug) echo "Translation : Download..."; |
|
| 2845 | + if ($globalDebug) { |
|
| 2846 | + echo "Translation : Download..."; |
|
| 2847 | + } |
|
| 2387 | 2848 | update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
| 2388 | 2849 | if (file_exists($tmp_dir.'translation.zip')) { |
| 2389 | - if ($globalDebug) echo "Unzip..."; |
|
| 2850 | + if ($globalDebug) { |
|
| 2851 | + echo "Unzip..."; |
|
| 2852 | + } |
|
| 2390 | 2853 | update_db::unzip($tmp_dir.'translation.zip'); |
| 2391 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2854 | + if ($globalDebug) { |
|
| 2855 | + echo "Add to DB..."; |
|
| 2856 | + } |
|
| 2392 | 2857 | $error = update_db::translation(); |
| 2393 | - } else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
| 2858 | + } else { |
|
| 2859 | + $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed."; |
|
| 2860 | + } |
|
| 2394 | 2861 | if ($error != '') { |
| 2395 | 2862 | return $error; |
| 2396 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2863 | + } elseif ($globalDebug) { |
|
| 2864 | + echo "Done\n"; |
|
| 2865 | + } |
|
| 2397 | 2866 | return ''; |
| 2398 | 2867 | } |
| 2399 | 2868 | |
| 2400 | 2869 | public static function update_translation_fam() { |
| 2401 | 2870 | global $tmp_dir, $globalDebug; |
| 2402 | 2871 | $error = ''; |
| 2403 | - if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
|
| 2872 | + if ($globalDebug) { |
|
| 2873 | + echo "Translation from FlightAirMap website : Download..."; |
|
| 2874 | + } |
|
| 2404 | 2875 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
| 2405 | 2876 | update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5'); |
| 2406 | 2877 | if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) { |
| 2407 | 2878 | $translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5')); |
| 2408 | 2879 | $translation_md5 = $translation_md5_file[0]; |
| 2409 | 2880 | if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) { |
| 2410 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2881 | + if ($globalDebug) { |
|
| 2882 | + echo "Gunzip..."; |
|
| 2883 | + } |
|
| 2411 | 2884 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
| 2412 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2885 | + if ($globalDebug) { |
|
| 2886 | + echo "Add to DB..."; |
|
| 2887 | + } |
|
| 2413 | 2888 | $error = update_db::translation_fam(); |
| 2414 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed."; |
|
| 2415 | - } else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
| 2889 | + } else { |
|
| 2890 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed."; |
|
| 2891 | + } |
|
| 2892 | + } else { |
|
| 2893 | + $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed."; |
|
| 2894 | + } |
|
| 2416 | 2895 | if ($error != '') { |
| 2417 | 2896 | return $error; |
| 2418 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2897 | + } elseif ($globalDebug) { |
|
| 2898 | + echo "Done\n"; |
|
| 2899 | + } |
|
| 2419 | 2900 | return ''; |
| 2420 | 2901 | } |
| 2421 | 2902 | public static function update_ModeS_fam() { |
| 2422 | 2903 | global $tmp_dir, $globalDebug; |
| 2423 | 2904 | $error = ''; |
| 2424 | - if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
|
| 2905 | + if ($globalDebug) { |
|
| 2906 | + echo "ModeS from FlightAirMap website : Download..."; |
|
| 2907 | + } |
|
| 2425 | 2908 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
| 2426 | 2909 | update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5'); |
| 2427 | 2910 | if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) { |
| 2428 | 2911 | $modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5')); |
| 2429 | 2912 | $modes_md5 = $modes_md5_file[0]; |
| 2430 | 2913 | if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) { |
| 2431 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2914 | + if ($globalDebug) { |
|
| 2915 | + echo "Gunzip..."; |
|
| 2916 | + } |
|
| 2432 | 2917 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
| 2433 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2918 | + if ($globalDebug) { |
|
| 2919 | + echo "Add to DB..."; |
|
| 2920 | + } |
|
| 2434 | 2921 | $error = update_db::modes_fam(); |
| 2435 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed."; |
|
| 2436 | - } else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2922 | + } else { |
|
| 2923 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed."; |
|
| 2924 | + } |
|
| 2925 | + } else { |
|
| 2926 | + $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed."; |
|
| 2927 | + } |
|
| 2437 | 2928 | if ($error != '') { |
| 2438 | 2929 | return $error; |
| 2439 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2930 | + } elseif ($globalDebug) { |
|
| 2931 | + echo "Done\n"; |
|
| 2932 | + } |
|
| 2440 | 2933 | return ''; |
| 2441 | 2934 | } |
| 2442 | 2935 | |
| 2443 | 2936 | public static function update_airlines_fam() { |
| 2444 | 2937 | global $tmp_dir, $globalDebug; |
| 2445 | 2938 | $error = ''; |
| 2446 | - if ($globalDebug) echo "Airlines from FlightAirMap website : Download..."; |
|
| 2939 | + if ($globalDebug) { |
|
| 2940 | + echo "Airlines from FlightAirMap website : Download..."; |
|
| 2941 | + } |
|
| 2447 | 2942 | update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5'); |
| 2448 | 2943 | if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) { |
| 2449 | 2944 | $airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5')); |
@@ -2452,26 +2947,42 @@ discard block |
||
| 2452 | 2947 | update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz'); |
| 2453 | 2948 | if (file_exists($tmp_dir.'airlines.tsv.gz')) { |
| 2454 | 2949 | if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) { |
| 2455 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2950 | + if ($globalDebug) { |
|
| 2951 | + echo "Gunzip..."; |
|
| 2952 | + } |
|
| 2456 | 2953 | update_db::gunzip($tmp_dir.'airlines.tsv.gz'); |
| 2457 | - if ($globalDebug) echo "Add to DB..."; |
|
| 2954 | + if ($globalDebug) { |
|
| 2955 | + echo "Add to DB..."; |
|
| 2956 | + } |
|
| 2458 | 2957 | $error = update_db::airlines_fam(); |
| 2459 | 2958 | update_db::insert_airlines_version($airlines_md5); |
| 2460 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
|
| 2461 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2462 | - } elseif ($globalDebug) echo "No update."; |
|
| 2463 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
|
| 2959 | + } else { |
|
| 2960 | + $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
|
| 2961 | + } |
|
| 2962 | + } else { |
|
| 2963 | + $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2964 | + } |
|
| 2965 | + } elseif ($globalDebug) { |
|
| 2966 | + echo "No update."; |
|
| 2967 | + } |
|
| 2968 | + } else { |
|
| 2969 | + $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
|
| 2970 | + } |
|
| 2464 | 2971 | if ($error != '') { |
| 2465 | 2972 | return $error; |
| 2466 | 2973 | } else { |
| 2467 | - if ($globalDebug) echo "Done\n"; |
|
| 2974 | + if ($globalDebug) { |
|
| 2975 | + echo "Done\n"; |
|
| 2976 | + } |
|
| 2468 | 2977 | } |
| 2469 | 2978 | return ''; |
| 2470 | 2979 | } |
| 2471 | 2980 | |
| 2472 | 2981 | public static function update_owner_fam() { |
| 2473 | 2982 | global $tmp_dir, $globalDebug, $globalOwner; |
| 2474 | - if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
|
| 2983 | + if ($globalDebug) { |
|
| 2984 | + echo "owner from FlightAirMap website : Download..."; |
|
| 2985 | + } |
|
| 2475 | 2986 | $error = ''; |
| 2476 | 2987 | if ($globalOwner === TRUE) { |
| 2477 | 2988 | update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
@@ -2484,35 +2995,57 @@ discard block |
||
| 2484 | 2995 | $owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5')); |
| 2485 | 2996 | $owners_md5 = $owners_md5_file[0]; |
| 2486 | 2997 | if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) { |
| 2487 | - if ($globalDebug) echo "Gunzip..."; |
|
| 2998 | + if ($globalDebug) { |
|
| 2999 | + echo "Gunzip..."; |
|
| 3000 | + } |
|
| 2488 | 3001 | update_db::gunzip($tmp_dir.'owners.tsv.gz'); |
| 2489 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3002 | + if ($globalDebug) { |
|
| 3003 | + echo "Add to DB..."; |
|
| 3004 | + } |
|
| 2490 | 3005 | $error = update_db::owner_fam(); |
| 2491 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed."; |
|
| 2492 | - } else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
| 3006 | + } else { |
|
| 3007 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed."; |
|
| 3008 | + } |
|
| 3009 | + } else { |
|
| 3010 | + $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed."; |
|
| 3011 | + } |
|
| 2493 | 3012 | if ($error != '') { |
| 2494 | 3013 | return $error; |
| 2495 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3014 | + } elseif ($globalDebug) { |
|
| 3015 | + echo "Done\n"; |
|
| 3016 | + } |
|
| 2496 | 3017 | return ''; |
| 2497 | 3018 | } |
| 2498 | 3019 | public static function update_routes_fam() { |
| 2499 | 3020 | global $tmp_dir, $globalDebug; |
| 2500 | - if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
|
| 3021 | + if ($globalDebug) { |
|
| 3022 | + echo "Routes from FlightAirMap website : Download..."; |
|
| 3023 | + } |
|
| 2501 | 3024 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
| 2502 | 3025 | update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5'); |
| 2503 | 3026 | if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) { |
| 2504 | 3027 | $routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5')); |
| 2505 | 3028 | $routes_md5 = $routes_md5_file[0]; |
| 2506 | 3029 | if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) { |
| 2507 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3030 | + if ($globalDebug) { |
|
| 3031 | + echo "Gunzip..."; |
|
| 3032 | + } |
|
| 2508 | 3033 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
| 2509 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3034 | + if ($globalDebug) { |
|
| 3035 | + echo "Add to DB..."; |
|
| 3036 | + } |
|
| 2510 | 3037 | $error = update_db::routes_fam(); |
| 2511 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed."; |
|
| 2512 | - } else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
| 3038 | + } else { |
|
| 3039 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed."; |
|
| 3040 | + } |
|
| 3041 | + } else { |
|
| 3042 | + $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed."; |
|
| 3043 | + } |
|
| 2513 | 3044 | if ($error != '') { |
| 2514 | 3045 | return $error; |
| 2515 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3046 | + } elseif ($globalDebug) { |
|
| 3047 | + echo "Done\n"; |
|
| 3048 | + } |
|
| 2516 | 3049 | return ''; |
| 2517 | 3050 | } |
| 2518 | 3051 | public static function update_marine_identity_fam() { |
@@ -2522,21 +3055,33 @@ discard block |
||
| 2522 | 3055 | $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
| 2523 | 3056 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2524 | 3057 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2525 | - if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
|
| 3058 | + if ($globalDebug) { |
|
| 3059 | + echo "Marine identity from FlightAirMap website : Download..."; |
|
| 3060 | + } |
|
| 2526 | 3061 | update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
| 2527 | 3062 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2528 | 3063 | if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) { |
| 2529 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3064 | + if ($globalDebug) { |
|
| 3065 | + echo "Gunzip..."; |
|
| 3066 | + } |
|
| 2530 | 3067 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
| 2531 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3068 | + if ($globalDebug) { |
|
| 3069 | + echo "Add to DB..."; |
|
| 3070 | + } |
|
| 2532 | 3071 | $error = update_db::marine_identity_fam(); |
| 2533 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed."; |
|
| 2534 | - } else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
| 3072 | + } else { |
|
| 3073 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed."; |
|
| 3074 | + } |
|
| 3075 | + } else { |
|
| 3076 | + $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed."; |
|
| 3077 | + } |
|
| 2535 | 3078 | if ($error != '') { |
| 2536 | 3079 | return $error; |
| 2537 | 3080 | } else { |
| 2538 | 3081 | update_db::insert_marine_identity_version($marine_identity_md5); |
| 2539 | - if ($globalDebug) echo "Done\n"; |
|
| 3082 | + if ($globalDebug) { |
|
| 3083 | + echo "Done\n"; |
|
| 3084 | + } |
|
| 2540 | 3085 | } |
| 2541 | 3086 | } |
| 2542 | 3087 | } |
@@ -2550,21 +3095,33 @@ discard block |
||
| 2550 | 3095 | $satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5')); |
| 2551 | 3096 | $satellite_md5 = $satellite_md5_file[0]; |
| 2552 | 3097 | if (!update_db::check_satellite_version($satellite_md5)) { |
| 2553 | - if ($globalDebug) echo "Satellite from FlightAirMap website : Download..."; |
|
| 3098 | + if ($globalDebug) { |
|
| 3099 | + echo "Satellite from FlightAirMap website : Download..."; |
|
| 3100 | + } |
|
| 2554 | 3101 | update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz'); |
| 2555 | 3102 | if (file_exists($tmp_dir.'satellite.tsv.gz')) { |
| 2556 | 3103 | if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) { |
| 2557 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3104 | + if ($globalDebug) { |
|
| 3105 | + echo "Gunzip..."; |
|
| 3106 | + } |
|
| 2558 | 3107 | update_db::gunzip($tmp_dir.'satellite.tsv.gz'); |
| 2559 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3108 | + if ($globalDebug) { |
|
| 3109 | + echo "Add to DB..."; |
|
| 3110 | + } |
|
| 2560 | 3111 | $error = update_db::satellite_fam(); |
| 2561 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed."; |
|
| 2562 | - } else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
| 3112 | + } else { |
|
| 3113 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed."; |
|
| 3114 | + } |
|
| 3115 | + } else { |
|
| 3116 | + $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed."; |
|
| 3117 | + } |
|
| 2563 | 3118 | if ($error != '') { |
| 2564 | 3119 | return $error; |
| 2565 | 3120 | } else { |
| 2566 | 3121 | update_db::insert_satellite_version($satellite_md5); |
| 2567 | - if ($globalDebug) echo "Done\n"; |
|
| 3122 | + if ($globalDebug) { |
|
| 3123 | + echo "Done\n"; |
|
| 3124 | + } |
|
| 2568 | 3125 | } |
| 2569 | 3126 | } |
| 2570 | 3127 | } |
@@ -2572,17 +3129,25 @@ discard block |
||
| 2572 | 3129 | } |
| 2573 | 3130 | public static function update_banned_fam() { |
| 2574 | 3131 | global $tmp_dir, $globalDebug; |
| 2575 | - if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
| 3132 | + if ($globalDebug) { |
|
| 3133 | + echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
|
| 3134 | + } |
|
| 2576 | 3135 | update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
| 2577 | 3136 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2578 | 3137 | //if ($globalDebug) echo "Gunzip..."; |
| 2579 | 3138 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
| 2580 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3139 | + if ($globalDebug) { |
|
| 3140 | + echo "Add to DB..."; |
|
| 3141 | + } |
|
| 2581 | 3142 | $error = update_db::banned_fam(); |
| 2582 | - } else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
| 3143 | + } else { |
|
| 3144 | + $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed."; |
|
| 3145 | + } |
|
| 2583 | 3146 | if ($error != '') { |
| 2584 | 3147 | return $error; |
| 2585 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3148 | + } elseif ($globalDebug) { |
|
| 3149 | + echo "Done\n"; |
|
| 3150 | + } |
|
| 2586 | 3151 | return ''; |
| 2587 | 3152 | } |
| 2588 | 3153 | |
@@ -2590,7 +3155,9 @@ discard block |
||
| 2590 | 3155 | global $tmp_dir, $globalDebug, $globalDBdriver; |
| 2591 | 3156 | include_once('class.create_db.php'); |
| 2592 | 3157 | $error = ''; |
| 2593 | - if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
|
| 3158 | + if ($globalDebug) { |
|
| 3159 | + echo "Airspace from FlightAirMap website : Download..."; |
|
| 3160 | + } |
|
| 2594 | 3161 | if ($globalDBdriver == 'mysql') { |
| 2595 | 3162 | update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
| 2596 | 3163 | } else { |
@@ -2607,9 +3174,13 @@ discard block |
||
| 2607 | 3174 | } |
| 2608 | 3175 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2609 | 3176 | if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) { |
| 2610 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3177 | + if ($globalDebug) { |
|
| 3178 | + echo "Gunzip..."; |
|
| 3179 | + } |
|
| 2611 | 3180 | update_db::gunzip($tmp_dir.'airspace.sql.gz'); |
| 2612 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3181 | + if ($globalDebug) { |
|
| 3182 | + echo "Add to DB..."; |
|
| 3183 | + } |
|
| 2613 | 3184 | $Connection = new Connection(); |
| 2614 | 3185 | if ($Connection->tableExists('airspace')) { |
| 2615 | 3186 | $query = 'DROP TABLE airspace'; |
@@ -2622,20 +3193,30 @@ discard block |
||
| 2622 | 3193 | } |
| 2623 | 3194 | $error = create_db::import_file($tmp_dir.'airspace.sql'); |
| 2624 | 3195 | update_db::insert_airspace_version($airspace_md5); |
| 2625 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed."; |
|
| 2626 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
| 3196 | + } else { |
|
| 3197 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed."; |
|
| 3198 | + } |
|
| 3199 | + } else { |
|
| 3200 | + $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed."; |
|
| 3201 | + } |
|
| 2627 | 3202 | } |
| 2628 | - } else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
| 3203 | + } else { |
|
| 3204 | + $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed."; |
|
| 3205 | + } |
|
| 2629 | 3206 | if ($error != '') { |
| 2630 | 3207 | return $error; |
| 2631 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3208 | + } elseif ($globalDebug) { |
|
| 3209 | + echo "Done\n"; |
|
| 3210 | + } |
|
| 2632 | 3211 | return ''; |
| 2633 | 3212 | } |
| 2634 | 3213 | |
| 2635 | 3214 | public static function update_geoid_fam() { |
| 2636 | 3215 | global $tmp_dir, $globalDebug, $globalGeoidSource; |
| 2637 | 3216 | $error = ''; |
| 2638 | - if ($globalDebug) echo "Geoid from FlightAirMap website : Download..."; |
|
| 3217 | + if ($globalDebug) { |
|
| 3218 | + echo "Geoid from FlightAirMap website : Download..."; |
|
| 3219 | + } |
|
| 2639 | 3220 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'); |
| 2640 | 3221 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) { |
| 2641 | 3222 | $geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')); |
@@ -2644,76 +3225,116 @@ discard block |
||
| 2644 | 3225 | update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz'); |
| 2645 | 3226 | if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) { |
| 2646 | 3227 | if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) { |
| 2647 | - if ($globalDebug) echo "Gunzip..."; |
|
| 3228 | + if ($globalDebug) { |
|
| 3229 | + echo "Gunzip..."; |
|
| 3230 | + } |
|
| 2648 | 3231 | update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm'); |
| 2649 | 3232 | if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) { |
| 2650 | 3233 | update_db::insert_geoid_version($geoid_md5); |
| 2651 | 3234 | } |
| 2652 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed."; |
|
| 2653 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
| 3235 | + } else { |
|
| 3236 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed."; |
|
| 3237 | + } |
|
| 3238 | + } else { |
|
| 3239 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed."; |
|
| 3240 | + } |
|
| 2654 | 3241 | } |
| 2655 | - } else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
| 3242 | + } else { |
|
| 3243 | + $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed."; |
|
| 3244 | + } |
|
| 2656 | 3245 | if ($error != '') { |
| 2657 | 3246 | return $error; |
| 2658 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3247 | + } elseif ($globalDebug) { |
|
| 3248 | + echo "Done\n"; |
|
| 3249 | + } |
|
| 2659 | 3250 | return ''; |
| 2660 | 3251 | } |
| 2661 | 3252 | |
| 2662 | 3253 | public static function update_tle() { |
| 2663 | 3254 | global $tmp_dir, $globalDebug; |
| 2664 | - if ($globalDebug) echo "Download TLE : Download..."; |
|
| 3255 | + if ($globalDebug) { |
|
| 3256 | + echo "Download TLE : Download..."; |
|
| 3257 | + } |
|
| 2665 | 3258 | $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', |
| 2666 | 3259 | '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', |
| 2667 | 3260 | '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'); |
| 2668 | 3261 | foreach ($alltle as $filename) { |
| 2669 | - if ($globalDebug) echo "downloading ".$filename.'...'; |
|
| 3262 | + if ($globalDebug) { |
|
| 3263 | + echo "downloading ".$filename.'...'; |
|
| 3264 | + } |
|
| 2670 | 3265 | update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
| 2671 | 3266 | if (file_exists($tmp_dir.$filename)) { |
| 2672 | - if ($globalDebug) echo "Add to DB ".$filename."..."; |
|
| 3267 | + if ($globalDebug) { |
|
| 3268 | + echo "Add to DB ".$filename."..."; |
|
| 3269 | + } |
|
| 2673 | 3270 | $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
| 2674 | - } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
| 3271 | + } else { |
|
| 3272 | + $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
|
| 3273 | + } |
|
| 2675 | 3274 | if ($error != '') { |
| 2676 | 3275 | echo $error."\n"; |
| 2677 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3276 | + } elseif ($globalDebug) { |
|
| 3277 | + echo "Done\n"; |
|
| 3278 | + } |
|
| 2678 | 3279 | } |
| 2679 | 3280 | return ''; |
| 2680 | 3281 | } |
| 2681 | 3282 | |
| 2682 | 3283 | public static function update_ucsdb() { |
| 2683 | 3284 | global $tmp_dir, $globalDebug; |
| 2684 | - if ($globalDebug) echo "Download UCS DB : Download..."; |
|
| 3285 | + if ($globalDebug) { |
|
| 3286 | + echo "Download UCS DB : Download..."; |
|
| 3287 | + } |
|
| 2685 | 3288 | 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'); |
| 2686 | 3289 | if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) { |
| 2687 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3290 | + if ($globalDebug) { |
|
| 3291 | + echo "Add to DB..."; |
|
| 3292 | + } |
|
| 2688 | 3293 | $error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'); |
| 2689 | - } else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
| 3294 | + } else { |
|
| 3295 | + $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed."; |
|
| 3296 | + } |
|
| 2690 | 3297 | if ($error != '') { |
| 2691 | 3298 | echo $error."\n"; |
| 2692 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3299 | + } elseif ($globalDebug) { |
|
| 3300 | + echo "Done\n"; |
|
| 3301 | + } |
|
| 2693 | 3302 | return ''; |
| 2694 | 3303 | } |
| 2695 | 3304 | |
| 2696 | 3305 | public static function update_celestrak() { |
| 2697 | 3306 | global $tmp_dir, $globalDebug; |
| 2698 | - if ($globalDebug) echo "Download Celestrak DB : Download..."; |
|
| 3307 | + if ($globalDebug) { |
|
| 3308 | + echo "Download Celestrak DB : Download..."; |
|
| 3309 | + } |
|
| 2699 | 3310 | update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt'); |
| 2700 | 3311 | if (file_exists($tmp_dir.'satcat.txt')) { |
| 2701 | - if ($globalDebug) echo "Add to DB..."; |
|
| 3312 | + if ($globalDebug) { |
|
| 3313 | + echo "Add to DB..."; |
|
| 3314 | + } |
|
| 2702 | 3315 | $error = update_db::satellite_celestrak($tmp_dir.'satcat.txt'); |
| 2703 | - } else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
| 3316 | + } else { |
|
| 3317 | + $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed."; |
|
| 3318 | + } |
|
| 2704 | 3319 | if ($error != '') { |
| 2705 | 3320 | echo $error."\n"; |
| 2706 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3321 | + } elseif ($globalDebug) { |
|
| 3322 | + echo "Done\n"; |
|
| 3323 | + } |
|
| 2707 | 3324 | return ''; |
| 2708 | 3325 | } |
| 2709 | 3326 | |
| 2710 | 3327 | public static function update_models() { |
| 2711 | 3328 | global $tmp_dir, $globalDebug; |
| 2712 | 3329 | $error = ''; |
| 2713 | - if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
|
| 3330 | + if ($globalDebug) { |
|
| 3331 | + echo "Models from FlightAirMap website : Download..."; |
|
| 3332 | + } |
|
| 2714 | 3333 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
| 2715 | 3334 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2716 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3335 | + if ($globalDebug) { |
|
| 3336 | + echo "Check files...\n"; |
|
| 3337 | + } |
|
| 2717 | 3338 | $newmodelsdb = array(); |
| 2718 | 3339 | if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
| 2719 | 3340 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2732,19 +3353,29 @@ discard block |
||
| 2732 | 3353 | } |
| 2733 | 3354 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2734 | 3355 | foreach ($diff as $key => $value) { |
| 2735 | - if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
|
| 3356 | + if ($globalDebug) { |
|
| 3357 | + echo 'Downloading model '.$key.' ...'."\n"; |
|
| 3358 | + } |
|
| 2736 | 3359 | update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
| 2737 | 3360 | |
| 2738 | 3361 | } |
| 2739 | 3362 | update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
| 2740 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3363 | + } else { |
|
| 3364 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3365 | + } |
|
| 2741 | 3366 | if ($error != '') { |
| 2742 | 3367 | return $error; |
| 2743 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 2744 | - if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download..."; |
|
| 3368 | + } elseif ($globalDebug) { |
|
| 3369 | + echo "Done\n"; |
|
| 3370 | + } |
|
| 3371 | + if ($globalDebug) { |
|
| 3372 | + echo "glTF 2.0 Models from FlightAirMap website : Download..."; |
|
| 3373 | + } |
|
| 2745 | 3374 | update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum'); |
| 2746 | 3375 | if (file_exists($tmp_dir.'modelsgltf2.md5sum')) { |
| 2747 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3376 | + if ($globalDebug) { |
|
| 3377 | + echo "Check files...\n"; |
|
| 3378 | + } |
|
| 2748 | 3379 | $newmodelsdb = array(); |
| 2749 | 3380 | if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) { |
| 2750 | 3381 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2763,25 +3394,35 @@ discard block |
||
| 2763 | 3394 | } |
| 2764 | 3395 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2765 | 3396 | foreach ($diff as $key => $value) { |
| 2766 | - if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
|
| 3397 | + if ($globalDebug) { |
|
| 3398 | + echo 'Downloading model '.$key.' ...'."\n"; |
|
| 3399 | + } |
|
| 2767 | 3400 | update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key); |
| 2768 | 3401 | |
| 2769 | 3402 | } |
| 2770 | 3403 | update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum'); |
| 2771 | - } else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed."; |
|
| 3404 | + } else { |
|
| 3405 | + $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed."; |
|
| 3406 | + } |
|
| 2772 | 3407 | if ($error != '') { |
| 2773 | 3408 | return $error; |
| 2774 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3409 | + } elseif ($globalDebug) { |
|
| 3410 | + echo "Done\n"; |
|
| 3411 | + } |
|
| 2775 | 3412 | return ''; |
| 2776 | 3413 | } |
| 2777 | 3414 | |
| 2778 | 3415 | public static function update_liveries() { |
| 2779 | 3416 | global $tmp_dir, $globalDebug; |
| 2780 | 3417 | $error = ''; |
| 2781 | - if ($globalDebug) echo "Liveries from FlightAirMap website : Download..."; |
|
| 3418 | + if ($globalDebug) { |
|
| 3419 | + echo "Liveries from FlightAirMap website : Download..."; |
|
| 3420 | + } |
|
| 2782 | 3421 | update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum'); |
| 2783 | 3422 | if (file_exists($tmp_dir.'liveries.md5sum')) { |
| 2784 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3423 | + if ($globalDebug) { |
|
| 3424 | + echo "Check files...\n"; |
|
| 3425 | + } |
|
| 2785 | 3426 | $newmodelsdb = array(); |
| 2786 | 3427 | if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) { |
| 2787 | 3428 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2800,25 +3441,35 @@ discard block |
||
| 2800 | 3441 | } |
| 2801 | 3442 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2802 | 3443 | foreach ($diff as $key => $value) { |
| 2803 | - if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n"; |
|
| 3444 | + if ($globalDebug) { |
|
| 3445 | + echo 'Downloading liveries '.$key.' ...'."\n"; |
|
| 3446 | + } |
|
| 2804 | 3447 | update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key); |
| 2805 | 3448 | |
| 2806 | 3449 | } |
| 2807 | 3450 | update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum'); |
| 2808 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3451 | + } else { |
|
| 3452 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3453 | + } |
|
| 2809 | 3454 | if ($error != '') { |
| 2810 | 3455 | return $error; |
| 2811 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3456 | + } elseif ($globalDebug) { |
|
| 3457 | + echo "Done\n"; |
|
| 3458 | + } |
|
| 2812 | 3459 | return ''; |
| 2813 | 3460 | } |
| 2814 | 3461 | |
| 2815 | 3462 | public static function update_space_models() { |
| 2816 | 3463 | global $tmp_dir, $globalDebug; |
| 2817 | 3464 | $error = ''; |
| 2818 | - if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
|
| 3465 | + if ($globalDebug) { |
|
| 3466 | + echo "Space models from FlightAirMap website : Download..."; |
|
| 3467 | + } |
|
| 2819 | 3468 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
| 2820 | 3469 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2821 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3470 | + if ($globalDebug) { |
|
| 3471 | + echo "Check files...\n"; |
|
| 3472 | + } |
|
| 2822 | 3473 | $newmodelsdb = array(); |
| 2823 | 3474 | if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
| 2824 | 3475 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2837,25 +3488,35 @@ discard block |
||
| 2837 | 3488 | } |
| 2838 | 3489 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2839 | 3490 | foreach ($diff as $key => $value) { |
| 2840 | - if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
|
| 3491 | + if ($globalDebug) { |
|
| 3492 | + echo 'Downloading space model '.$key.' ...'."\n"; |
|
| 3493 | + } |
|
| 2841 | 3494 | update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
| 2842 | 3495 | |
| 2843 | 3496 | } |
| 2844 | 3497 | update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
| 2845 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3498 | + } else { |
|
| 3499 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3500 | + } |
|
| 2846 | 3501 | if ($error != '') { |
| 2847 | 3502 | return $error; |
| 2848 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3503 | + } elseif ($globalDebug) { |
|
| 3504 | + echo "Done\n"; |
|
| 3505 | + } |
|
| 2849 | 3506 | return ''; |
| 2850 | 3507 | } |
| 2851 | 3508 | |
| 2852 | 3509 | public static function update_vehicules_models() { |
| 2853 | 3510 | global $tmp_dir, $globalDebug; |
| 2854 | 3511 | $error = ''; |
| 2855 | - if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
|
| 3512 | + if ($globalDebug) { |
|
| 3513 | + echo "Vehicules models from FlightAirMap website : Download..."; |
|
| 3514 | + } |
|
| 2856 | 3515 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
| 2857 | 3516 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2858 | - if ($globalDebug) echo "Check files...\n"; |
|
| 3517 | + if ($globalDebug) { |
|
| 3518 | + echo "Check files...\n"; |
|
| 3519 | + } |
|
| 2859 | 3520 | $newmodelsdb = array(); |
| 2860 | 3521 | if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
| 2861 | 3522 | while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
@@ -2874,15 +3535,21 @@ discard block |
||
| 2874 | 3535 | } |
| 2875 | 3536 | $diff = array_diff($newmodelsdb,$modelsdb); |
| 2876 | 3537 | foreach ($diff as $key => $value) { |
| 2877 | - if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
| 3538 | + if ($globalDebug) { |
|
| 3539 | + echo 'Downloading vehicules model '.$key.' ...'."\n"; |
|
| 3540 | + } |
|
| 2878 | 3541 | update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
| 2879 | 3542 | |
| 2880 | 3543 | } |
| 2881 | 3544 | update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
| 2882 | - } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3545 | + } else { |
|
| 3546 | + $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
|
| 3547 | + } |
|
| 2883 | 3548 | if ($error != '') { |
| 2884 | 3549 | return $error; |
| 2885 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3550 | + } elseif ($globalDebug) { |
|
| 3551 | + echo "Done\n"; |
|
| 3552 | + } |
|
| 2886 | 3553 | return ''; |
| 2887 | 3554 | } |
| 2888 | 3555 | |
@@ -2925,7 +3592,9 @@ discard block |
||
| 2925 | 3592 | } |
| 2926 | 3593 | |
| 2927 | 3594 | $error = ''; |
| 2928 | - if ($globalDebug) echo "Notam : Download..."; |
|
| 3595 | + if ($globalDebug) { |
|
| 3596 | + echo "Notam : Download..."; |
|
| 3597 | + } |
|
| 2929 | 3598 | update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
| 2930 | 3599 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2931 | 3600 | $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
@@ -2940,14 +3609,30 @@ discard block |
||
| 2940 | 3609 | $data['fir'] = $q[0]; |
| 2941 | 3610 | $data['code'] = $q[1]; |
| 2942 | 3611 | $ifrvfr = $q[2]; |
| 2943 | - if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR'; |
|
| 2944 | - if ($ifrvfr == 'I') $data['rules'] = 'IFR'; |
|
| 2945 | - if ($ifrvfr == 'V') $data['rules'] = 'VFR'; |
|
| 2946 | - if ($q[4] == 'A') $data['scope'] = 'Airport warning'; |
|
| 2947 | - if ($q[4] == 'E') $data['scope'] = 'Enroute warning'; |
|
| 2948 | - if ($q[4] == 'W') $data['scope'] = 'Navigation warning'; |
|
| 2949 | - if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning'; |
|
| 2950 | - if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning'; |
|
| 3612 | + if ($ifrvfr == 'IV') { |
|
| 3613 | + $data['rules'] = 'IFR/VFR'; |
|
| 3614 | + } |
|
| 3615 | + if ($ifrvfr == 'I') { |
|
| 3616 | + $data['rules'] = 'IFR'; |
|
| 3617 | + } |
|
| 3618 | + if ($ifrvfr == 'V') { |
|
| 3619 | + $data['rules'] = 'VFR'; |
|
| 3620 | + } |
|
| 3621 | + if ($q[4] == 'A') { |
|
| 3622 | + $data['scope'] = 'Airport warning'; |
|
| 3623 | + } |
|
| 3624 | + if ($q[4] == 'E') { |
|
| 3625 | + $data['scope'] = 'Enroute warning'; |
|
| 3626 | + } |
|
| 3627 | + if ($q[4] == 'W') { |
|
| 3628 | + $data['scope'] = 'Navigation warning'; |
|
| 3629 | + } |
|
| 3630 | + if ($q[4] == 'AE') { |
|
| 3631 | + $data['scope'] = 'Airport/Enroute warning'; |
|
| 3632 | + } |
|
| 3633 | + if ($q[4] == 'AW') { |
|
| 3634 | + $data['scope'] = 'Airport/Navigation warning'; |
|
| 3635 | + } |
|
| 2951 | 3636 | //$data['scope'] = $q[4]; |
| 2952 | 3637 | $data['lower_limit'] = $q[5]; |
| 2953 | 3638 | $data['upper_limit'] = $q[6]; |
@@ -2955,8 +3640,12 @@ discard block |
||
| 2955 | 3640 | sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
| 2956 | 3641 | $latitude = $Common->convertDec($las,'latitude'); |
| 2957 | 3642 | $longitude = $Common->convertDec($lns,'longitude'); |
| 2958 | - if ($lac == 'S') $latitude = '-'.$latitude; |
|
| 2959 | - if ($lnc == 'W') $longitude = '-'.$longitude; |
|
| 3643 | + if ($lac == 'S') { |
|
| 3644 | + $latitude = '-'.$latitude; |
|
| 3645 | + } |
|
| 3646 | + if ($lnc == 'W') { |
|
| 3647 | + $longitude = '-'.$longitude; |
|
| 3648 | + } |
|
| 2960 | 3649 | $data['center_latitude'] = $latitude; |
| 2961 | 3650 | $data['center_longitude'] = $longitude; |
| 2962 | 3651 | $data['radius'] = intval($radius); |
@@ -2986,10 +3675,14 @@ discard block |
||
| 2986 | 3675 | $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']); |
| 2987 | 3676 | unset($data); |
| 2988 | 3677 | } |
| 2989 | - } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
| 3678 | + } else { |
|
| 3679 | + $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
|
| 3680 | + } |
|
| 2990 | 3681 | if ($error != '') { |
| 2991 | 3682 | return $error; |
| 2992 | - } elseif ($globalDebug) echo "Done\n"; |
|
| 3683 | + } elseif ($globalDebug) { |
|
| 3684 | + echo "Done\n"; |
|
| 3685 | + } |
|
| 2993 | 3686 | return ''; |
| 2994 | 3687 | } |
| 2995 | 3688 | |
@@ -3014,7 +3707,9 @@ discard block |
||
| 3014 | 3707 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 3015 | 3708 | $airspace_json = json_decode($airspace_lst,true); |
| 3016 | 3709 | foreach ($airspace_json['records'] as $airspace) { |
| 3017 | - if ($globalDebug) echo $airspace['name']."...\n"; |
|
| 3710 | + if ($globalDebug) { |
|
| 3711 | + echo $airspace['name']."...\n"; |
|
| 3712 | + } |
|
| 3018 | 3713 | update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
| 3019 | 3714 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 3020 | 3715 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
@@ -3058,8 +3753,11 @@ discard block |
||
| 3058 | 3753 | return "error : ".$e->getMessage(); |
| 3059 | 3754 | } |
| 3060 | 3755 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3061 | - if ($row['nb'] > 0) return false; |
|
| 3062 | - else return true; |
|
| 3756 | + if ($row['nb'] > 0) { |
|
| 3757 | + return false; |
|
| 3758 | + } else { |
|
| 3759 | + return true; |
|
| 3760 | + } |
|
| 3063 | 3761 | } |
| 3064 | 3762 | |
| 3065 | 3763 | public static function insert_last_update() { |
@@ -3084,8 +3782,11 @@ discard block |
||
| 3084 | 3782 | return "error : ".$e->getMessage(); |
| 3085 | 3783 | } |
| 3086 | 3784 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3087 | - if ($row['nb'] > 0) return true; |
|
| 3088 | - else return false; |
|
| 3785 | + if ($row['nb'] > 0) { |
|
| 3786 | + return true; |
|
| 3787 | + } else { |
|
| 3788 | + return false; |
|
| 3789 | + } |
|
| 3089 | 3790 | } |
| 3090 | 3791 | |
| 3091 | 3792 | public static function check_geoid_version($version) { |
@@ -3098,8 +3799,11 @@ discard block |
||
| 3098 | 3799 | return "error : ".$e->getMessage(); |
| 3099 | 3800 | } |
| 3100 | 3801 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3101 | - if ($row['nb'] > 0) return true; |
|
| 3102 | - else return false; |
|
| 3802 | + if ($row['nb'] > 0) { |
|
| 3803 | + return true; |
|
| 3804 | + } else { |
|
| 3805 | + return false; |
|
| 3806 | + } |
|
| 3103 | 3807 | } |
| 3104 | 3808 | |
| 3105 | 3809 | public static function check_marine_identity_version($version) { |
@@ -3112,8 +3816,11 @@ discard block |
||
| 3112 | 3816 | return "error : ".$e->getMessage(); |
| 3113 | 3817 | } |
| 3114 | 3818 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3115 | - if ($row['nb'] > 0) return true; |
|
| 3116 | - else return false; |
|
| 3819 | + if ($row['nb'] > 0) { |
|
| 3820 | + return true; |
|
| 3821 | + } else { |
|
| 3822 | + return false; |
|
| 3823 | + } |
|
| 3117 | 3824 | } |
| 3118 | 3825 | |
| 3119 | 3826 | public static function check_satellite_version($version) { |
@@ -3126,8 +3833,11 @@ discard block |
||
| 3126 | 3833 | return "error : ".$e->getMessage(); |
| 3127 | 3834 | } |
| 3128 | 3835 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3129 | - if ($row['nb'] > 0) return true; |
|
| 3130 | - else return false; |
|
| 3836 | + if ($row['nb'] > 0) { |
|
| 3837 | + return true; |
|
| 3838 | + } else { |
|
| 3839 | + return false; |
|
| 3840 | + } |
|
| 3131 | 3841 | } |
| 3132 | 3842 | |
| 3133 | 3843 | public static function check_airlines_version($version) { |
@@ -3140,8 +3850,11 @@ discard block |
||
| 3140 | 3850 | return "error : ".$e->getMessage(); |
| 3141 | 3851 | } |
| 3142 | 3852 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3143 | - if ($row['nb'] > 0) return true; |
|
| 3144 | - else return false; |
|
| 3853 | + if ($row['nb'] > 0) { |
|
| 3854 | + return true; |
|
| 3855 | + } else { |
|
| 3856 | + return false; |
|
| 3857 | + } |
|
| 3145 | 3858 | } |
| 3146 | 3859 | |
| 3147 | 3860 | public static function check_notam_version($version) { |
@@ -3154,8 +3867,11 @@ discard block |
||
| 3154 | 3867 | return "error : ".$e->getMessage(); |
| 3155 | 3868 | } |
| 3156 | 3869 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3157 | - if ($row['nb'] > 0) return true; |
|
| 3158 | - else return false; |
|
| 3870 | + if ($row['nb'] > 0) { |
|
| 3871 | + return true; |
|
| 3872 | + } else { |
|
| 3873 | + return false; |
|
| 3874 | + } |
|
| 3159 | 3875 | } |
| 3160 | 3876 | |
| 3161 | 3877 | public static function insert_airlines_version($version) { |
@@ -3245,8 +3961,11 @@ discard block |
||
| 3245 | 3961 | return "error : ".$e->getMessage(); |
| 3246 | 3962 | } |
| 3247 | 3963 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3248 | - if ($row['nb'] > 0) return false; |
|
| 3249 | - else return true; |
|
| 3964 | + if ($row['nb'] > 0) { |
|
| 3965 | + return false; |
|
| 3966 | + } else { |
|
| 3967 | + return true; |
|
| 3968 | + } |
|
| 3250 | 3969 | } |
| 3251 | 3970 | |
| 3252 | 3971 | public static function insert_last_notam_update() { |
@@ -3276,8 +3995,11 @@ discard block |
||
| 3276 | 3995 | return "error : ".$e->getMessage(); |
| 3277 | 3996 | } |
| 3278 | 3997 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3279 | - if ($row['nb'] > 0) return false; |
|
| 3280 | - else return true; |
|
| 3998 | + if ($row['nb'] > 0) { |
|
| 3999 | + return false; |
|
| 4000 | + } else { |
|
| 4001 | + return true; |
|
| 4002 | + } |
|
| 3281 | 4003 | } |
| 3282 | 4004 | |
| 3283 | 4005 | public static function insert_last_airspace_update() { |
@@ -3307,8 +4029,11 @@ discard block |
||
| 3307 | 4029 | return "error : ".$e->getMessage(); |
| 3308 | 4030 | } |
| 3309 | 4031 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3310 | - if ($row['nb'] > 0) return false; |
|
| 3311 | - else return true; |
|
| 4032 | + if ($row['nb'] > 0) { |
|
| 4033 | + return false; |
|
| 4034 | + } else { |
|
| 4035 | + return true; |
|
| 4036 | + } |
|
| 3312 | 4037 | } |
| 3313 | 4038 | |
| 3314 | 4039 | public static function insert_last_geoid_update() { |
@@ -3338,8 +4063,11 @@ discard block |
||
| 3338 | 4063 | return "error : ".$e->getMessage(); |
| 3339 | 4064 | } |
| 3340 | 4065 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3341 | - if ($row['nb'] > 0) return false; |
|
| 3342 | - else return true; |
|
| 4066 | + if ($row['nb'] > 0) { |
|
| 4067 | + return false; |
|
| 4068 | + } else { |
|
| 4069 | + return true; |
|
| 4070 | + } |
|
| 3343 | 4071 | } |
| 3344 | 4072 | |
| 3345 | 4073 | public static function insert_last_owner_update() { |
@@ -3369,8 +4097,11 @@ discard block |
||
| 3369 | 4097 | return "error : ".$e->getMessage(); |
| 3370 | 4098 | } |
| 3371 | 4099 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3372 | - if ($row['nb'] > 0) return false; |
|
| 3373 | - else return true; |
|
| 4100 | + if ($row['nb'] > 0) { |
|
| 4101 | + return false; |
|
| 4102 | + } else { |
|
| 4103 | + return true; |
|
| 4104 | + } |
|
| 3374 | 4105 | } |
| 3375 | 4106 | |
| 3376 | 4107 | public static function insert_last_fires_update() { |
@@ -3400,8 +4131,11 @@ discard block |
||
| 3400 | 4131 | return "error : ".$e->getMessage(); |
| 3401 | 4132 | } |
| 3402 | 4133 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3403 | - if ($row['nb'] > 0) return false; |
|
| 3404 | - else return true; |
|
| 4134 | + if ($row['nb'] > 0) { |
|
| 4135 | + return false; |
|
| 4136 | + } else { |
|
| 4137 | + return true; |
|
| 4138 | + } |
|
| 3405 | 4139 | } |
| 3406 | 4140 | |
| 3407 | 4141 | public static function insert_last_airlines_update() { |
@@ -3431,8 +4165,11 @@ discard block |
||
| 3431 | 4165 | return "error : ".$e->getMessage(); |
| 3432 | 4166 | } |
| 3433 | 4167 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3434 | - if ($row['nb'] > 0) return false; |
|
| 3435 | - else return true; |
|
| 4168 | + if ($row['nb'] > 0) { |
|
| 4169 | + return false; |
|
| 4170 | + } else { |
|
| 4171 | + return true; |
|
| 4172 | + } |
|
| 3436 | 4173 | } |
| 3437 | 4174 | |
| 3438 | 4175 | public static function insert_last_schedules_update() { |
@@ -3462,8 +4199,11 @@ discard block |
||
| 3462 | 4199 | return "error : ".$e->getMessage(); |
| 3463 | 4200 | } |
| 3464 | 4201 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3465 | - if ($row['nb'] > 0) return false; |
|
| 3466 | - else return true; |
|
| 4202 | + if ($row['nb'] > 0) { |
|
| 4203 | + return false; |
|
| 4204 | + } else { |
|
| 4205 | + return true; |
|
| 4206 | + } |
|
| 3467 | 4207 | } |
| 3468 | 4208 | |
| 3469 | 4209 | public static function insert_last_tle_update() { |
@@ -3493,8 +4233,11 @@ discard block |
||
| 3493 | 4233 | return "error : ".$e->getMessage(); |
| 3494 | 4234 | } |
| 3495 | 4235 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3496 | - if ($row['nb'] > 0) return false; |
|
| 3497 | - else return true; |
|
| 4236 | + if ($row['nb'] > 0) { |
|
| 4237 | + return false; |
|
| 4238 | + } else { |
|
| 4239 | + return true; |
|
| 4240 | + } |
|
| 3498 | 4241 | } |
| 3499 | 4242 | |
| 3500 | 4243 | public static function insert_last_ucsdb_update() { |
@@ -3524,8 +4267,11 @@ discard block |
||
| 3524 | 4267 | return "error : ".$e->getMessage(); |
| 3525 | 4268 | } |
| 3526 | 4269 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3527 | - if ($row['nb'] > 0) return false; |
|
| 3528 | - else return true; |
|
| 4270 | + if ($row['nb'] > 0) { |
|
| 4271 | + return false; |
|
| 4272 | + } else { |
|
| 4273 | + return true; |
|
| 4274 | + } |
|
| 3529 | 4275 | } |
| 3530 | 4276 | |
| 3531 | 4277 | public static function insert_last_celestrak_update() { |
@@ -3555,8 +4301,11 @@ discard block |
||
| 3555 | 4301 | return "error : ".$e->getMessage(); |
| 3556 | 4302 | } |
| 3557 | 4303 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3558 | - if ($row['nb'] > 0) return false; |
|
| 3559 | - else return true; |
|
| 4304 | + if ($row['nb'] > 0) { |
|
| 4305 | + return false; |
|
| 4306 | + } else { |
|
| 4307 | + return true; |
|
| 4308 | + } |
|
| 3560 | 4309 | } |
| 3561 | 4310 | |
| 3562 | 4311 | public static function check_last_satellite_update() { |
@@ -3574,8 +4323,11 @@ discard block |
||
| 3574 | 4323 | return "error : ".$e->getMessage(); |
| 3575 | 4324 | } |
| 3576 | 4325 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 3577 | - if ($row['nb'] > 0) return false; |
|
| 3578 | - else return true; |
|
| 4326 | + if ($row['nb'] > 0) { |
|
| 4327 | + return false; |
|
| 4328 | + } else { |
|
| 4329 | + return true; |
|
| 4330 | + } |
|
| 3579 | 4331 | } |
| 3580 | 4332 | |
| 3581 | 4333 | public static function insert_last_marine_identity_update() { |
@@ -21,9 +21,9 @@ discard block |
||
| 21 | 21 | foreach($spotter_array as $spotter_item) |
| 22 | 22 | { |
| 23 | 23 | $output .= '<url>'; |
| 24 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
|
| 25 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 26 | - $output .= '<changefreq>weekly</changefreq>'; |
|
| 24 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
|
| 25 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 26 | + $output .= '<changefreq>weekly</changefreq>'; |
|
| 27 | 27 | $output .= '</url>'; |
| 28 | 28 | } |
| 29 | 29 | $output .= '</urlset>'; |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | foreach($aircraft_types as $aircraft_item) |
| 39 | 39 | { |
| 40 | 40 | $output .= '<url>'; |
| 41 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
|
| 42 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 43 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 41 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
|
| 42 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 43 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 44 | 44 | $output .= '</url>'; |
| 45 | 45 | } |
| 46 | 46 | $output .= '</urlset>'; |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | foreach($aircraft_registrations as $aircraft_item) |
| 56 | 56 | { |
| 57 | 57 | $output .= '<url>'; |
| 58 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
|
| 59 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 60 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 58 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
|
| 59 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 60 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 61 | 61 | $output .= '</url>'; |
| 62 | 62 | } |
| 63 | 63 | $output .= '</urlset>'; |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | foreach($airline_names as $airline_item) |
| 72 | 72 | { |
| 73 | 73 | $output .= '<url>'; |
| 74 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
|
| 75 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 76 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 74 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
|
| 75 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 76 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 77 | 77 | $output .= '</url>'; |
| 78 | 78 | } |
| 79 | 79 | $output .= '</urlset>'; |
@@ -88,9 +88,9 @@ discard block |
||
| 88 | 88 | foreach($airport_names as $airport_item) |
| 89 | 89 | { |
| 90 | 90 | $output .= '<url>'; |
| 91 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
|
| 92 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 93 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 91 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
|
| 92 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 93 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 94 | 94 | $output .= '</url>'; |
| 95 | 95 | } |
| 96 | 96 | $output .= '</urlset>'; |
@@ -34,7 +34,9 @@ discard block |
||
| 34 | 34 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 35 | 35 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 36 | 36 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 37 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 37 | + if (empty($aircraft_types)) { |
|
| 38 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 39 | + } |
|
| 38 | 40 | foreach($aircraft_types as $aircraft_item) |
| 39 | 41 | { |
| 40 | 42 | $output .= '<url>'; |
@@ -84,7 +86,9 @@ discard block |
||
| 84 | 86 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 85 | 87 | |
| 86 | 88 | $airport_names = $Stats->getAllAirportNames(); |
| 87 | - if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
|
| 89 | + if (empty($airport_names)) { |
|
| 90 | + $airport_names = $Spotter->getAllAirportNames(); |
|
| 91 | + } |
|
| 88 | 92 | foreach($airport_names as $airport_item) |
| 89 | 93 | { |
| 90 | 94 | $output .= '<url>'; |
@@ -99,7 +103,9 @@ discard block |
||
| 99 | 103 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 100 | 104 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 101 | 105 | $manufacturer_names = $Stats->getAllManufacturers(); |
| 102 | - if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers(); |
|
| 106 | + if (empty($manufacturer_names)) { |
|
| 107 | + $manufacturer_names = $Spotter->getAllManufacturers(); |
|
| 108 | + } |
|
| 103 | 109 | foreach($manufacturer_names as $manufacturer_item) |
| 104 | 110 | { |
| 105 | 111 | $output .= '<url>'; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 19 | 19 | |
| 20 | 20 | $spotter_array = $Spotter->getAllFlightsforSitemap(); |
| 21 | - foreach($spotter_array as $spotter_item) |
|
| 21 | + foreach ($spotter_array as $spotter_item) |
|
| 22 | 22 | { |
| 23 | 23 | $output .= '<url>'; |
| 24 | 24 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | $output .= '</urlset>'; |
| 30 | 30 | |
| 31 | 31 | |
| 32 | -} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){ |
|
| 32 | +} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") { |
|
| 33 | 33 | |
| 34 | 34 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 35 | 35 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 36 | 36 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 37 | 37 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 38 | - foreach($aircraft_types as $aircraft_item) |
|
| 38 | + foreach ($aircraft_types as $aircraft_item) |
|
| 39 | 39 | { |
| 40 | 40 | $output .= '<url>'; |
| 41 | 41 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
@@ -46,13 +46,13 @@ discard block |
||
| 46 | 46 | $output .= '</urlset>'; |
| 47 | 47 | |
| 48 | 48 | |
| 49 | -} else if (isset($_GET['type']) && $_GET['type'] == "registration"){ |
|
| 49 | +} else if (isset($_GET['type']) && $_GET['type'] == "registration") { |
|
| 50 | 50 | |
| 51 | 51 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 52 | 52 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 53 | 53 | |
| 54 | 54 | $aircraft_registrations = $Spotter->getAllAircraftRegistrations(); |
| 55 | - foreach($aircraft_registrations as $aircraft_item) |
|
| 55 | + foreach ($aircraft_registrations as $aircraft_item) |
|
| 56 | 56 | { |
| 57 | 57 | $output .= '<url>'; |
| 58 | 58 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
@@ -62,13 +62,13 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | $output .= '</urlset>'; |
| 64 | 64 | |
| 65 | -} else if (isset($_GET['type']) && $_GET['type'] == "airline"){ |
|
| 65 | +} else if (isset($_GET['type']) && $_GET['type'] == "airline") { |
|
| 66 | 66 | |
| 67 | 67 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 68 | 68 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 69 | 69 | |
| 70 | 70 | $airline_names = $Stats->getAllAirlineNames(); |
| 71 | - foreach($airline_names as $airline_item) |
|
| 71 | + foreach ($airline_names as $airline_item) |
|
| 72 | 72 | { |
| 73 | 73 | $output .= '<url>'; |
| 74 | 74 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
@@ -78,14 +78,14 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | $output .= '</urlset>'; |
| 80 | 80 | |
| 81 | -} else if (isset($_GET['type']) && $_GET['type'] == "airport"){ |
|
| 81 | +} else if (isset($_GET['type']) && $_GET['type'] == "airport") { |
|
| 82 | 82 | |
| 83 | 83 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 84 | 84 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 85 | 85 | |
| 86 | 86 | $airport_names = $Stats->getAllAirportNames(); |
| 87 | 87 | if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
| 88 | - foreach($airport_names as $airport_item) |
|
| 88 | + foreach ($airport_names as $airport_item) |
|
| 89 | 89 | { |
| 90 | 90 | $output .= '<url>'; |
| 91 | 91 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
@@ -95,12 +95,12 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | $output .= '</urlset>'; |
| 97 | 97 | |
| 98 | -} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){ |
|
| 98 | +} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") { |
|
| 99 | 99 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 100 | 100 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 101 | 101 | $manufacturer_names = $Stats->getAllManufacturers(); |
| 102 | 102 | if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers(); |
| 103 | - foreach($manufacturer_names as $manufacturer_item) |
|
| 103 | + foreach ($manufacturer_names as $manufacturer_item) |
|
| 104 | 104 | { |
| 105 | 105 | $output .= '<url>'; |
| 106 | 106 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>'; |
@@ -109,11 +109,11 @@ discard block |
||
| 109 | 109 | $output .= '</url>'; |
| 110 | 110 | } |
| 111 | 111 | $output .= '</urlset>'; |
| 112 | -} else if (isset($_GET['type']) && $_GET['type'] == "country"){ |
|
| 112 | +} else if (isset($_GET['type']) && $_GET['type'] == "country") { |
|
| 113 | 113 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 114 | 114 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 115 | 115 | $country_names = $Spotter->getAllCountries(); |
| 116 | - foreach($country_names as $country_item) |
|
| 116 | + foreach ($country_names as $country_item) |
|
| 117 | 117 | { |
| 118 | 118 | $output .= '<url>'; |
| 119 | 119 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>'; |
@@ -122,11 +122,11 @@ discard block |
||
| 122 | 122 | $output .= '</url>'; |
| 123 | 123 | } |
| 124 | 124 | $output .= '</urlset>'; |
| 125 | -} else if (isset($_GET['type']) && $_GET['type'] == "ident"){ |
|
| 125 | +} else if (isset($_GET['type']) && $_GET['type'] == "ident") { |
|
| 126 | 126 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 127 | 127 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 128 | 128 | $ident_names = $Spotter->getAllIdents(); |
| 129 | - foreach($ident_names as $ident_item) |
|
| 129 | + foreach ($ident_names as $ident_item) |
|
| 130 | 130 | { |
| 131 | 131 | if (ctype_alnum($ident_item['ident'])) { |
| 132 | 132 | $output .= '<url>'; |
@@ -137,11 +137,11 @@ discard block |
||
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | $output .= '</urlset>'; |
| 140 | -} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident"){ |
|
| 140 | +} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident") { |
|
| 141 | 141 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 142 | 142 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 143 | 143 | $ident_names = $Marine->getAllIdents(); |
| 144 | - foreach($ident_names as $ident_item) |
|
| 144 | + foreach ($ident_names as $ident_item) |
|
| 145 | 145 | { |
| 146 | 146 | if (ctype_alnum($ident_item['ident'])) { |
| 147 | 147 | $output .= '<url>'; |
@@ -152,11 +152,11 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | $output .= '</urlset>'; |
| 155 | -} else if (isset($_GET['type']) && $_GET['type'] == "date"){ |
|
| 155 | +} else if (isset($_GET['type']) && $_GET['type'] == "date") { |
|
| 156 | 156 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 157 | 157 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 158 | 158 | $date_names = $Spotter->getAllDates(); |
| 159 | - foreach($date_names as $date_item) |
|
| 159 | + foreach ($date_names as $date_item) |
|
| 160 | 160 | { |
| 161 | 161 | $output .= '<url>'; |
| 162 | 162 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
@@ -165,11 +165,11 @@ discard block |
||
| 165 | 165 | $output .= '</url>'; |
| 166 | 166 | } |
| 167 | 167 | $output .= '</urlset>'; |
| 168 | -} else if (isset($_GET['type']) && $_GET['type'] == "marine-date"){ |
|
| 168 | +} else if (isset($_GET['type']) && $_GET['type'] == "marine-date") { |
|
| 169 | 169 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 170 | 170 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 171 | 171 | $date_names = $Marine->getAllDates(); |
| 172 | - foreach($date_names as $date_item) |
|
| 172 | + foreach ($date_names as $date_item) |
|
| 173 | 173 | { |
| 174 | 174 | $output .= '<url>'; |
| 175 | 175 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/marine/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
@@ -178,11 +178,11 @@ discard block |
||
| 178 | 178 | $output .= '</url>'; |
| 179 | 179 | } |
| 180 | 180 | $output .= '</urlset>'; |
| 181 | -} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date"){ |
|
| 181 | +} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date") { |
|
| 182 | 182 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 183 | 183 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 184 | 184 | $date_names = $Tracker->getAllDates(); |
| 185 | - foreach($date_names as $date_item) |
|
| 185 | + foreach ($date_names as $date_item) |
|
| 186 | 186 | { |
| 187 | 187 | $output .= '<url>'; |
| 188 | 188 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/tracker/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
@@ -191,11 +191,11 @@ discard block |
||
| 191 | 191 | $output .= '</url>'; |
| 192 | 192 | } |
| 193 | 193 | $output .= '</urlset>'; |
| 194 | -} else if (isset($_GET['type']) && $_GET['type'] == "route"){ |
|
| 194 | +} else if (isset($_GET['type']) && $_GET['type'] == "route") { |
|
| 195 | 195 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 196 | 196 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 197 | 197 | $route_names = $Spotter->getAllRoutes(); |
| 198 | - foreach($route_names as $route_item) |
|
| 198 | + foreach ($route_names as $route_item) |
|
| 199 | 199 | { |
| 200 | 200 | $output .= '<url>'; |
| 201 | 201 | $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | $output .= '</url>'; |
| 205 | 205 | } |
| 206 | 206 | $output .= '</urlset>'; |
| 207 | -} else if (isset($_GET['type']) && $_GET['type'] == "static"){ |
|
| 207 | +} else if (isset($_GET['type']) && $_GET['type'] == "static") { |
|
| 208 | 208 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 209 | 209 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 210 | 210 | /* STATIC PAGES */ |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | $output .= '<changefreq>daily</changefreq>'; |
| 323 | 323 | $output .= '</url>'; |
| 324 | 324 | $output .= '</urlset>'; |
| 325 | -} else if (isset($_GET['type']) && $_GET['type'] == "marine-static"){ |
|
| 325 | +} else if (isset($_GET['type']) && $_GET['type'] == "marine-static") { |
|
| 326 | 326 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 327 | 327 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 328 | 328 | /* STATIC PAGES */ |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | $output .= '<changefreq>daily</changefreq>'; |
| 349 | 349 | $output .= '</url>'; |
| 350 | 350 | $output .= '</urlset>'; |
| 351 | -} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static"){ |
|
| 351 | +} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static") { |
|
| 352 | 352 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 353 | 353 | $output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">'; |
| 354 | 354 | /* STATIC PAGES */ |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | /** |
| 17 | 17 | * Get SQL query part for filter used |
| 18 | 18 | * @param Array $filter the filter |
| 19 | - * @return Array the SQL part |
|
| 19 | + * @return string the SQL part |
|
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | public function getFilter($filter = array(),$where = false,$and = false) { |
@@ -487,9 +487,6 @@ discard block |
||
| 487 | 487 | /** |
| 488 | 488 | * Update ident tracker data |
| 489 | 489 | * |
| 490 | - * @param String $flightaware_id the ID from flightaware |
|
| 491 | - * @param String $ident the flight ident |
|
| 492 | - * @return String success or false |
|
| 493 | 490 | * |
| 494 | 491 | */ |
| 495 | 492 | public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
@@ -511,10 +508,6 @@ discard block |
||
| 511 | 508 | /** |
| 512 | 509 | * Update latest tracker data |
| 513 | 510 | * |
| 514 | - * @param String $flightaware_id the ID from flightaware |
|
| 515 | - * @param String $ident the flight ident |
|
| 516 | - * @param String $arrival_airport_icao the arrival airport |
|
| 517 | - * @return String success or false |
|
| 518 | 511 | * |
| 519 | 512 | */ |
| 520 | 513 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
@@ -536,29 +529,6 @@ discard block |
||
| 536 | 529 | /** |
| 537 | 530 | * Adds a new tracker data |
| 538 | 531 | * |
| 539 | - * @param String $flightaware_id the ID from flightaware |
|
| 540 | - * @param String $ident the flight ident |
|
| 541 | - * @param String $aircraft_icao the aircraft type |
|
| 542 | - * @param String $departure_airport_icao the departure airport |
|
| 543 | - * @param String $arrival_airport_icao the arrival airport |
|
| 544 | - * @param String $latitude latitude of flight |
|
| 545 | - * @param String $longitude latitude of flight |
|
| 546 | - * @param String $waypoints waypoints of flight |
|
| 547 | - * @param String $altitude altitude of flight |
|
| 548 | - * @param String $heading heading of flight |
|
| 549 | - * @param String $groundspeed speed of flight |
|
| 550 | - * @param String $date date of flight |
|
| 551 | - * @param String $departure_airport_time departure time of flight |
|
| 552 | - * @param String $arrival_airport_time arrival time of flight |
|
| 553 | - * @param String $squawk squawk code of flight |
|
| 554 | - * @param String $route_stop route stop of flight |
|
| 555 | - * @param String $highlight highlight or not |
|
| 556 | - * @param String $ModeS ModesS code of flight |
|
| 557 | - * @param String $registration registration code of flight |
|
| 558 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
| 559 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
| 560 | - * @param String $verticalrate vertival rate of flight |
|
| 561 | - * @return String success or false |
|
| 562 | 532 | */ |
| 563 | 533 | public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
| 564 | 534 | { |
@@ -1132,6 +1102,7 @@ discard block |
||
| 1132 | 1102 | /** |
| 1133 | 1103 | * Counts all hours |
| 1134 | 1104 | * |
| 1105 | + * @param string $orderby |
|
| 1135 | 1106 | * @return Array the hour list |
| 1136 | 1107 | * |
| 1137 | 1108 | */ |
@@ -1483,7 +1454,7 @@ discard block |
||
| 1483 | 1454 | /** |
| 1484 | 1455 | * Parses the direction degrees to working |
| 1485 | 1456 | * |
| 1486 | - * @param Float $direction the direction in degrees |
|
| 1457 | + * @param integer $direction the direction in degrees |
|
| 1487 | 1458 | * @return Array the direction information |
| 1488 | 1459 | * |
| 1489 | 1460 | */ |
@@ -14,10 +14,10 @@ discard block |
||
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | - * Get SQL query part for filter used |
|
| 18 | - * @param Array $filter the filter |
|
| 19 | - * @return Array the SQL part |
|
| 20 | - */ |
|
| 17 | + * Get SQL query part for filter used |
|
| 18 | + * @param Array $filter the filter |
|
| 19 | + * @return Array the SQL part |
|
| 20 | + */ |
|
| 21 | 21 | |
| 22 | 22 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 23 | 23 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -81,14 +81,14 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
| 84 | - * Executes the SQL statements to get the tracker information |
|
| 85 | - * |
|
| 86 | - * @param String $query the SQL query |
|
| 87 | - * @param Array $params parameter of the query |
|
| 88 | - * @param String $limitQuery the limit query |
|
| 89 | - * @return Array the tracker information |
|
| 90 | - * |
|
| 91 | - */ |
|
| 84 | + * Executes the SQL statements to get the tracker information |
|
| 85 | + * |
|
| 86 | + * @param String $query the SQL query |
|
| 87 | + * @param Array $params parameter of the query |
|
| 88 | + * @param String $limitQuery the limit query |
|
| 89 | + * @return Array the tracker information |
|
| 90 | + * |
|
| 91 | + */ |
|
| 92 | 92 | public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
| 93 | 93 | { |
| 94 | 94 | date_default_timezone_set('UTC'); |
@@ -201,11 +201,11 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | |
| 203 | 203 | /** |
| 204 | - * Gets all the tracker information based on the latest data entry |
|
| 205 | - * |
|
| 206 | - * @return Array the tracker information |
|
| 207 | - * |
|
| 208 | - */ |
|
| 204 | + * Gets all the tracker information based on the latest data entry |
|
| 205 | + * |
|
| 206 | + * @return Array the tracker information |
|
| 207 | + * |
|
| 208 | + */ |
|
| 209 | 209 | public function getLatestTrackerData($limit = '', $sort = '', $filter = array()) |
| 210 | 210 | { |
| 211 | 211 | global $global_query; |
@@ -263,11 +263,11 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | - * Gets all the tracker information based on the callsign |
|
| 267 | - * |
|
| 268 | - * @return Array the tracker information |
|
| 269 | - * |
|
| 270 | - */ |
|
| 266 | + * Gets all the tracker information based on the callsign |
|
| 267 | + * |
|
| 268 | + * @return Array the tracker information |
|
| 269 | + * |
|
| 270 | + */ |
|
| 271 | 271 | public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '', $filter = array()) |
| 272 | 272 | { |
| 273 | 273 | global $global_query; |
@@ -378,12 +378,12 @@ discard block |
||
| 378 | 378 | |
| 379 | 379 | |
| 380 | 380 | /** |
| 381 | - * Gets all source name |
|
| 382 | - * |
|
| 383 | - * @param String type format of source |
|
| 384 | - * @return Array list of source name |
|
| 385 | - * |
|
| 386 | - */ |
|
| 381 | + * Gets all source name |
|
| 382 | + * |
|
| 383 | + * @param String type format of source |
|
| 384 | + * @return Array list of source name |
|
| 385 | + * |
|
| 386 | + */ |
|
| 387 | 387 | public function getAllSourceName($type = '',$filters = array()) |
| 388 | 388 | { |
| 389 | 389 | $filter_query = $this->getFilter($filters,true,true); |
@@ -413,11 +413,11 @@ discard block |
||
| 413 | 413 | |
| 414 | 414 | |
| 415 | 415 | /** |
| 416 | - * Gets a list of all idents/callsigns |
|
| 417 | - * |
|
| 418 | - * @return Array list of ident/callsign names |
|
| 419 | - * |
|
| 420 | - */ |
|
| 416 | + * Gets a list of all idents/callsigns |
|
| 417 | + * |
|
| 418 | + * @return Array list of ident/callsign names |
|
| 419 | + * |
|
| 420 | + */ |
|
| 421 | 421 | public function getAllIdents($filters = array()) |
| 422 | 422 | { |
| 423 | 423 | $filter_query = $this->getFilter($filters,true,true); |
@@ -485,18 +485,18 @@ discard block |
||
| 485 | 485 | |
| 486 | 486 | |
| 487 | 487 | /** |
| 488 | - * Update ident tracker data |
|
| 489 | - * |
|
| 490 | - * @param String $flightaware_id the ID from flightaware |
|
| 491 | - * @param String $ident the flight ident |
|
| 492 | - * @return String success or false |
|
| 493 | - * |
|
| 494 | - */ |
|
| 488 | + * Update ident tracker data |
|
| 489 | + * |
|
| 490 | + * @param String $flightaware_id the ID from flightaware |
|
| 491 | + * @param String $ident the flight ident |
|
| 492 | + * @return String success or false |
|
| 493 | + * |
|
| 494 | + */ |
|
| 495 | 495 | public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
| 496 | 496 | { |
| 497 | 497 | |
| 498 | 498 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 499 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 499 | + $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 500 | 500 | |
| 501 | 501 | try { |
| 502 | 502 | $sth = $this->db->prepare($query); |
@@ -509,18 +509,18 @@ discard block |
||
| 509 | 509 | |
| 510 | 510 | } |
| 511 | 511 | /** |
| 512 | - * Update latest tracker data |
|
| 513 | - * |
|
| 514 | - * @param String $flightaware_id the ID from flightaware |
|
| 515 | - * @param String $ident the flight ident |
|
| 516 | - * @param String $arrival_airport_icao the arrival airport |
|
| 517 | - * @return String success or false |
|
| 518 | - * |
|
| 519 | - */ |
|
| 512 | + * Update latest tracker data |
|
| 513 | + * |
|
| 514 | + * @param String $flightaware_id the ID from flightaware |
|
| 515 | + * @param String $ident the flight ident |
|
| 516 | + * @param String $arrival_airport_icao the arrival airport |
|
| 517 | + * @return String success or false |
|
| 518 | + * |
|
| 519 | + */ |
|
| 520 | 520 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 521 | 521 | { |
| 522 | 522 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 523 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 523 | + $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 524 | 524 | |
| 525 | 525 | try { |
| 526 | 526 | $sth = $this->db->prepare($query); |
@@ -534,32 +534,32 @@ discard block |
||
| 534 | 534 | } |
| 535 | 535 | |
| 536 | 536 | /** |
| 537 | - * Adds a new tracker data |
|
| 538 | - * |
|
| 539 | - * @param String $flightaware_id the ID from flightaware |
|
| 540 | - * @param String $ident the flight ident |
|
| 541 | - * @param String $aircraft_icao the aircraft type |
|
| 542 | - * @param String $departure_airport_icao the departure airport |
|
| 543 | - * @param String $arrival_airport_icao the arrival airport |
|
| 544 | - * @param String $latitude latitude of flight |
|
| 545 | - * @param String $longitude latitude of flight |
|
| 546 | - * @param String $waypoints waypoints of flight |
|
| 547 | - * @param String $altitude altitude of flight |
|
| 548 | - * @param String $heading heading of flight |
|
| 549 | - * @param String $groundspeed speed of flight |
|
| 550 | - * @param String $date date of flight |
|
| 551 | - * @param String $departure_airport_time departure time of flight |
|
| 552 | - * @param String $arrival_airport_time arrival time of flight |
|
| 553 | - * @param String $squawk squawk code of flight |
|
| 554 | - * @param String $route_stop route stop of flight |
|
| 555 | - * @param String $highlight highlight or not |
|
| 556 | - * @param String $ModeS ModesS code of flight |
|
| 557 | - * @param String $registration registration code of flight |
|
| 558 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
| 559 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
| 560 | - * @param String $verticalrate vertival rate of flight |
|
| 561 | - * @return String success or false |
|
| 562 | - */ |
|
| 537 | + * Adds a new tracker data |
|
| 538 | + * |
|
| 539 | + * @param String $flightaware_id the ID from flightaware |
|
| 540 | + * @param String $ident the flight ident |
|
| 541 | + * @param String $aircraft_icao the aircraft type |
|
| 542 | + * @param String $departure_airport_icao the departure airport |
|
| 543 | + * @param String $arrival_airport_icao the arrival airport |
|
| 544 | + * @param String $latitude latitude of flight |
|
| 545 | + * @param String $longitude latitude of flight |
|
| 546 | + * @param String $waypoints waypoints of flight |
|
| 547 | + * @param String $altitude altitude of flight |
|
| 548 | + * @param String $heading heading of flight |
|
| 549 | + * @param String $groundspeed speed of flight |
|
| 550 | + * @param String $date date of flight |
|
| 551 | + * @param String $departure_airport_time departure time of flight |
|
| 552 | + * @param String $arrival_airport_time arrival time of flight |
|
| 553 | + * @param String $squawk squawk code of flight |
|
| 554 | + * @param String $route_stop route stop of flight |
|
| 555 | + * @param String $highlight highlight or not |
|
| 556 | + * @param String $ModeS ModesS code of flight |
|
| 557 | + * @param String $registration registration code of flight |
|
| 558 | + * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
| 559 | + * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
| 560 | + * @param String $verticalrate vertival rate of flight |
|
| 561 | + * @return String success or false |
|
| 562 | + */ |
|
| 563 | 563 | public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
| 564 | 564 | { |
| 565 | 565 | global $globalURL; |
@@ -644,16 +644,16 @@ discard block |
||
| 644 | 644 | $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
| 645 | 645 | $type = filter_var($type,FILTER_SANITIZE_STRING); |
| 646 | 646 | |
| 647 | - if ($latitude == '' && $longitude == '') { |
|
| 648 | - $latitude = 0; |
|
| 649 | - $longitude = 0; |
|
| 650 | - } |
|
| 651 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 652 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 653 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 647 | + if ($latitude == '' && $longitude == '') { |
|
| 648 | + $latitude = 0; |
|
| 649 | + $longitude = 0; |
|
| 650 | + } |
|
| 651 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 652 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 653 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 654 | 654 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 655 | 655 | |
| 656 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 656 | + $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 657 | 657 | |
| 658 | 658 | try { |
| 659 | 659 | |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | $sth->execute($query_values); |
| 662 | 662 | $this->db = null; |
| 663 | 663 | } catch (PDOException $e) { |
| 664 | - return "error : ".$e->getMessage(); |
|
| 664 | + return "error : ".$e->getMessage(); |
|
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | return "success"; |
@@ -670,11 +670,11 @@ discard block |
||
| 670 | 670 | |
| 671 | 671 | |
| 672 | 672 | /** |
| 673 | - * Gets the aircraft ident within the last hour |
|
| 674 | - * |
|
| 675 | - * @return String the ident |
|
| 676 | - * |
|
| 677 | - */ |
|
| 673 | + * Gets the aircraft ident within the last hour |
|
| 674 | + * |
|
| 675 | + * @return String the ident |
|
| 676 | + * |
|
| 677 | + */ |
|
| 678 | 678 | public function getIdentFromLastHour($ident) |
| 679 | 679 | { |
| 680 | 680 | global $globalDBdriver, $globalTimezone; |
@@ -690,11 +690,11 @@ discard block |
||
| 690 | 690 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 691 | 691 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
| 692 | 692 | $query_data = array(':ident' => $ident); |
| 693 | - } |
|
| 693 | + } |
|
| 694 | 694 | |
| 695 | 695 | $sth = $this->db->prepare($query); |
| 696 | 696 | $sth->execute($query_data); |
| 697 | - $ident_result=''; |
|
| 697 | + $ident_result=''; |
|
| 698 | 698 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 699 | 699 | { |
| 700 | 700 | $ident_result = $row['ident']; |
@@ -705,11 +705,11 @@ discard block |
||
| 705 | 705 | |
| 706 | 706 | |
| 707 | 707 | /** |
| 708 | - * Gets the aircraft data from the last 20 seconds |
|
| 709 | - * |
|
| 710 | - * @return Array the tracker data |
|
| 711 | - * |
|
| 712 | - */ |
|
| 708 | + * Gets the aircraft data from the last 20 seconds |
|
| 709 | + * |
|
| 710 | + * @return Array the tracker data |
|
| 711 | + * |
|
| 712 | + */ |
|
| 713 | 713 | public function getRealTimeData($q = '') |
| 714 | 714 | { |
| 715 | 715 | global $globalDBdriver; |
@@ -743,11 +743,11 @@ discard block |
||
| 743 | 743 | } |
| 744 | 744 | |
| 745 | 745 | /** |
| 746 | - * Gets all number of flight over countries |
|
| 747 | - * |
|
| 748 | - * @return Array the airline country list |
|
| 749 | - * |
|
| 750 | - */ |
|
| 746 | + * Gets all number of flight over countries |
|
| 747 | + * |
|
| 748 | + * @return Array the airline country list |
|
| 749 | + * |
|
| 750 | + */ |
|
| 751 | 751 | public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
| 752 | 752 | { |
| 753 | 753 | global $globalDBdriver, $globalArchive; |
@@ -817,11 +817,11 @@ discard block |
||
| 817 | 817 | } |
| 818 | 818 | |
| 819 | 819 | /** |
| 820 | - * Gets all callsigns that have flown over |
|
| 821 | - * |
|
| 822 | - * @return Array the callsign list |
|
| 823 | - * |
|
| 824 | - */ |
|
| 820 | + * Gets all callsigns that have flown over |
|
| 821 | + * |
|
| 822 | + * @return Array the callsign list |
|
| 823 | + * |
|
| 824 | + */ |
|
| 825 | 825 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
| 826 | 826 | { |
| 827 | 827 | global $globalDBdriver; |
@@ -888,11 +888,11 @@ discard block |
||
| 888 | 888 | |
| 889 | 889 | |
| 890 | 890 | /** |
| 891 | - * Counts all dates |
|
| 892 | - * |
|
| 893 | - * @return Array the date list |
|
| 894 | - * |
|
| 895 | - */ |
|
| 891 | + * Counts all dates |
|
| 892 | + * |
|
| 893 | + * @return Array the date list |
|
| 894 | + * |
|
| 895 | + */ |
|
| 896 | 896 | public function countAllDates($filters = array()) |
| 897 | 897 | { |
| 898 | 898 | global $globalTimezone, $globalDBdriver; |
@@ -938,11 +938,11 @@ discard block |
||
| 938 | 938 | |
| 939 | 939 | |
| 940 | 940 | /** |
| 941 | - * Counts all dates during the last 7 days |
|
| 942 | - * |
|
| 943 | - * @return Array the date list |
|
| 944 | - * |
|
| 945 | - */ |
|
| 941 | + * Counts all dates during the last 7 days |
|
| 942 | + * |
|
| 943 | + * @return Array the date list |
|
| 944 | + * |
|
| 945 | + */ |
|
| 946 | 946 | public function countAllDatesLast7Days($filters = array()) |
| 947 | 947 | { |
| 948 | 948 | global $globalTimezone, $globalDBdriver; |
@@ -964,7 +964,7 @@ discard block |
||
| 964 | 964 | $query .= " GROUP BY date_name |
| 965 | 965 | ORDER BY date_name ASC"; |
| 966 | 966 | $query_data = array(':offset' => $offset); |
| 967 | - } |
|
| 967 | + } |
|
| 968 | 968 | |
| 969 | 969 | $sth = $this->db->prepare($query); |
| 970 | 970 | $sth->execute($query_data); |
@@ -984,11 +984,11 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | |
| 986 | 986 | /** |
| 987 | - * Counts all dates during the last month |
|
| 988 | - * |
|
| 989 | - * @return Array the date list |
|
| 990 | - * |
|
| 991 | - */ |
|
| 987 | + * Counts all dates during the last month |
|
| 988 | + * |
|
| 989 | + * @return Array the date list |
|
| 990 | + * |
|
| 991 | + */ |
|
| 992 | 992 | public function countAllDatesLastMonth($filters = array()) |
| 993 | 993 | { |
| 994 | 994 | global $globalTimezone, $globalDBdriver; |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | $query .= " GROUP BY date_name |
| 1011 | 1011 | ORDER BY date_name ASC"; |
| 1012 | 1012 | $query_data = array(':offset' => $offset); |
| 1013 | - } |
|
| 1013 | + } |
|
| 1014 | 1014 | |
| 1015 | 1015 | $sth = $this->db->prepare($query); |
| 1016 | 1016 | $sth->execute($query_data); |
@@ -1032,11 +1032,11 @@ discard block |
||
| 1032 | 1032 | |
| 1033 | 1033 | |
| 1034 | 1034 | /** |
| 1035 | - * Counts all month |
|
| 1036 | - * |
|
| 1037 | - * @return Array the month list |
|
| 1038 | - * |
|
| 1039 | - */ |
|
| 1035 | + * Counts all month |
|
| 1036 | + * |
|
| 1037 | + * @return Array the month list |
|
| 1038 | + * |
|
| 1039 | + */ |
|
| 1040 | 1040 | public function countAllMonths($filters = array()) |
| 1041 | 1041 | { |
| 1042 | 1042 | global $globalTimezone, $globalDBdriver; |
@@ -1081,11 +1081,11 @@ discard block |
||
| 1081 | 1081 | |
| 1082 | 1082 | |
| 1083 | 1083 | /** |
| 1084 | - * Counts all dates during the last year |
|
| 1085 | - * |
|
| 1086 | - * @return Array the date list |
|
| 1087 | - * |
|
| 1088 | - */ |
|
| 1084 | + * Counts all dates during the last year |
|
| 1085 | + * |
|
| 1086 | + * @return Array the date list |
|
| 1087 | + * |
|
| 1088 | + */ |
|
| 1089 | 1089 | public function countAllMonthsLastYear($filters) |
| 1090 | 1090 | { |
| 1091 | 1091 | global $globalTimezone, $globalDBdriver; |
@@ -1107,7 +1107,7 @@ discard block |
||
| 1107 | 1107 | $query .= " GROUP BY year_name, month_name |
| 1108 | 1108 | ORDER BY year_name, month_name ASC"; |
| 1109 | 1109 | $query_data = array(':offset' => $offset); |
| 1110 | - } |
|
| 1110 | + } |
|
| 1111 | 1111 | |
| 1112 | 1112 | $sth = $this->db->prepare($query); |
| 1113 | 1113 | $sth->execute($query_data); |
@@ -1130,11 +1130,11 @@ discard block |
||
| 1130 | 1130 | |
| 1131 | 1131 | |
| 1132 | 1132 | /** |
| 1133 | - * Counts all hours |
|
| 1134 | - * |
|
| 1135 | - * @return Array the hour list |
|
| 1136 | - * |
|
| 1137 | - */ |
|
| 1133 | + * Counts all hours |
|
| 1134 | + * |
|
| 1135 | + * @return Array the hour list |
|
| 1136 | + * |
|
| 1137 | + */ |
|
| 1138 | 1138 | public function countAllHours($orderby,$filters = array()) |
| 1139 | 1139 | { |
| 1140 | 1140 | global $globalTimezone, $globalDBdriver; |
@@ -1197,11 +1197,11 @@ discard block |
||
| 1197 | 1197 | |
| 1198 | 1198 | |
| 1199 | 1199 | /** |
| 1200 | - * Counts all hours by date |
|
| 1201 | - * |
|
| 1202 | - * @return Array the hour list |
|
| 1203 | - * |
|
| 1204 | - */ |
|
| 1200 | + * Counts all hours by date |
|
| 1201 | + * |
|
| 1202 | + * @return Array the hour list |
|
| 1203 | + * |
|
| 1204 | + */ |
|
| 1205 | 1205 | public function countAllHoursByDate($date, $filters = array()) |
| 1206 | 1206 | { |
| 1207 | 1207 | global $globalTimezone, $globalDBdriver; |
@@ -1245,11 +1245,11 @@ discard block |
||
| 1245 | 1245 | |
| 1246 | 1246 | |
| 1247 | 1247 | /** |
| 1248 | - * Counts all hours by a ident/callsign |
|
| 1249 | - * |
|
| 1250 | - * @return Array the hour list |
|
| 1251 | - * |
|
| 1252 | - */ |
|
| 1248 | + * Counts all hours by a ident/callsign |
|
| 1249 | + * |
|
| 1250 | + * @return Array the hour list |
|
| 1251 | + * |
|
| 1252 | + */ |
|
| 1253 | 1253 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1254 | 1254 | { |
| 1255 | 1255 | global $globalTimezone, $globalDBdriver; |
@@ -1294,11 +1294,11 @@ discard block |
||
| 1294 | 1294 | |
| 1295 | 1295 | |
| 1296 | 1296 | /** |
| 1297 | - * Counts all trackers that have flown over |
|
| 1298 | - * |
|
| 1299 | - * @return Integer the number of trackers |
|
| 1300 | - * |
|
| 1301 | - */ |
|
| 1297 | + * Counts all trackers that have flown over |
|
| 1298 | + * |
|
| 1299 | + * @return Integer the number of trackers |
|
| 1300 | + * |
|
| 1301 | + */ |
|
| 1302 | 1302 | public function countOverallTracker($filters = array(),$year = '',$month = '') |
| 1303 | 1303 | { |
| 1304 | 1304 | global $globalDBdriver; |
@@ -1333,11 +1333,11 @@ discard block |
||
| 1333 | 1333 | } |
| 1334 | 1334 | |
| 1335 | 1335 | /** |
| 1336 | - * Counts all trackers type that have flown over |
|
| 1337 | - * |
|
| 1338 | - * @return Integer the number of flights |
|
| 1339 | - * |
|
| 1340 | - */ |
|
| 1336 | + * Counts all trackers type that have flown over |
|
| 1337 | + * |
|
| 1338 | + * @return Integer the number of flights |
|
| 1339 | + * |
|
| 1340 | + */ |
|
| 1341 | 1341 | public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
| 1342 | 1342 | { |
| 1343 | 1343 | global $globalDBdriver; |
@@ -1372,11 +1372,11 @@ discard block |
||
| 1372 | 1372 | |
| 1373 | 1373 | |
| 1374 | 1374 | /** |
| 1375 | - * Counts all hours of today |
|
| 1376 | - * |
|
| 1377 | - * @return Array the hour list |
|
| 1378 | - * |
|
| 1379 | - */ |
|
| 1375 | + * Counts all hours of today |
|
| 1376 | + * |
|
| 1377 | + * @return Array the hour list |
|
| 1378 | + * |
|
| 1379 | + */ |
|
| 1380 | 1380 | public function countAllHoursFromToday($filters = array()) |
| 1381 | 1381 | { |
| 1382 | 1382 | global $globalTimezone, $globalDBdriver; |
@@ -1416,12 +1416,12 @@ discard block |
||
| 1416 | 1416 | } |
| 1417 | 1417 | |
| 1418 | 1418 | |
| 1419 | - /** |
|
| 1420 | - * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 1421 | - * |
|
| 1422 | - * @return Integer the Barrie Spotter ID |
|
| 1419 | + /** |
|
| 1420 | + * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 1421 | + * |
|
| 1422 | + * @return Integer the Barrie Spotter ID |
|
| 1423 | 1423 | q * |
| 1424 | - */ |
|
| 1424 | + */ |
|
| 1425 | 1425 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1426 | 1426 | { |
| 1427 | 1427 | $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
@@ -1442,13 +1442,13 @@ discard block |
||
| 1442 | 1442 | |
| 1443 | 1443 | |
| 1444 | 1444 | /** |
| 1445 | - * Parses a date string |
|
| 1446 | - * |
|
| 1447 | - * @param String $dateString the date string |
|
| 1448 | - * @param String $timezone the timezone of a user |
|
| 1449 | - * @return Array the time information |
|
| 1450 | - * |
|
| 1451 | - */ |
|
| 1445 | + * Parses a date string |
|
| 1446 | + * |
|
| 1447 | + * @param String $dateString the date string |
|
| 1448 | + * @param String $timezone the timezone of a user |
|
| 1449 | + * @return Array the time information |
|
| 1450 | + * |
|
| 1451 | + */ |
|
| 1452 | 1452 | public function parseDateString($dateString, $timezone = '') |
| 1453 | 1453 | { |
| 1454 | 1454 | $time_array = array(); |
@@ -1481,12 +1481,12 @@ discard block |
||
| 1481 | 1481 | } |
| 1482 | 1482 | |
| 1483 | 1483 | /** |
| 1484 | - * Parses the direction degrees to working |
|
| 1485 | - * |
|
| 1486 | - * @param Float $direction the direction in degrees |
|
| 1487 | - * @return Array the direction information |
|
| 1488 | - * |
|
| 1489 | - */ |
|
| 1484 | + * Parses the direction degrees to working |
|
| 1485 | + * |
|
| 1486 | + * @param Float $direction the direction in degrees |
|
| 1487 | + * @return Array the direction information |
|
| 1488 | + * |
|
| 1489 | + */ |
|
| 1490 | 1490 | public function parseDirection($direction = 0) |
| 1491 | 1491 | { |
| 1492 | 1492 | if ($direction == '') $direction = 0; |
@@ -1565,12 +1565,12 @@ discard block |
||
| 1565 | 1565 | |
| 1566 | 1566 | |
| 1567 | 1567 | /** |
| 1568 | - * Gets Country from latitude/longitude |
|
| 1569 | - * |
|
| 1570 | - * @param Float $latitude latitute of the flight |
|
| 1571 | - * @param Float $longitude longitute of the flight |
|
| 1572 | - * @return String the countrie |
|
| 1573 | - */ |
|
| 1568 | + * Gets Country from latitude/longitude |
|
| 1569 | + * |
|
| 1570 | + * @param Float $latitude latitute of the flight |
|
| 1571 | + * @param Float $longitude longitute of the flight |
|
| 1572 | + * @return String the countrie |
|
| 1573 | + */ |
|
| 1574 | 1574 | public function getCountryFromLatitudeLongitude($latitude,$longitude) |
| 1575 | 1575 | { |
| 1576 | 1576 | global $globalDBdriver, $globalDebug; |
@@ -1607,11 +1607,11 @@ discard block |
||
| 1607 | 1607 | } |
| 1608 | 1608 | |
| 1609 | 1609 | /** |
| 1610 | - * Gets Country from iso2 |
|
| 1611 | - * |
|
| 1612 | - * @param String $iso2 ISO2 country code |
|
| 1613 | - * @return String the countrie |
|
| 1614 | - */ |
|
| 1610 | + * Gets Country from iso2 |
|
| 1611 | + * |
|
| 1612 | + * @param String $iso2 ISO2 country code |
|
| 1613 | + * @return String the countrie |
|
| 1614 | + */ |
|
| 1615 | 1615 | public function getCountryFromISO2($iso2) |
| 1616 | 1616 | { |
| 1617 | 1617 | global $globalDBdriver, $globalDebug; |
@@ -1639,11 +1639,11 @@ discard block |
||
| 1639 | 1639 | } |
| 1640 | 1640 | |
| 1641 | 1641 | /** |
| 1642 | - * Gets all vessels types that have flown over |
|
| 1643 | - * |
|
| 1644 | - * @return Array the vessel type list |
|
| 1645 | - * |
|
| 1646 | - */ |
|
| 1642 | + * Gets all vessels types that have flown over |
|
| 1643 | + * |
|
| 1644 | + * @return Array the vessel type list |
|
| 1645 | + * |
|
| 1646 | + */ |
|
| 1647 | 1647 | public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
| 1648 | 1648 | { |
| 1649 | 1649 | global $globalDBdriver; |
@@ -1708,11 +1708,11 @@ discard block |
||
| 1708 | 1708 | } |
| 1709 | 1709 | |
| 1710 | 1710 | /** |
| 1711 | - * Gets all the tracker information |
|
| 1712 | - * |
|
| 1713 | - * @return Array the tracker information |
|
| 1714 | - * |
|
| 1715 | - */ |
|
| 1711 | + * Gets all the tracker information |
|
| 1712 | + * |
|
| 1713 | + * @return Array the tracker information |
|
| 1714 | + * |
|
| 1715 | + */ |
|
| 1716 | 1716 | public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array()) |
| 1717 | 1717 | { |
| 1718 | 1718 | global $globalTimezone, $globalDBdriver; |
@@ -1817,12 +1817,12 @@ discard block |
||
| 1817 | 1817 | } |
| 1818 | 1818 | |
| 1819 | 1819 | /** |
| 1820 | - * Gets the short url from bit.ly |
|
| 1821 | - * |
|
| 1822 | - * @param String $url the full url |
|
| 1823 | - * @return String the bit.ly url |
|
| 1824 | - * |
|
| 1825 | - */ |
|
| 1820 | + * Gets the short url from bit.ly |
|
| 1821 | + * |
|
| 1822 | + * @param String $url the full url |
|
| 1823 | + * @return String the bit.ly url |
|
| 1824 | + * |
|
| 1825 | + */ |
|
| 1826 | 1826 | public function getBitlyURL($url) |
| 1827 | 1827 | { |
| 1828 | 1828 | global $globalBitlyAccessToken; |
@@ -10,7 +10,9 @@ discard block |
||
| 10 | 10 | public function __construct($dbc = null) { |
| 11 | 11 | $Connection = new Connection($dbc); |
| 12 | 12 | $this->db = $Connection->db(); |
| 13 | - if ($this->db === null) die('Error: No DB connection. (Tracker)'); |
|
| 13 | + if ($this->db === null) { |
|
| 14 | + die('Error: No DB connection. (Tracker)'); |
|
| 15 | + } |
|
| 14 | 16 | } |
| 15 | 17 | |
| 16 | 18 | /** |
@@ -32,7 +34,9 @@ discard block |
||
| 32 | 34 | if (isset($filter[0]['source'])) { |
| 33 | 35 | $filters = array_merge($filters,$filter); |
| 34 | 36 | } |
| 35 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 37 | + if (is_array($globalFilter)) { |
|
| 38 | + $filter = array_merge($filter,$globalFilter); |
|
| 39 | + } |
|
| 36 | 40 | $filter_query_join = ''; |
| 37 | 41 | $filter_query_where = ''; |
| 38 | 42 | foreach($filters as $flt) { |
@@ -71,8 +75,11 @@ discard block |
||
| 71 | 75 | $filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'"; |
| 72 | 76 | } |
| 73 | 77 | } |
| 74 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 75 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 78 | + if ($filter_query_where == '' && $where) { |
|
| 79 | + $filter_query_where = ' WHERE'; |
|
| 80 | + } elseif ($filter_query_where != '' && $and) { |
|
| 81 | + $filter_query_where .= ' AND'; |
|
| 82 | + } |
|
| 76 | 83 | if ($filter_query_where != '') { |
| 77 | 84 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 78 | 85 | } |
@@ -126,26 +133,43 @@ discard block |
||
| 126 | 133 | $temp_array['tracker_id'] = $row['tracker_archive_id']; |
| 127 | 134 | } elseif (isset($row['tracker_archive_output_id'])) { |
| 128 | 135 | $temp_array['tracker_id'] = $row['tracker_archive_output_id']; |
| 129 | - */} |
|
| 130 | - elseif (isset($row['trackerid'])) { |
|
| 136 | + */} elseif (isset($row['trackerid'])) { |
|
| 131 | 137 | $temp_array['trackerid'] = $row['trackerid']; |
| 132 | 138 | } else { |
| 133 | 139 | $temp_array['trackerid'] = ''; |
| 134 | 140 | } |
| 135 | - if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid']; |
|
| 136 | - if (isset($row['type'])) $temp_array['type'] = $row['type']; |
|
| 137 | - if (isset($row['comment'])) $temp_array['comment'] = $row['comment']; |
|
| 141 | + if (isset($row['famtrackid'])) { |
|
| 142 | + $temp_array['famtrackid'] = $row['famtrackid']; |
|
| 143 | + } |
|
| 144 | + if (isset($row['type'])) { |
|
| 145 | + $temp_array['type'] = $row['type']; |
|
| 146 | + } |
|
| 147 | + if (isset($row['comment'])) { |
|
| 148 | + $temp_array['comment'] = $row['comment']; |
|
| 149 | + } |
|
| 138 | 150 | $temp_array['ident'] = $row['ident']; |
| 139 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
| 140 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
| 141 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
| 142 | - if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude']; |
|
| 151 | + if (isset($row['latitude'])) { |
|
| 152 | + $temp_array['latitude'] = $row['latitude']; |
|
| 153 | + } |
|
| 154 | + if (isset($row['longitude'])) { |
|
| 155 | + $temp_array['longitude'] = $row['longitude']; |
|
| 156 | + } |
|
| 157 | + if (isset($row['format_source'])) { |
|
| 158 | + $temp_array['format_source'] = $row['format_source']; |
|
| 159 | + } |
|
| 160 | + if (isset($row['altitude'])) { |
|
| 161 | + $temp_array['altitude'] = $row['altitude']; |
|
| 162 | + } |
|
| 143 | 163 | if (isset($row['heading'])) { |
| 144 | 164 | $temp_array['heading'] = $row['heading']; |
| 145 | 165 | $heading_direction = $this->parseDirection($row['heading']); |
| 146 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 166 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
| 167 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 168 | + } |
|
| 169 | + } |
|
| 170 | + if (isset($row['ground_speed'])) { |
|
| 171 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 147 | 172 | } |
| 148 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 149 | 173 | |
| 150 | 174 | if (isset($row['date'])) { |
| 151 | 175 | $dateArray = $this->parseDateString($row['date']); |
@@ -188,13 +212,21 @@ discard block |
||
| 188 | 212 | } |
| 189 | 213 | |
| 190 | 214 | $fromsource = NULL; |
| 191 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
| 192 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
| 193 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
| 215 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
| 216 | + $temp_array['source_name'] = $row['source_name']; |
|
| 217 | + } |
|
| 218 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
| 219 | + $temp_array['over_country'] = $row['over_country']; |
|
| 220 | + } |
|
| 221 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
| 222 | + $temp_array['distance'] = $row['distance']; |
|
| 223 | + } |
|
| 194 | 224 | $temp_array['query_number_rows'] = $num_rows; |
| 195 | 225 | $tracker_array[] = $temp_array; |
| 196 | 226 | } |
| 197 | - if ($num_rows == 0) return array(); |
|
| 227 | + if ($num_rows == 0) { |
|
| 228 | + return array(); |
|
| 229 | + } |
|
| 198 | 230 | $tracker_array[0]['query_number_rows'] = $num_rows; |
| 199 | 231 | return $tracker_array; |
| 200 | 232 | } |
@@ -225,8 +257,12 @@ discard block |
||
| 225 | 257 | { |
| 226 | 258 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 227 | 259 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 228 | - } else $limit_query = ""; |
|
| 229 | - } else $limit_query = ""; |
|
| 260 | + } else { |
|
| 261 | + $limit_query = ""; |
|
| 262 | + } |
|
| 263 | + } else { |
|
| 264 | + $limit_query = ""; |
|
| 265 | + } |
|
| 230 | 266 | |
| 231 | 267 | if ($sort != "") |
| 232 | 268 | { |
@@ -254,7 +290,9 @@ discard block |
||
| 254 | 290 | global $global_query; |
| 255 | 291 | |
| 256 | 292 | date_default_timezone_set('UTC'); |
| 257 | - if ($id == '') return array(); |
|
| 293 | + if ($id == '') { |
|
| 294 | + return array(); |
|
| 295 | + } |
|
| 258 | 296 | $additional_query = "tracker_output.famtrackid = :id"; |
| 259 | 297 | $query_values = array(':id' => $id); |
| 260 | 298 | $query = $global_query." WHERE ".$additional_query." "; |
@@ -397,8 +435,11 @@ discard block |
||
| 397 | 435 | $query .= " ORDER BY tracker_output.source_name ASC"; |
| 398 | 436 | |
| 399 | 437 | $sth = $this->db->prepare($query); |
| 400 | - if (!empty($query_values)) $sth->execute($query_values); |
|
| 401 | - else $sth->execute(); |
|
| 438 | + if (!empty($query_values)) { |
|
| 439 | + $sth->execute($query_values); |
|
| 440 | + } else { |
|
| 441 | + $sth->execute(); |
|
| 442 | + } |
|
| 402 | 443 | |
| 403 | 444 | $source_array = array(); |
| 404 | 445 | $temp_array = array(); |
@@ -453,7 +494,9 @@ discard block |
||
| 453 | 494 | date_default_timezone_set($globalTimezone); |
| 454 | 495 | $datetime = new DateTime(); |
| 455 | 496 | $offset = $datetime->format('P'); |
| 456 | - } else $offset = '+00:00'; |
|
| 497 | + } else { |
|
| 498 | + $offset = '+00:00'; |
|
| 499 | + } |
|
| 457 | 500 | |
| 458 | 501 | if ($globalDBdriver == 'mysql') { |
| 459 | 502 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
@@ -609,7 +652,9 @@ discard block |
||
| 609 | 652 | { |
| 610 | 653 | return false; |
| 611 | 654 | } |
| 612 | - } else $altitude = 0; |
|
| 655 | + } else { |
|
| 656 | + $altitude = 0; |
|
| 657 | + } |
|
| 613 | 658 | |
| 614 | 659 | if ($heading != "") |
| 615 | 660 | { |
@@ -648,8 +693,12 @@ discard block |
||
| 648 | 693 | $latitude = 0; |
| 649 | 694 | $longitude = 0; |
| 650 | 695 | } |
| 651 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 652 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 696 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
| 697 | + $heading = 0; |
|
| 698 | + } |
|
| 699 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) { |
|
| 700 | + $groundspeed = 0; |
|
| 701 | + } |
|
| 653 | 702 | $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
| 654 | 703 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 655 | 704 | |
@@ -753,7 +802,9 @@ discard block |
||
| 753 | 802 | global $globalDBdriver, $globalArchive; |
| 754 | 803 | //$filter_query = $this->getFilter($filters,true,true); |
| 755 | 804 | $Connection= new Connection($this->db); |
| 756 | - if (!$Connection->tableExists('countries')) return array(); |
|
| 805 | + if (!$Connection->tableExists('countries')) { |
|
| 806 | + return array(); |
|
| 807 | + } |
|
| 757 | 808 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 758 | 809 | require_once('class.TrackerLive.php'); |
| 759 | 810 | $TrackerLive = new TrackerLive($this->db); |
@@ -796,7 +847,9 @@ discard block |
||
| 796 | 847 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country "; |
| 797 | 848 | } |
| 798 | 849 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
| 799 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 850 | + if ($limit) { |
|
| 851 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 852 | + } |
|
| 800 | 853 | |
| 801 | 854 | |
| 802 | 855 | $sth = $this->db->prepare($query); |
@@ -829,12 +882,18 @@ discard block |
||
| 829 | 882 | $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
| 830 | 883 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 831 | 884 | if ($olderthanmonths > 0) { |
| 832 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 833 | - else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 885 | + if ($globalDBdriver == 'mysql') { |
|
| 886 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 887 | + } else { |
|
| 888 | + $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 889 | + } |
|
| 834 | 890 | } |
| 835 | 891 | if ($sincedate != '') { |
| 836 | - if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'"; |
|
| 837 | - else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 892 | + if ($globalDBdriver == 'mysql') { |
|
| 893 | + $query .= " AND tracker_output.date > '".$sincedate."'"; |
|
| 894 | + } else { |
|
| 895 | + $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 896 | + } |
|
| 838 | 897 | } |
| 839 | 898 | $query_values = array(); |
| 840 | 899 | if ($year != '') { |
@@ -865,7 +924,9 @@ discard block |
||
| 865 | 924 | } |
| 866 | 925 | } |
| 867 | 926 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
| 868 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 927 | + if ($limit) { |
|
| 928 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 929 | + } |
|
| 869 | 930 | |
| 870 | 931 | $sth = $this->db->prepare($query); |
| 871 | 932 | $sth->execute($query_values); |
@@ -900,7 +961,9 @@ discard block |
||
| 900 | 961 | date_default_timezone_set($globalTimezone); |
| 901 | 962 | $datetime = new DateTime(); |
| 902 | 963 | $offset = $datetime->format('P'); |
| 903 | - } else $offset = '+00:00'; |
|
| 964 | + } else { |
|
| 965 | + $offset = '+00:00'; |
|
| 966 | + } |
|
| 904 | 967 | |
| 905 | 968 | if ($globalDBdriver == 'mysql') { |
| 906 | 969 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -950,7 +1013,9 @@ discard block |
||
| 950 | 1013 | date_default_timezone_set($globalTimezone); |
| 951 | 1014 | $datetime = new DateTime(); |
| 952 | 1015 | $offset = $datetime->format('P'); |
| 953 | - } else $offset = '+00:00'; |
|
| 1016 | + } else { |
|
| 1017 | + $offset = '+00:00'; |
|
| 1018 | + } |
|
| 954 | 1019 | $filter_query = $this->getFilter($filters,true,true); |
| 955 | 1020 | if ($globalDBdriver == 'mysql') { |
| 956 | 1021 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -996,7 +1061,9 @@ discard block |
||
| 996 | 1061 | date_default_timezone_set($globalTimezone); |
| 997 | 1062 | $datetime = new DateTime(); |
| 998 | 1063 | $offset = $datetime->format('P'); |
| 999 | - } else $offset = '+00:00'; |
|
| 1064 | + } else { |
|
| 1065 | + $offset = '+00:00'; |
|
| 1066 | + } |
|
| 1000 | 1067 | $filter_query = $this->getFilter($filters,true,true); |
| 1001 | 1068 | if ($globalDBdriver == 'mysql') { |
| 1002 | 1069 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1044,7 +1111,9 @@ discard block |
||
| 1044 | 1111 | date_default_timezone_set($globalTimezone); |
| 1045 | 1112 | $datetime = new DateTime(); |
| 1046 | 1113 | $offset = $datetime->format('P'); |
| 1047 | - } else $offset = '+00:00'; |
|
| 1114 | + } else { |
|
| 1115 | + $offset = '+00:00'; |
|
| 1116 | + } |
|
| 1048 | 1117 | |
| 1049 | 1118 | if ($globalDBdriver == 'mysql') { |
| 1050 | 1119 | $query = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -1093,7 +1162,9 @@ discard block |
||
| 1093 | 1162 | date_default_timezone_set($globalTimezone); |
| 1094 | 1163 | $datetime = new DateTime(); |
| 1095 | 1164 | $offset = $datetime->format('P'); |
| 1096 | - } else $offset = '+00:00'; |
|
| 1165 | + } else { |
|
| 1166 | + $offset = '+00:00'; |
|
| 1167 | + } |
|
| 1097 | 1168 | $filter_query = $this->getFilter($filters,true,true); |
| 1098 | 1169 | if ($globalDBdriver == 'mysql') { |
| 1099 | 1170 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
@@ -1142,7 +1213,9 @@ discard block |
||
| 1142 | 1213 | date_default_timezone_set($globalTimezone); |
| 1143 | 1214 | $datetime = new DateTime(); |
| 1144 | 1215 | $offset = $datetime->format('P'); |
| 1145 | - } else $offset = '+00:00'; |
|
| 1216 | + } else { |
|
| 1217 | + $offset = '+00:00'; |
|
| 1218 | + } |
|
| 1146 | 1219 | |
| 1147 | 1220 | $orderby_sql = ''; |
| 1148 | 1221 | if ($orderby == "hour") |
@@ -1211,7 +1284,9 @@ discard block |
||
| 1211 | 1284 | date_default_timezone_set($globalTimezone); |
| 1212 | 1285 | $datetime = new DateTime($date); |
| 1213 | 1286 | $offset = $datetime->format('P'); |
| 1214 | - } else $offset = '+00:00'; |
|
| 1287 | + } else { |
|
| 1288 | + $offset = '+00:00'; |
|
| 1289 | + } |
|
| 1215 | 1290 | |
| 1216 | 1291 | if ($globalDBdriver == 'mysql') { |
| 1217 | 1292 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1259,7 +1334,9 @@ discard block |
||
| 1259 | 1334 | date_default_timezone_set($globalTimezone); |
| 1260 | 1335 | $datetime = new DateTime(); |
| 1261 | 1336 | $offset = $datetime->format('P'); |
| 1262 | - } else $offset = '+00:00'; |
|
| 1337 | + } else { |
|
| 1338 | + $offset = '+00:00'; |
|
| 1339 | + } |
|
| 1263 | 1340 | |
| 1264 | 1341 | if ($globalDBdriver == 'mysql') { |
| 1265 | 1342 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1324,8 +1401,11 @@ discard block |
||
| 1324 | 1401 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 1325 | 1402 | } |
| 1326 | 1403 | } |
| 1327 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 1328 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1404 | + if (empty($query_values)) { |
|
| 1405 | + $queryi .= $this->getFilter($filters); |
|
| 1406 | + } else { |
|
| 1407 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1408 | + } |
|
| 1329 | 1409 | |
| 1330 | 1410 | $sth = $this->db->prepare($queryi); |
| 1331 | 1411 | $sth->execute($query_values); |
@@ -1362,8 +1442,11 @@ discard block |
||
| 1362 | 1442 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 1363 | 1443 | } |
| 1364 | 1444 | } |
| 1365 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 1366 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1445 | + if (empty($query_values)) { |
|
| 1446 | + $queryi .= $this->getFilter($filters); |
|
| 1447 | + } else { |
|
| 1448 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1449 | + } |
|
| 1367 | 1450 | |
| 1368 | 1451 | $sth = $this->db->prepare($queryi); |
| 1369 | 1452 | $sth->execute($query_values); |
@@ -1385,7 +1468,9 @@ discard block |
||
| 1385 | 1468 | date_default_timezone_set($globalTimezone); |
| 1386 | 1469 | $datetime = new DateTime(); |
| 1387 | 1470 | $offset = $datetime->format('P'); |
| 1388 | - } else $offset = '+00:00'; |
|
| 1471 | + } else { |
|
| 1472 | + $offset = '+00:00'; |
|
| 1473 | + } |
|
| 1389 | 1474 | |
| 1390 | 1475 | if ($globalDBdriver == 'mysql') { |
| 1391 | 1476 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1489,7 +1574,9 @@ discard block |
||
| 1489 | 1574 | */ |
| 1490 | 1575 | public function parseDirection($direction = 0) |
| 1491 | 1576 | { |
| 1492 | - if ($direction == '') $direction = 0; |
|
| 1577 | + if ($direction == '') { |
|
| 1578 | + $direction = 0; |
|
| 1579 | + } |
|
| 1493 | 1580 | $direction_array = array(); |
| 1494 | 1581 | $temp_array = array(); |
| 1495 | 1582 | |
@@ -1578,7 +1665,9 @@ discard block |
||
| 1578 | 1665 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1579 | 1666 | |
| 1580 | 1667 | $Connection = new Connection($this->db); |
| 1581 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 1668 | + if (!$Connection->tableExists('countries')) { |
|
| 1669 | + return ''; |
|
| 1670 | + } |
|
| 1582 | 1671 | |
| 1583 | 1672 | try { |
| 1584 | 1673 | /* |
@@ -1598,9 +1687,13 @@ discard block |
||
| 1598 | 1687 | $sth->closeCursor(); |
| 1599 | 1688 | if (count($row) > 0) { |
| 1600 | 1689 | return $row; |
| 1601 | - } else return ''; |
|
| 1690 | + } else { |
|
| 1691 | + return ''; |
|
| 1692 | + } |
|
| 1602 | 1693 | } catch (PDOException $e) { |
| 1603 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 1694 | + if (isset($globalDebug) && $globalDebug) { |
|
| 1695 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 1696 | + } |
|
| 1604 | 1697 | return ''; |
| 1605 | 1698 | } |
| 1606 | 1699 | |
@@ -1618,7 +1711,9 @@ discard block |
||
| 1618 | 1711 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
| 1619 | 1712 | |
| 1620 | 1713 | $Connection = new Connection($this->db); |
| 1621 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 1714 | + if (!$Connection->tableExists('countries')) { |
|
| 1715 | + return ''; |
|
| 1716 | + } |
|
| 1622 | 1717 | |
| 1623 | 1718 | try { |
| 1624 | 1719 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -1630,9 +1725,13 @@ discard block |
||
| 1630 | 1725 | $sth->closeCursor(); |
| 1631 | 1726 | if (count($row) > 0) { |
| 1632 | 1727 | return $row; |
| 1633 | - } else return ''; |
|
| 1728 | + } else { |
|
| 1729 | + return ''; |
|
| 1730 | + } |
|
| 1634 | 1731 | } catch (PDOException $e) { |
| 1635 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 1732 | + if (isset($globalDebug) && $globalDebug) { |
|
| 1733 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 1734 | + } |
|
| 1636 | 1735 | return ''; |
| 1637 | 1736 | } |
| 1638 | 1737 | |
@@ -1693,7 +1792,9 @@ discard block |
||
| 1693 | 1792 | } |
| 1694 | 1793 | } |
| 1695 | 1794 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
| 1696 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 1795 | + if ($limit) { |
|
| 1796 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 1797 | + } |
|
| 1697 | 1798 | $sth = $this->db->prepare($query); |
| 1698 | 1799 | $sth->execute($query_values); |
| 1699 | 1800 | $tracker_array = array(); |
@@ -1730,7 +1831,9 @@ discard block |
||
| 1730 | 1831 | foreach ($q_array as $q_item){ |
| 1731 | 1832 | $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
| 1732 | 1833 | $additional_query .= " AND ("; |
| 1733 | - if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR "; |
|
| 1834 | + if (is_int($q_item)) { |
|
| 1835 | + $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR "; |
|
| 1836 | + } |
|
| 1734 | 1837 | $additional_query .= "(tracker_output.ident like '%".$q_item."%') OR "; |
| 1735 | 1838 | $additional_query .= ")"; |
| 1736 | 1839 | } |
@@ -1756,7 +1859,9 @@ discard block |
||
| 1756 | 1859 | date_default_timezone_set($globalTimezone); |
| 1757 | 1860 | $datetime = new DateTime(); |
| 1758 | 1861 | $offset = $datetime->format('P'); |
| 1759 | - } else $offset = '+00:00'; |
|
| 1862 | + } else { |
|
| 1863 | + $offset = '+00:00'; |
|
| 1864 | + } |
|
| 1760 | 1865 | if ($date_array[1] != "") |
| 1761 | 1866 | { |
| 1762 | 1867 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
@@ -1783,8 +1888,12 @@ discard block |
||
| 1783 | 1888 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1784 | 1889 | { |
| 1785 | 1890 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1786 | - } else $limit_query = ""; |
|
| 1787 | - } else $limit_query = ""; |
|
| 1891 | + } else { |
|
| 1892 | + $limit_query = ""; |
|
| 1893 | + } |
|
| 1894 | + } else { |
|
| 1895 | + $limit_query = ""; |
|
| 1896 | + } |
|
| 1788 | 1897 | if ($sort != "") |
| 1789 | 1898 | { |
| 1790 | 1899 | $search_orderby_array = $this->getOrderBy(); |
@@ -1827,7 +1936,9 @@ discard block |
||
| 1827 | 1936 | { |
| 1828 | 1937 | global $globalBitlyAccessToken; |
| 1829 | 1938 | |
| 1830 | - if ($globalBitlyAccessToken == '') return $url; |
|
| 1939 | + if ($globalBitlyAccessToken == '') { |
|
| 1940 | + return $url; |
|
| 1941 | + } |
|
| 1831 | 1942 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
| 1832 | 1943 | $ch = curl_init(); |
| 1833 | 1944 | curl_setopt($ch, CURLOPT_HEADER, 0); |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 5 | 5 | $global_query = "SELECT tracker_output.* FROM tracker_output"; |
| 6 | 6 | |
| 7 | -class Tracker{ |
|
| 7 | +class Tracker { |
|
| 8 | 8 | public $db; |
| 9 | 9 | |
| 10 | 10 | public function __construct($dbc = null) { |
@@ -19,33 +19,33 @@ discard block |
||
| 19 | 19 | * @return Array the SQL part |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 22 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 23 | 23 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 24 | 24 | $filters = array(); |
| 25 | 25 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 26 | 26 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 27 | 27 | $filters = $globalStatsFilters[$globalFilterName]; |
| 28 | 28 | } else { |
| 29 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 29 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | if (isset($filter[0]['source'])) { |
| 33 | - $filters = array_merge($filters,$filter); |
|
| 33 | + $filters = array_merge($filters, $filter); |
|
| 34 | 34 | } |
| 35 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 35 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 36 | 36 | $filter_query_join = ''; |
| 37 | 37 | $filter_query_where = ''; |
| 38 | - foreach($filters as $flt) { |
|
| 38 | + foreach ($filters as $flt) { |
|
| 39 | 39 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 40 | 40 | if (isset($flt['source'])) { |
| 41 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 41 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 42 | 42 | } else { |
| 43 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 43 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 48 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 48 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 49 | 49 | } |
| 50 | 50 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 51 | 51 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 75 | 75 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 76 | 76 | if ($filter_query_where != '') { |
| 77 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 77 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 78 | 78 | } |
| 79 | 79 | $filter_query = $filter_query_join.$filter_query_where; |
| 80 | 80 | return $filter_query; |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * @return Array the tracker information |
| 90 | 90 | * |
| 91 | 91 | */ |
| 92 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 92 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 93 | 93 | { |
| 94 | 94 | date_default_timezone_set('UTC'); |
| 95 | 95 | if (!is_string($query)) |
@@ -109,13 +109,13 @@ discard block |
||
| 109 | 109 | $sth = $this->db->prepare($query.$limitQuery); |
| 110 | 110 | $sth->execute($params); |
| 111 | 111 | } catch (PDOException $e) { |
| 112 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 112 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 113 | 113 | exit(); |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | $num_rows = 0; |
| 117 | 117 | $tracker_array = array(); |
| 118 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 118 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 119 | 119 | { |
| 120 | 120 | $num_rows++; |
| 121 | 121 | $temp_array = array(); |
@@ -171,17 +171,17 @@ discard block |
||
| 171 | 171 | { |
| 172 | 172 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 173 | 173 | } else { |
| 174 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 174 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 175 | 175 | } |
| 176 | 176 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 177 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 178 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 177 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 178 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 179 | 179 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 180 | 180 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 181 | 181 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 182 | 182 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 183 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 184 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 183 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 184 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 185 | 185 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 186 | 186 | } |
| 187 | 187 | } |
@@ -218,8 +218,8 @@ discard block |
||
| 218 | 218 | { |
| 219 | 219 | $limit_array = explode(",", $limit); |
| 220 | 220 | |
| 221 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 222 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 221 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 222 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 223 | 223 | |
| 224 | 224 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 225 | 225 | { |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | $orderby_query = " ORDER BY tracker_output.date DESC"; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 239 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 240 | 240 | |
| 241 | - $tracker_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 241 | + $tracker_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 242 | 242 | |
| 243 | 243 | return $tracker_array; |
| 244 | 244 | } |
@@ -257,8 +257,8 @@ discard block |
||
| 257 | 257 | if ($id == '') return array(); |
| 258 | 258 | $additional_query = "tracker_output.famtrackid = :id"; |
| 259 | 259 | $query_values = array(':id' => $id); |
| 260 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 261 | - $tracker_array = $this->getDataFromDB($query,$query_values); |
|
| 260 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 261 | + $tracker_array = $this->getDataFromDB($query, $query_values); |
|
| 262 | 262 | return $tracker_array; |
| 263 | 263 | } |
| 264 | 264 | |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | $query_values = array(); |
| 278 | 278 | $limit_query = ''; |
| 279 | 279 | $additional_query = ''; |
| 280 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 280 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 281 | 281 | if ($ident != "") |
| 282 | 282 | { |
| 283 | 283 | if (!is_string($ident)) |
@@ -293,8 +293,8 @@ discard block |
||
| 293 | 293 | { |
| 294 | 294 | $limit_array = explode(",", $limit); |
| 295 | 295 | |
| 296 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 297 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 296 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 297 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 298 | 298 | |
| 299 | 299 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 300 | 300 | { |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | return $tracker_array; |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | - public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 321 | + public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 322 | 322 | { |
| 323 | 323 | global $global_query, $globalTimezone, $globalDBdriver; |
| 324 | 324 | |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | $limit_query = ''; |
| 327 | 327 | $additional_query = ''; |
| 328 | 328 | |
| 329 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 329 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 330 | 330 | |
| 331 | 331 | if ($date != "") |
| 332 | 332 | { |
@@ -352,8 +352,8 @@ discard block |
||
| 352 | 352 | { |
| 353 | 353 | $limit_array = explode(",", $limit); |
| 354 | 354 | |
| 355 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 356 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 355 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 356 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 357 | 357 | |
| 358 | 358 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 359 | 359 | { |
@@ -384,11 +384,11 @@ discard block |
||
| 384 | 384 | * @return Array list of source name |
| 385 | 385 | * |
| 386 | 386 | */ |
| 387 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 387 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 388 | 388 | { |
| 389 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 389 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 390 | 390 | $query_values = array(); |
| 391 | - $query = "SELECT DISTINCT tracker_output.source_name |
|
| 391 | + $query = "SELECT DISTINCT tracker_output.source_name |
|
| 392 | 392 | FROM tracker_output".$filter_query." tracker_output.source_name <> ''"; |
| 393 | 393 | if ($type != '') { |
| 394 | 394 | $query_values = array(':type' => $type); |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | $source_array = array(); |
| 404 | 404 | $temp_array = array(); |
| 405 | 405 | |
| 406 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 406 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 407 | 407 | { |
| 408 | 408 | $temp_array['source_name'] = $row['source_name']; |
| 409 | 409 | $source_array[] = $temp_array; |
@@ -420,8 +420,8 @@ discard block |
||
| 420 | 420 | */ |
| 421 | 421 | public function getAllIdents($filters = array()) |
| 422 | 422 | { |
| 423 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 424 | - $query = "SELECT DISTINCT tracker_output.ident |
|
| 423 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 424 | + $query = "SELECT DISTINCT tracker_output.ident |
|
| 425 | 425 | FROM tracker_output".$filter_query." tracker_output.ident <> '' |
| 426 | 426 | ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0"; |
| 427 | 427 | |
@@ -431,7 +431,7 @@ discard block |
||
| 431 | 431 | $ident_array = array(); |
| 432 | 432 | $temp_array = array(); |
| 433 | 433 | |
| 434 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 434 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 435 | 435 | { |
| 436 | 436 | $temp_array['ident'] = $row['ident']; |
| 437 | 437 | $ident_array[] = $temp_array; |
@@ -456,12 +456,12 @@ discard block |
||
| 456 | 456 | } else $offset = '+00:00'; |
| 457 | 457 | |
| 458 | 458 | if ($globalDBdriver == 'mysql') { |
| 459 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 459 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 460 | 460 | FROM tracker_output |
| 461 | 461 | WHERE tracker_output.date <> '' |
| 462 | 462 | ORDER BY tracker_output.date ASC LIMIT 0,100"; |
| 463 | 463 | } else { |
| 464 | - $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 464 | + $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 465 | 465 | FROM tracker_output |
| 466 | 466 | WHERE tracker_output.date <> '' |
| 467 | 467 | ORDER BY tracker_output.date ASC LIMIT 0,100"; |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | $date_array = array(); |
| 474 | 474 | $temp_array = array(); |
| 475 | 475 | |
| 476 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 476 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 477 | 477 | { |
| 478 | 478 | $temp_array['date'] = $row['date']; |
| 479 | 479 | |
@@ -492,11 +492,11 @@ discard block |
||
| 492 | 492 | * @return String success or false |
| 493 | 493 | * |
| 494 | 494 | */ |
| 495 | - public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
|
| 495 | + public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL) |
|
| 496 | 496 | { |
| 497 | 497 | |
| 498 | 498 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 499 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 499 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident); |
|
| 500 | 500 | |
| 501 | 501 | try { |
| 502 | 502 | $sth = $this->db->prepare($query); |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 521 | 521 | { |
| 522 | 522 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 523 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 523 | + $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 524 | 524 | |
| 525 | 525 | try { |
| 526 | 526 | $sth = $this->db->prepare($query); |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | * @param String $verticalrate vertival rate of flight |
| 561 | 561 | * @return String success or false |
| 562 | 562 | */ |
| 563 | - public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
|
| 563 | + public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '') |
|
| 564 | 564 | { |
| 565 | 565 | global $globalURL; |
| 566 | 566 | |
@@ -628,21 +628,21 @@ discard block |
||
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | |
| 631 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 631 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 632 | 632 | { |
| 633 | 633 | $date = date("Y-m-d H:i:s", time()); |
| 634 | 634 | } |
| 635 | 635 | |
| 636 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 637 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 638 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 639 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 640 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 641 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 642 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 643 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 644 | - $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
|
| 645 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 636 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 637 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 638 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 639 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 640 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 641 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 642 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 643 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 644 | + $comment = filter_var($comment, FILTER_SANITIZE_STRING); |
|
| 645 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 646 | 646 | |
| 647 | 647 | if ($latitude == '' && $longitude == '') { |
| 648 | 648 | $latitude = 0; |
@@ -650,10 +650,10 @@ discard block |
||
| 650 | 650 | } |
| 651 | 651 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 652 | 652 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 653 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 653 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 654 | 654 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 655 | 655 | |
| 656 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 656 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type); |
|
| 657 | 657 | |
| 658 | 658 | try { |
| 659 | 659 | |
@@ -679,13 +679,13 @@ discard block |
||
| 679 | 679 | { |
| 680 | 680 | global $globalDBdriver, $globalTimezone; |
| 681 | 681 | if ($globalDBdriver == 'mysql') { |
| 682 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 682 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 683 | 683 | WHERE tracker_output.ident = :ident |
| 684 | 684 | AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 685 | 685 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 686 | 686 | $query_data = array(':ident' => $ident); |
| 687 | 687 | } else { |
| 688 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 688 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 689 | 689 | WHERE tracker_output.ident = :ident |
| 690 | 690 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 691 | 691 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -694,8 +694,8 @@ discard block |
||
| 694 | 694 | |
| 695 | 695 | $sth = $this->db->prepare($query); |
| 696 | 696 | $sth->execute($query_data); |
| 697 | - $ident_result=''; |
|
| 698 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 697 | + $ident_result = ''; |
|
| 698 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 699 | 699 | { |
| 700 | 700 | $ident_result = $row['ident']; |
| 701 | 701 | } |
@@ -721,8 +721,8 @@ discard block |
||
| 721 | 721 | return false; |
| 722 | 722 | } else { |
| 723 | 723 | $q_array = explode(" ", $q); |
| 724 | - foreach ($q_array as $q_item){ |
|
| 725 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 724 | + foreach ($q_array as $q_item) { |
|
| 725 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 726 | 726 | $additional_query .= " AND ("; |
| 727 | 727 | $additional_query .= "(tracker_output.ident like '%".$q_item."%')"; |
| 728 | 728 | $additional_query .= ")"; |
@@ -730,11 +730,11 @@ discard block |
||
| 730 | 730 | } |
| 731 | 731 | } |
| 732 | 732 | if ($globalDBdriver == 'mysql') { |
| 733 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 733 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 734 | 734 | WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 735 | 735 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 736 | 736 | } else { |
| 737 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 737 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 738 | 738 | WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 739 | 739 | AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 740 | 740 | } |
@@ -748,16 +748,16 @@ discard block |
||
| 748 | 748 | * @return Array the airline country list |
| 749 | 749 | * |
| 750 | 750 | */ |
| 751 | - public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 751 | + public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 752 | 752 | { |
| 753 | 753 | global $globalDBdriver, $globalArchive; |
| 754 | 754 | //$filter_query = $this->getFilter($filters,true,true); |
| 755 | - $Connection= new Connection($this->db); |
|
| 755 | + $Connection = new Connection($this->db); |
|
| 756 | 756 | if (!$Connection->tableExists('countries')) return array(); |
| 757 | 757 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 758 | 758 | require_once('class.TrackerLive.php'); |
| 759 | 759 | $TrackerLive = new TrackerLive($this->db); |
| 760 | - $filter_query = $TrackerLive->getFilter($filters,true,true); |
|
| 760 | + $filter_query = $TrackerLive->getFilter($filters, true, true); |
|
| 761 | 761 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 762 | 762 | if ($olderthanmonths > 0) { |
| 763 | 763 | if ($globalDBdriver == 'mysql') { |
@@ -777,7 +777,7 @@ discard block |
||
| 777 | 777 | } else { |
| 778 | 778 | require_once('class.TrackerArchive.php'); |
| 779 | 779 | $TrackerArchive = new TrackerArchive($this->db); |
| 780 | - $filter_query = $TrackerArchive->getFilter($filters,true,true); |
|
| 780 | + $filter_query = $TrackerArchive->getFilter($filters, true, true); |
|
| 781 | 781 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 782 | 782 | if ($olderthanmonths > 0) { |
| 783 | 783 | if ($globalDBdriver == 'mysql') { |
@@ -805,7 +805,7 @@ discard block |
||
| 805 | 805 | $flight_array = array(); |
| 806 | 806 | $temp_array = array(); |
| 807 | 807 | |
| 808 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 808 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 809 | 809 | { |
| 810 | 810 | $temp_array['tracker_count'] = $row['nb']; |
| 811 | 811 | $temp_array['tracker_country'] = $row['name']; |
@@ -822,11 +822,11 @@ discard block |
||
| 822 | 822 | * @return Array the callsign list |
| 823 | 823 | * |
| 824 | 824 | */ |
| 825 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 825 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 826 | 826 | { |
| 827 | 827 | global $globalDBdriver; |
| 828 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 829 | - $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 828 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 829 | + $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 830 | 830 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 831 | 831 | if ($olderthanmonths > 0) { |
| 832 | 832 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -840,28 +840,28 @@ discard block |
||
| 840 | 840 | if ($year != '') { |
| 841 | 841 | if ($globalDBdriver == 'mysql') { |
| 842 | 842 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 843 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 843 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 844 | 844 | } else { |
| 845 | 845 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 846 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 846 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 847 | 847 | } |
| 848 | 848 | } |
| 849 | 849 | if ($month != '') { |
| 850 | 850 | if ($globalDBdriver == 'mysql') { |
| 851 | 851 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 852 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 852 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 853 | 853 | } else { |
| 854 | 854 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 855 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 855 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 856 | 856 | } |
| 857 | 857 | } |
| 858 | 858 | if ($day != '') { |
| 859 | 859 | if ($globalDBdriver == 'mysql') { |
| 860 | 860 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 861 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 861 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 862 | 862 | } else { |
| 863 | 863 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 864 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 864 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 865 | 865 | } |
| 866 | 866 | } |
| 867 | 867 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | $callsign_array = array(); |
| 874 | 874 | $temp_array = array(); |
| 875 | 875 | |
| 876 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 876 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 877 | 877 | { |
| 878 | 878 | $temp_array['callsign_icao'] = $row['ident']; |
| 879 | 879 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -925,7 +925,7 @@ discard block |
||
| 925 | 925 | $date_array = array(); |
| 926 | 926 | $temp_array = array(); |
| 927 | 927 | |
| 928 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 928 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 929 | 929 | { |
| 930 | 930 | $temp_array['date_name'] = $row['date_name']; |
| 931 | 931 | $temp_array['date_count'] = $row['date_count']; |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | $datetime = new DateTime(); |
| 952 | 952 | $offset = $datetime->format('P'); |
| 953 | 953 | } else $offset = '+00:00'; |
| 954 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 954 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 955 | 955 | if ($globalDBdriver == 'mysql') { |
| 956 | 956 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 957 | 957 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | $date_array = array(); |
| 973 | 973 | $temp_array = array(); |
| 974 | 974 | |
| 975 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 975 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 976 | 976 | { |
| 977 | 977 | $temp_array['date_name'] = $row['date_name']; |
| 978 | 978 | $temp_array['date_count'] = $row['date_count']; |
@@ -997,7 +997,7 @@ discard block |
||
| 997 | 997 | $datetime = new DateTime(); |
| 998 | 998 | $offset = $datetime->format('P'); |
| 999 | 999 | } else $offset = '+00:00'; |
| 1000 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1000 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1001 | 1001 | if ($globalDBdriver == 'mysql') { |
| 1002 | 1002 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1003 | 1003 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1018,7 +1018,7 @@ discard block |
||
| 1018 | 1018 | $date_array = array(); |
| 1019 | 1019 | $temp_array = array(); |
| 1020 | 1020 | |
| 1021 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1021 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1022 | 1022 | { |
| 1023 | 1023 | $temp_array['date_name'] = $row['date_name']; |
| 1024 | 1024 | $temp_array['date_count'] = $row['date_count']; |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | $date_array = array(); |
| 1066 | 1066 | $temp_array = array(); |
| 1067 | 1067 | |
| 1068 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1068 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1069 | 1069 | { |
| 1070 | 1070 | $temp_array['month_name'] = $row['month_name']; |
| 1071 | 1071 | $temp_array['year_name'] = $row['year_name']; |
@@ -1094,7 +1094,7 @@ discard block |
||
| 1094 | 1094 | $datetime = new DateTime(); |
| 1095 | 1095 | $offset = $datetime->format('P'); |
| 1096 | 1096 | } else $offset = '+00:00'; |
| 1097 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1097 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1098 | 1098 | if ($globalDBdriver == 'mysql') { |
| 1099 | 1099 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1100 | 1100 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | $date_array = array(); |
| 1116 | 1116 | $temp_array = array(); |
| 1117 | 1117 | |
| 1118 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1118 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1119 | 1119 | { |
| 1120 | 1120 | $temp_array['year_name'] = $row['year_name']; |
| 1121 | 1121 | $temp_array['month_name'] = $row['month_name']; |
@@ -1135,7 +1135,7 @@ discard block |
||
| 1135 | 1135 | * @return Array the hour list |
| 1136 | 1136 | * |
| 1137 | 1137 | */ |
| 1138 | - public function countAllHours($orderby,$filters = array()) |
|
| 1138 | + public function countAllHours($orderby, $filters = array()) |
|
| 1139 | 1139 | { |
| 1140 | 1140 | global $globalTimezone, $globalDBdriver; |
| 1141 | 1141 | if ($globalTimezone != '') { |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | $hour_array = array(); |
| 1184 | 1184 | $temp_array = array(); |
| 1185 | 1185 | |
| 1186 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1186 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1187 | 1187 | { |
| 1188 | 1188 | $temp_array['hour_name'] = $row['hour_name']; |
| 1189 | 1189 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1205,8 +1205,8 @@ discard block |
||
| 1205 | 1205 | public function countAllHoursByDate($date, $filters = array()) |
| 1206 | 1206 | { |
| 1207 | 1207 | global $globalTimezone, $globalDBdriver; |
| 1208 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1209 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1208 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1209 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1210 | 1210 | if ($globalTimezone != '') { |
| 1211 | 1211 | date_default_timezone_set($globalTimezone); |
| 1212 | 1212 | $datetime = new DateTime($date); |
@@ -1214,12 +1214,12 @@ discard block |
||
| 1214 | 1214 | } else $offset = '+00:00'; |
| 1215 | 1215 | |
| 1216 | 1216 | if ($globalDBdriver == 'mysql') { |
| 1217 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1217 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1218 | 1218 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date |
| 1219 | 1219 | GROUP BY hour_name |
| 1220 | 1220 | ORDER BY hour_name ASC"; |
| 1221 | 1221 | } else { |
| 1222 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1222 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1223 | 1223 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1224 | 1224 | GROUP BY hour_name |
| 1225 | 1225 | ORDER BY hour_name ASC"; |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | $hour_array = array(); |
| 1232 | 1232 | $temp_array = array(); |
| 1233 | 1233 | |
| 1234 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1234 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1235 | 1235 | { |
| 1236 | 1236 | $temp_array['hour_name'] = $row['hour_name']; |
| 1237 | 1237 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1253,8 +1253,8 @@ discard block |
||
| 1253 | 1253 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1254 | 1254 | { |
| 1255 | 1255 | global $globalTimezone, $globalDBdriver; |
| 1256 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1257 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1256 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1257 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1258 | 1258 | if ($globalTimezone != '') { |
| 1259 | 1259 | date_default_timezone_set($globalTimezone); |
| 1260 | 1260 | $datetime = new DateTime(); |
@@ -1262,12 +1262,12 @@ discard block |
||
| 1262 | 1262 | } else $offset = '+00:00'; |
| 1263 | 1263 | |
| 1264 | 1264 | if ($globalDBdriver == 'mysql') { |
| 1265 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1265 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1266 | 1266 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1267 | 1267 | GROUP BY hour_name |
| 1268 | 1268 | ORDER BY hour_name ASC"; |
| 1269 | 1269 | } else { |
| 1270 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1270 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1271 | 1271 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1272 | 1272 | GROUP BY hour_name |
| 1273 | 1273 | ORDER BY hour_name ASC"; |
@@ -1275,12 +1275,12 @@ discard block |
||
| 1275 | 1275 | |
| 1276 | 1276 | |
| 1277 | 1277 | $sth = $this->db->prepare($query); |
| 1278 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1278 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1279 | 1279 | |
| 1280 | 1280 | $hour_array = array(); |
| 1281 | 1281 | $temp_array = array(); |
| 1282 | 1282 | |
| 1283 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1283 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1284 | 1284 | { |
| 1285 | 1285 | $temp_array['hour_name'] = $row['hour_name']; |
| 1286 | 1286 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1299,33 +1299,33 @@ discard block |
||
| 1299 | 1299 | * @return Integer the number of trackers |
| 1300 | 1300 | * |
| 1301 | 1301 | */ |
| 1302 | - public function countOverallTracker($filters = array(),$year = '',$month = '') |
|
| 1302 | + public function countOverallTracker($filters = array(), $year = '', $month = '') |
|
| 1303 | 1303 | { |
| 1304 | 1304 | global $globalDBdriver; |
| 1305 | 1305 | //$queryi = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output"; |
| 1306 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1306 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1307 | 1307 | $query_values = array(); |
| 1308 | 1308 | $query = ''; |
| 1309 | 1309 | if ($year != '') { |
| 1310 | 1310 | if ($globalDBdriver == 'mysql') { |
| 1311 | 1311 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1312 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1312 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1313 | 1313 | } else { |
| 1314 | 1314 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1315 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1315 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1316 | 1316 | } |
| 1317 | 1317 | } |
| 1318 | 1318 | if ($month != '') { |
| 1319 | 1319 | if ($globalDBdriver == 'mysql') { |
| 1320 | 1320 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1321 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1321 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1322 | 1322 | } else { |
| 1323 | 1323 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1324 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1324 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1325 | 1325 | } |
| 1326 | 1326 | } |
| 1327 | 1327 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1328 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1328 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1329 | 1329 | |
| 1330 | 1330 | $sth = $this->db->prepare($queryi); |
| 1331 | 1331 | $sth->execute($query_values); |
@@ -1338,32 +1338,32 @@ discard block |
||
| 1338 | 1338 | * @return Integer the number of flights |
| 1339 | 1339 | * |
| 1340 | 1340 | */ |
| 1341 | - public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
|
| 1341 | + public function countOverallTrackerTypes($filters = array(), $year = '', $month = '') |
|
| 1342 | 1342 | { |
| 1343 | 1343 | global $globalDBdriver; |
| 1344 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1344 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1345 | 1345 | $query_values = array(); |
| 1346 | 1346 | $query = ''; |
| 1347 | 1347 | if ($year != '') { |
| 1348 | 1348 | if ($globalDBdriver == 'mysql') { |
| 1349 | 1349 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1350 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1350 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1351 | 1351 | } else { |
| 1352 | 1352 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1353 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1353 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1354 | 1354 | } |
| 1355 | 1355 | } |
| 1356 | 1356 | if ($month != '') { |
| 1357 | 1357 | if ($globalDBdriver == 'mysql') { |
| 1358 | 1358 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1359 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1359 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1360 | 1360 | } else { |
| 1361 | 1361 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1362 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1362 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1363 | 1363 | } |
| 1364 | 1364 | } |
| 1365 | 1365 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1366 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1366 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1367 | 1367 | |
| 1368 | 1368 | $sth = $this->db->prepare($queryi); |
| 1369 | 1369 | $sth->execute($query_values); |
@@ -1380,7 +1380,7 @@ discard block |
||
| 1380 | 1380 | public function countAllHoursFromToday($filters = array()) |
| 1381 | 1381 | { |
| 1382 | 1382 | global $globalTimezone, $globalDBdriver; |
| 1383 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1383 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1384 | 1384 | if ($globalTimezone != '') { |
| 1385 | 1385 | date_default_timezone_set($globalTimezone); |
| 1386 | 1386 | $datetime = new DateTime(); |
@@ -1388,12 +1388,12 @@ discard block |
||
| 1388 | 1388 | } else $offset = '+00:00'; |
| 1389 | 1389 | |
| 1390 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1391 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1391 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1392 | 1392 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE() |
| 1393 | 1393 | GROUP BY hour_name |
| 1394 | 1394 | ORDER BY hour_name ASC"; |
| 1395 | 1395 | } else { |
| 1396 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1396 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1397 | 1397 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1398 | 1398 | GROUP BY hour_name |
| 1399 | 1399 | ORDER BY hour_name ASC"; |
@@ -1405,7 +1405,7 @@ discard block |
||
| 1405 | 1405 | $hour_array = array(); |
| 1406 | 1406 | $temp_array = array(); |
| 1407 | 1407 | |
| 1408 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1408 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1409 | 1409 | { |
| 1410 | 1410 | $temp_array['hour_name'] = $row['hour_name']; |
| 1411 | 1411 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1424,9 +1424,9 @@ discard block |
||
| 1424 | 1424 | */ |
| 1425 | 1425 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1426 | 1426 | { |
| 1427 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 1427 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 1428 | 1428 | |
| 1429 | - $query = "SELECT tracker_output.tracker_id |
|
| 1429 | + $query = "SELECT tracker_output.tracker_id |
|
| 1430 | 1430 | FROM tracker_output |
| 1431 | 1431 | WHERE tracker_output.famtrackid = '".$famtrackid."'"; |
| 1432 | 1432 | |
@@ -1434,7 +1434,7 @@ discard block |
||
| 1434 | 1434 | $sth = $this->db->prepare($query); |
| 1435 | 1435 | $sth->execute(); |
| 1436 | 1436 | |
| 1437 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1437 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1438 | 1438 | { |
| 1439 | 1439 | return $row['tracker_id']; |
| 1440 | 1440 | } |
@@ -1459,23 +1459,23 @@ discard block |
||
| 1459 | 1459 | } |
| 1460 | 1460 | |
| 1461 | 1461 | $current_date = date("Y-m-d H:i:s"); |
| 1462 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1462 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1463 | 1463 | |
| 1464 | 1464 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1465 | 1465 | |
| 1466 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1466 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1467 | 1467 | $years = $time_array['years']; |
| 1468 | 1468 | |
| 1469 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1469 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1470 | 1470 | $months = $time_array['months']; |
| 1471 | 1471 | |
| 1472 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1472 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1473 | 1473 | $days = $time_array['days']; |
| 1474 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1474 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1475 | 1475 | $hours = $time_array['hours']; |
| 1476 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1476 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1477 | 1477 | $minutes = $time_array['minutes']; |
| 1478 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1478 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1479 | 1479 | |
| 1480 | 1480 | return $time_array; |
| 1481 | 1481 | } |
@@ -1498,63 +1498,63 @@ discard block |
||
| 1498 | 1498 | $temp_array['direction_degree'] = $direction; |
| 1499 | 1499 | $temp_array['direction_shortname'] = "N"; |
| 1500 | 1500 | $temp_array['direction_fullname'] = "North"; |
| 1501 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1501 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1502 | 1502 | $temp_array['direction_degree'] = $direction; |
| 1503 | 1503 | $temp_array['direction_shortname'] = "NNE"; |
| 1504 | 1504 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1505 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1505 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1506 | 1506 | $temp_array['direction_degree'] = $direction; |
| 1507 | 1507 | $temp_array['direction_shortname'] = "NE"; |
| 1508 | 1508 | $temp_array['direction_fullname'] = "Northeast"; |
| 1509 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1509 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1510 | 1510 | $temp_array['direction_degree'] = $direction; |
| 1511 | 1511 | $temp_array['direction_shortname'] = "ENE"; |
| 1512 | 1512 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1513 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1513 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1514 | 1514 | $temp_array['direction_degree'] = $direction; |
| 1515 | 1515 | $temp_array['direction_shortname'] = "E"; |
| 1516 | 1516 | $temp_array['direction_fullname'] = "East"; |
| 1517 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1517 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1518 | 1518 | $temp_array['direction_degree'] = $direction; |
| 1519 | 1519 | $temp_array['direction_shortname'] = "ESE"; |
| 1520 | 1520 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1521 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1521 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1522 | 1522 | $temp_array['direction_degree'] = $direction; |
| 1523 | 1523 | $temp_array['direction_shortname'] = "SE"; |
| 1524 | 1524 | $temp_array['direction_fullname'] = "Southeast"; |
| 1525 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1525 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1526 | 1526 | $temp_array['direction_degree'] = $direction; |
| 1527 | 1527 | $temp_array['direction_shortname'] = "SSE"; |
| 1528 | 1528 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1529 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1529 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1530 | 1530 | $temp_array['direction_degree'] = $direction; |
| 1531 | 1531 | $temp_array['direction_shortname'] = "S"; |
| 1532 | 1532 | $temp_array['direction_fullname'] = "South"; |
| 1533 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1533 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1534 | 1534 | $temp_array['direction_degree'] = $direction; |
| 1535 | 1535 | $temp_array['direction_shortname'] = "SSW"; |
| 1536 | 1536 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1537 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1537 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1538 | 1538 | $temp_array['direction_degree'] = $direction; |
| 1539 | 1539 | $temp_array['direction_shortname'] = "SW"; |
| 1540 | 1540 | $temp_array['direction_fullname'] = "Southwest"; |
| 1541 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1541 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1542 | 1542 | $temp_array['direction_degree'] = $direction; |
| 1543 | 1543 | $temp_array['direction_shortname'] = "WSW"; |
| 1544 | 1544 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1545 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1545 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1546 | 1546 | $temp_array['direction_degree'] = $direction; |
| 1547 | 1547 | $temp_array['direction_shortname'] = "W"; |
| 1548 | 1548 | $temp_array['direction_fullname'] = "West"; |
| 1549 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1549 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1550 | 1550 | $temp_array['direction_degree'] = $direction; |
| 1551 | 1551 | $temp_array['direction_shortname'] = "WNW"; |
| 1552 | 1552 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1553 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1553 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1554 | 1554 | $temp_array['direction_degree'] = $direction; |
| 1555 | 1555 | $temp_array['direction_shortname'] = "NW"; |
| 1556 | 1556 | $temp_array['direction_fullname'] = "Northwest"; |
| 1557 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1557 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1558 | 1558 | $temp_array['direction_degree'] = $direction; |
| 1559 | 1559 | $temp_array['direction_shortname'] = "NNW"; |
| 1560 | 1560 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1571,11 +1571,11 @@ discard block |
||
| 1571 | 1571 | * @param Float $longitude longitute of the flight |
| 1572 | 1572 | * @return String the countrie |
| 1573 | 1573 | */ |
| 1574 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1574 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1575 | 1575 | { |
| 1576 | 1576 | global $globalDBdriver, $globalDebug; |
| 1577 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1578 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1577 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1578 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1579 | 1579 | |
| 1580 | 1580 | $Connection = new Connection($this->db); |
| 1581 | 1581 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1615,7 +1615,7 @@ discard block |
||
| 1615 | 1615 | public function getCountryFromISO2($iso2) |
| 1616 | 1616 | { |
| 1617 | 1617 | global $globalDBdriver, $globalDebug; |
| 1618 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1618 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1619 | 1619 | |
| 1620 | 1620 | $Connection = new Connection($this->db); |
| 1621 | 1621 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1644,11 +1644,11 @@ discard block |
||
| 1644 | 1644 | * @return Array the vessel type list |
| 1645 | 1645 | * |
| 1646 | 1646 | */ |
| 1647 | - public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 1647 | + public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 1648 | 1648 | { |
| 1649 | 1649 | global $globalDBdriver; |
| 1650 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1651 | - $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1650 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1651 | + $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1652 | 1652 | FROM tracker_output ".$filter_query." tracker_output.type <> ''"; |
| 1653 | 1653 | if ($olderthanmonths > 0) { |
| 1654 | 1654 | if ($globalDBdriver == 'mysql') { |
@@ -1668,28 +1668,28 @@ discard block |
||
| 1668 | 1668 | if ($year != '') { |
| 1669 | 1669 | if ($globalDBdriver == 'mysql') { |
| 1670 | 1670 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1671 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1671 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1672 | 1672 | } else { |
| 1673 | 1673 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1674 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1674 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1675 | 1675 | } |
| 1676 | 1676 | } |
| 1677 | 1677 | if ($month != '') { |
| 1678 | 1678 | if ($globalDBdriver == 'mysql') { |
| 1679 | 1679 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1680 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1680 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1681 | 1681 | } else { |
| 1682 | 1682 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1683 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1683 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1684 | 1684 | } |
| 1685 | 1685 | } |
| 1686 | 1686 | if ($day != '') { |
| 1687 | 1687 | if ($globalDBdriver == 'mysql') { |
| 1688 | 1688 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 1689 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1689 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1690 | 1690 | } else { |
| 1691 | 1691 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 1692 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1692 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1693 | 1693 | } |
| 1694 | 1694 | } |
| 1695 | 1695 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
@@ -1698,7 +1698,7 @@ discard block |
||
| 1698 | 1698 | $sth->execute($query_values); |
| 1699 | 1699 | $tracker_array = array(); |
| 1700 | 1700 | $temp_array = array(); |
| 1701 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1701 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1702 | 1702 | { |
| 1703 | 1703 | $temp_array['tracker_type'] = $row['tracker_type']; |
| 1704 | 1704 | $temp_array['tracker_type_count'] = $row['tracker_type_count']; |
@@ -1713,13 +1713,13 @@ discard block |
||
| 1713 | 1713 | * @return Array the tracker information |
| 1714 | 1714 | * |
| 1715 | 1715 | */ |
| 1716 | - public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array()) |
|
| 1716 | + public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 1717 | 1717 | { |
| 1718 | 1718 | global $globalTimezone, $globalDBdriver; |
| 1719 | 1719 | date_default_timezone_set('UTC'); |
| 1720 | 1720 | $query_values = array(); |
| 1721 | 1721 | $additional_query = ''; |
| 1722 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1722 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1723 | 1723 | if ($q != "") |
| 1724 | 1724 | { |
| 1725 | 1725 | if (!is_string($q)) |
@@ -1727,8 +1727,8 @@ discard block |
||
| 1727 | 1727 | return false; |
| 1728 | 1728 | } else { |
| 1729 | 1729 | $q_array = explode(" ", $q); |
| 1730 | - foreach ($q_array as $q_item){ |
|
| 1731 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 1730 | + foreach ($q_array as $q_item) { |
|
| 1731 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 1732 | 1732 | $additional_query .= " AND ("; |
| 1733 | 1733 | if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR "; |
| 1734 | 1734 | $additional_query .= "(tracker_output.ident like '%".$q_item."%') OR "; |
@@ -1738,20 +1738,20 @@ discard block |
||
| 1738 | 1738 | } |
| 1739 | 1739 | if ($callsign != "") |
| 1740 | 1740 | { |
| 1741 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 1741 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 1742 | 1742 | if (!is_string($callsign)) |
| 1743 | 1743 | { |
| 1744 | 1744 | return false; |
| 1745 | 1745 | } else { |
| 1746 | 1746 | $additional_query .= " AND tracker_output.ident = :callsign"; |
| 1747 | - $query_values = array_merge($query_values,array(':callsign' => $callsign)); |
|
| 1747 | + $query_values = array_merge($query_values, array(':callsign' => $callsign)); |
|
| 1748 | 1748 | } |
| 1749 | 1749 | } |
| 1750 | 1750 | if ($date_posted != "") |
| 1751 | 1751 | { |
| 1752 | 1752 | $date_array = explode(",", $date_posted); |
| 1753 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 1754 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 1753 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 1754 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 1755 | 1755 | if ($globalTimezone != '') { |
| 1756 | 1756 | date_default_timezone_set($globalTimezone); |
| 1757 | 1757 | $datetime = new DateTime(); |
@@ -1778,8 +1778,8 @@ discard block |
||
| 1778 | 1778 | if ($limit != "") |
| 1779 | 1779 | { |
| 1780 | 1780 | $limit_array = explode(",", $limit); |
| 1781 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1782 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1781 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1782 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1783 | 1783 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1784 | 1784 | { |
| 1785 | 1785 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -1797,22 +1797,22 @@ discard block |
||
| 1797 | 1797 | } |
| 1798 | 1798 | } |
| 1799 | 1799 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 1800 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 1800 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 1801 | 1801 | if ($globalDBdriver == 'mysql') { |
| 1802 | - $query="SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance |
|
| 1802 | + $query = "SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance |
|
| 1803 | 1803 | FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND tracker_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and tracker_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 1804 | 1804 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query; |
| 1805 | 1805 | } else { |
| 1806 | - $query="SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 1806 | + $query = "SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 1807 | 1807 | FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 1808 | 1808 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query; |
| 1809 | 1809 | } |
| 1810 | 1810 | } else { |
| 1811 | - $query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' |
|
| 1811 | + $query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' |
|
| 1812 | 1812 | ".$additional_query." |
| 1813 | 1813 | ".$orderby_query; |
| 1814 | 1814 | } |
| 1815 | - $tracker_array = $this->getDataFromDB($query, $query_values,$limit_query); |
|
| 1815 | + $tracker_array = $this->getDataFromDB($query, $query_values, $limit_query); |
|
| 1816 | 1816 | return $tracker_array; |
| 1817 | 1817 | } |
| 1818 | 1818 | |
@@ -1837,7 +1837,7 @@ discard block |
||
| 1837 | 1837 | curl_close($ch); |
| 1838 | 1838 | $bitly_data = json_decode($bitly_data); |
| 1839 | 1839 | $bitly_url = ''; |
| 1840 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1840 | + if ($bitly_data->status_txt = "OK") { |
|
| 1841 | 1841 | $bitly_url = $bitly_data->data->url; |
| 1842 | 1842 | } |
| 1843 | 1843 | return $bitly_url; |
@@ -1845,7 +1845,7 @@ discard block |
||
| 1845 | 1845 | |
| 1846 | 1846 | public function getOrderBy() |
| 1847 | 1847 | { |
| 1848 | - $orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1848 | + $orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1849 | 1849 | |
| 1850 | 1850 | return $orderby; |
| 1851 | 1851 | |
@@ -91,28 +91,28 @@ |
||
| 91 | 91 | $limit_previous_2 = $limit_end - $absolute_difference; |
| 92 | 92 | |
| 93 | 93 | if ( |
| 94 | - (isset($_GET['q']) && $_GET['q'] != '') || |
|
| 95 | - (isset($_GET['registration']) && $_GET['registration'] != '') || |
|
| 96 | - (isset($_GET['aircraft']) && $_GET['aircraft'] != '') || |
|
| 97 | - (isset($_GET['manufacturer']) && $_GET['manufacturer'] != '') || |
|
| 98 | - (isset($_GET['highlights']) && $_GET['highlights'] != '') || |
|
| 99 | - (isset($_GET['airline']) && $_GET['airline'] != '') || |
|
| 100 | - (isset($_GET['airline_country']) && $_GET['airline_country'] != '') || |
|
| 101 | - (isset($_GET['airline_type']) && $_GET['airline_type'] != '') || |
|
| 102 | - (isset($_GET['airport']) && $_GET['airport'] != '') || |
|
| 103 | - (isset($_GET['airport_country']) && $_GET['airport_country'] != '') || |
|
| 104 | - (isset($_GET['callsign']) && $_GET['callsign'] != '') || |
|
| 105 | - (isset($_GET['owner']) && $_GET['owner'] != '') || |
|
| 106 | - (isset($_GET['pilot_name']) && $_GET['pilot_name'] != '') || |
|
| 107 | - (isset($_GET['pilot_id']) && $_GET['pilot_id'] != '') || |
|
| 108 | - (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != '') || |
|
| 109 | - (isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != '') || |
|
| 110 | - (isset($_GET['mmsi']) && $_GET['mmsi'] != '') || |
|
| 111 | - (isset($_GET['imo']) && $_GET['imo'] != '') || |
|
| 112 | - ((isset($_GET['origlat']) && $_GET['origlat'] != '') && |
|
| 113 | - (isset($_GET['origlon']) && $_GET['origlon'] != '') && |
|
| 114 | - (isset($_GET['dist']) && $_GET['dist'] != '')) |
|
| 115 | - ){ |
|
| 94 | + (isset($_GET['q']) && $_GET['q'] != '') || |
|
| 95 | + (isset($_GET['registration']) && $_GET['registration'] != '') || |
|
| 96 | + (isset($_GET['aircraft']) && $_GET['aircraft'] != '') || |
|
| 97 | + (isset($_GET['manufacturer']) && $_GET['manufacturer'] != '') || |
|
| 98 | + (isset($_GET['highlights']) && $_GET['highlights'] != '') || |
|
| 99 | + (isset($_GET['airline']) && $_GET['airline'] != '') || |
|
| 100 | + (isset($_GET['airline_country']) && $_GET['airline_country'] != '') || |
|
| 101 | + (isset($_GET['airline_type']) && $_GET['airline_type'] != '') || |
|
| 102 | + (isset($_GET['airport']) && $_GET['airport'] != '') || |
|
| 103 | + (isset($_GET['airport_country']) && $_GET['airport_country'] != '') || |
|
| 104 | + (isset($_GET['callsign']) && $_GET['callsign'] != '') || |
|
| 105 | + (isset($_GET['owner']) && $_GET['owner'] != '') || |
|
| 106 | + (isset($_GET['pilot_name']) && $_GET['pilot_name'] != '') || |
|
| 107 | + (isset($_GET['pilot_id']) && $_GET['pilot_id'] != '') || |
|
| 108 | + (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != '') || |
|
| 109 | + (isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != '') || |
|
| 110 | + (isset($_GET['mmsi']) && $_GET['mmsi'] != '') || |
|
| 111 | + (isset($_GET['imo']) && $_GET['imo'] != '') || |
|
| 112 | + ((isset($_GET['origlat']) && $_GET['origlat'] != '') && |
|
| 113 | + (isset($_GET['origlon']) && $_GET['origlon'] != '') && |
|
| 114 | + (isset($_GET['dist']) && $_GET['dist'] != '')) |
|
| 115 | + ){ |
|
| 116 | 116 | $q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING); |
| 117 | 117 | $registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING); |
| 118 | 118 | $aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING); |
@@ -26,24 +26,24 @@ discard block |
||
| 26 | 26 | $sql_date = ''; |
| 27 | 27 | if (isset($_GET['start_date'])) { |
| 28 | 28 | //for the date manipulation into the query |
| 29 | - if($_GET['start_date'] != "" && $_GET['end_date'] != ""){ |
|
| 29 | + if ($_GET['start_date'] != "" && $_GET['end_date'] != "") { |
|
| 30 | 30 | if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) { |
| 31 | 31 | //$start_date = $_GET['start_date']." 00:00:00"; |
| 32 | - $start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00"; |
|
| 32 | + $start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00"; |
|
| 33 | 33 | //$end_date = $_GET['end_date']." 00:00:00"; |
| 34 | - $end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00"; |
|
| 34 | + $end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00"; |
|
| 35 | 35 | $sql_date = $start_date.",".$end_date; |
| 36 | 36 | } |
| 37 | - } else if($_GET['start_date'] != ""){ |
|
| 37 | + } else if ($_GET['start_date'] != "") { |
|
| 38 | 38 | if (strtotime($_GET['start_date']) !== false) { |
| 39 | 39 | //$start_date = $_GET['start_date']." 00:00:00"; |
| 40 | - $start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00"; |
|
| 40 | + $start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00"; |
|
| 41 | 41 | $sql_date = $start_date; |
| 42 | 42 | } |
| 43 | - } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
|
| 43 | + } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") { |
|
| 44 | 44 | if (strtotime($_GET['end_date']) !== false) { |
| 45 | 45 | //$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00"; |
| 46 | - $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00"; |
|
| 46 | + $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00"; |
|
| 47 | 47 | $sql_date = $end_date; |
| 48 | 48 | } |
| 49 | 49 | } else $sql_date = ''; |
@@ -51,21 +51,21 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if (isset($_GET['highest_altitude'])) { |
| 53 | 53 | //for altitude manipulation |
| 54 | - if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){ |
|
| 55 | - $end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT); |
|
| 56 | - $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT); |
|
| 54 | + if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") { |
|
| 55 | + $end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT); |
|
| 56 | + $start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT); |
|
| 57 | 57 | $sql_altitude = $start_altitude.",".$end_altitude; |
| 58 | - } else if($_GET['highest_altitude'] != ""){ |
|
| 59 | - $end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT); |
|
| 58 | + } else if ($_GET['highest_altitude'] != "") { |
|
| 59 | + $end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT); |
|
| 60 | 60 | $sql_altitude = $end_altitude; |
| 61 | - } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
|
| 62 | - $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000"; |
|
| 61 | + } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") { |
|
| 62 | + $start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000"; |
|
| 63 | 63 | $sql_altitude = $start_altitude; |
| 64 | 64 | } else $sql_altitude = ''; |
| 65 | 65 | } else $sql_altitude = ''; |
| 66 | 66 | |
| 67 | 67 | //calculuation for the pagination |
| 68 | -if(!isset($_GET['limit'])) |
|
| 68 | +if (!isset($_GET['limit'])) |
|
| 69 | 69 | { |
| 70 | 70 | if (!isset($_GET['number_results'])) |
| 71 | 71 | { |
@@ -73,17 +73,17 @@ discard block |
||
| 73 | 73 | $limit_end = 25; |
| 74 | 74 | $absolute_difference = 25; |
| 75 | 75 | } else { |
| 76 | - if ($_GET['number_results'] > 1000){ |
|
| 76 | + if ($_GET['number_results'] > 1000) { |
|
| 77 | 77 | $_GET['number_results'] = 1000; |
| 78 | 78 | } |
| 79 | 79 | $limit_start = 0; |
| 80 | - $limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
|
| 81 | - $absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
|
| 80 | + $limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT); |
|
| 81 | + $absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT); |
|
| 82 | 82 | } |
| 83 | -} else { |
|
| 83 | +} else { |
|
| 84 | 84 | $limit_explode = explode(",", $_GET['limit']); |
| 85 | - $limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 86 | - $limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 85 | + $limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 86 | + $limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 87 | 87 | } |
| 88 | 88 | $absolute_difference = abs($limit_start - $limit_end); |
| 89 | 89 | $limit_next = $limit_end + $absolute_difference; |
@@ -112,31 +112,31 @@ discard block |
||
| 112 | 112 | ((isset($_GET['origlat']) && $_GET['origlat'] != '') && |
| 113 | 113 | (isset($_GET['origlon']) && $_GET['origlon'] != '') && |
| 114 | 114 | (isset($_GET['dist']) && $_GET['dist'] != '')) |
| 115 | - ){ |
|
| 116 | - $q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING); |
|
| 117 | - $registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING); |
|
| 118 | - $aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING); |
|
| 119 | - $manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING); |
|
| 120 | - $highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING); |
|
| 121 | - $airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING); |
|
| 122 | - $airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING); |
|
| 123 | - $airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING); |
|
| 124 | - $airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING); |
|
| 125 | - $airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING); |
|
| 126 | - $callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING); |
|
| 127 | - $owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING); |
|
| 128 | - $pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING); |
|
| 129 | - $pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING); |
|
| 130 | - $mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT); |
|
| 131 | - $imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT); |
|
| 132 | - $departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING); |
|
| 133 | - $arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING); |
|
| 134 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 135 | - $archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT); |
|
| 136 | - $origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 137 | - $origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 138 | - $dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT); |
|
| 139 | - $number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
|
| 115 | + ) { |
|
| 116 | + $q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 117 | + $registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING); |
|
| 118 | + $aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING); |
|
| 119 | + $manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING); |
|
| 120 | + $highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING); |
|
| 121 | + $airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 122 | + $airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING); |
|
| 123 | + $airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 124 | + $airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING); |
|
| 125 | + $airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING); |
|
| 126 | + $callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING); |
|
| 127 | + $owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING); |
|
| 128 | + $pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING); |
|
| 129 | + $pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING); |
|
| 130 | + $mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT); |
|
| 131 | + $imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT); |
|
| 132 | + $departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING); |
|
| 133 | + $arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING); |
|
| 134 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 135 | + $archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT); |
|
| 136 | + $origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 137 | + $origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT); |
|
| 138 | + $dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT); |
|
| 139 | + $number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT); |
|
| 140 | 140 | if ($dist != '') { |
| 141 | 141 | if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934; |
| 142 | 142 | elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852; |
@@ -145,15 +145,15 @@ discard block |
||
| 145 | 145 | if ($archive == 1) { |
| 146 | 146 | if ($type == 'aircraft') { |
| 147 | 147 | $SpotterArchive = new SpotterArchive(); |
| 148 | - $spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
|
| 148 | + $spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist); |
|
| 149 | 149 | } |
| 150 | 150 | } else { |
| 151 | 151 | if ($type == 'aircraft') { |
| 152 | - $spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
|
| 152 | + $spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist); |
|
| 153 | 153 | } elseif ($type == 'tracker') { |
| 154 | - $spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
|
| 154 | + $spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist); |
|
| 155 | 155 | } elseif ($type == 'marine') { |
| 156 | - $spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist); |
|
| 156 | + $spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
@@ -189,12 +189,12 @@ discard block |
||
| 189 | 189 | //remove 3D=true parameter |
| 190 | 190 | $no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']); |
| 191 | 191 | $kmlURL = str_replace("http://", "kml://", $globalURL); |
| 192 | - if (!isset($_GET['3D'])){ |
|
| 192 | + if (!isset($_GET['3D'])) { |
|
| 193 | 193 | print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>'; |
| 194 | 194 | } else { |
| 195 | 195 | print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>'; |
| 196 | 196 | } |
| 197 | - if (isset($_GET['3D'])){ |
|
| 197 | + if (isset($_GET['3D'])) { |
|
| 198 | 198 | print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>'; |
| 199 | 199 | } else { |
| 200 | 200 | print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>'; |
@@ -215,32 +215,32 @@ discard block |
||
| 215 | 215 | print '<div class="column">'; |
| 216 | 216 | print '<div class="info">'; |
| 217 | 217 | print '<h1>'._("Search Results for").' '; |
| 218 | - if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; } |
|
| 219 | - if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; } |
|
| 220 | - if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; } |
|
| 221 | - if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; } |
|
| 222 | - if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; } |
|
| 223 | - if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; } |
|
| 224 | - if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; } |
|
| 225 | - if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; } |
|
| 226 | - if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; } |
|
| 227 | - if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; } |
|
| 228 | - if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; } |
|
| 229 | - if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; } |
|
| 230 | - if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; } |
|
| 231 | - if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; } |
|
| 232 | - if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; } |
|
| 233 | - if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; } |
|
| 234 | - if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; } |
|
| 235 | - if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; } |
|
| 236 | - if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; } |
|
| 237 | - if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; } |
|
| 238 | - if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; } |
|
| 239 | - if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; } |
|
| 240 | - if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; } |
|
| 241 | - if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 242 | - if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 243 | - if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; } |
|
| 218 | + if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; } |
|
| 219 | + if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; } |
|
| 220 | + if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; } |
|
| 221 | + if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; } |
|
| 222 | + if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; } |
|
| 223 | + if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; } |
|
| 224 | + if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; } |
|
| 225 | + if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; } |
|
| 226 | + if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; } |
|
| 227 | + if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; } |
|
| 228 | + if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; } |
|
| 229 | + if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; } |
|
| 230 | + if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; } |
|
| 231 | + if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; } |
|
| 232 | + if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; } |
|
| 233 | + if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; } |
|
| 234 | + if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; } |
|
| 235 | + if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; } |
|
| 236 | + if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; } |
|
| 237 | + if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; } |
|
| 238 | + if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; } |
|
| 239 | + if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; } |
|
| 240 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; } |
|
| 241 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 242 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; } |
|
| 243 | + if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; } |
|
| 244 | 244 | print '</h1>'; |
| 245 | 245 | print '</div>'; |
| 246 | 246 | |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | </select> |
| 375 | 375 | </div> |
| 376 | 376 | </div> |
| 377 | - <script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script> |
|
| 377 | + <script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script> |
|
| 378 | 378 | <div class="form-group"> |
| 379 | 379 | <label class="control-label col-sm-2"><?php echo _("Type"); ?></label> |
| 380 | 380 | <div class="col-sm-10"> |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | </select> |
| 384 | 384 | </div> |
| 385 | 385 | </div> |
| 386 | - <script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script> |
|
| 386 | + <script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script> |
|
| 387 | 387 | <div class="form-group"> |
| 388 | 388 | <label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> |
| 389 | 389 | <div class="col-sm-10"> |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | </div> |
| 407 | 407 | </div> |
| 408 | 408 | <?php |
| 409 | - }else { |
|
| 409 | + } else { |
|
| 410 | 410 | ?> |
| 411 | 411 | <div class="form-group"> |
| 412 | 412 | <label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> |
@@ -419,8 +419,8 @@ discard block |
||
| 419 | 419 | ?> |
| 420 | 420 | <div class="form-group"> |
| 421 | 421 | <div class="col-sm-offset-2 col-sm-10"> |
| 422 | - <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 423 | - <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 422 | + <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 423 | + <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 424 | 424 | </div> |
| 425 | 425 | </div> |
| 426 | 426 | </fieldset> |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | </select> |
| 435 | 435 | </div> |
| 436 | 436 | </div> |
| 437 | - <script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script> |
|
| 437 | + <script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script> |
|
| 438 | 438 | <div class="form-group"> |
| 439 | 439 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 440 | 440 | <div class="col-sm-10"> |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | </select> |
| 444 | 444 | </div> |
| 445 | 445 | </div> |
| 446 | - <script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script> |
|
| 446 | + <script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script> |
|
| 447 | 447 | <div class="form-group"> |
| 448 | 448 | <label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> |
| 449 | 449 | <div class="col-sm-10"> |
@@ -452,10 +452,10 @@ discard block |
||
| 452 | 452 | </div> |
| 453 | 453 | <div class="form-group"> |
| 454 | 454 | <div class="col-sm-offset-2 col-sm-10"> |
| 455 | - <label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label> |
|
| 456 | - <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 457 | - <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 458 | - <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 455 | + <label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label> |
|
| 456 | + <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 457 | + <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 458 | + <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 459 | 459 | </div> |
| 460 | 460 | </div> |
| 461 | 461 | </fieldset> |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | </select> |
| 470 | 470 | </div> |
| 471 | 471 | </div> |
| 472 | - <script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script> |
|
| 472 | + <script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script> |
|
| 473 | 473 | <div class="form-group"> |
| 474 | 474 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 475 | 475 | <div class="col-sm-10"> |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | </select> |
| 479 | 479 | </div> |
| 480 | 480 | </div> |
| 481 | - <script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script> |
|
| 481 | + <script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script> |
|
| 482 | 482 | </fieldset> |
| 483 | 483 | <fieldset> |
| 484 | 484 | <legend><?php echo _("Route"); ?></legend> |
@@ -490,7 +490,7 @@ discard block |
||
| 490 | 490 | </select> |
| 491 | 491 | </div> |
| 492 | 492 | </div> |
| 493 | - <script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script> |
|
| 493 | + <script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script> |
|
| 494 | 494 | <div class="form-group"> |
| 495 | 495 | <label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> |
| 496 | 496 | <div class="col-sm-10"> |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | </select> |
| 500 | 500 | </div> |
| 501 | 501 | </div> |
| 502 | - <script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script> |
|
| 502 | + <script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script> |
|
| 503 | 503 | </fieldset> |
| 504 | 504 | <fieldset> |
| 505 | 505 | <legend>Altitude</legend> |
@@ -510,9 +510,9 @@ discard block |
||
| 510 | 510 | <option></option> |
| 511 | 511 | <?php |
| 512 | 512 | $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000); |
| 513 | -foreach($altitude_array as $altitude) |
|
| 513 | +foreach ($altitude_array as $altitude) |
|
| 514 | 514 | { |
| 515 | - if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude) |
|
| 515 | + if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude) |
|
| 516 | 516 | { |
| 517 | 517 | print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>'; |
| 518 | 518 | } else { |
@@ -530,9 +530,9 @@ discard block |
||
| 530 | 530 | <option></option> |
| 531 | 531 | <?php |
| 532 | 532 | $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000); |
| 533 | - foreach($altitude_array as $altitude) |
|
| 533 | + foreach ($altitude_array as $altitude) |
|
| 534 | 534 | { |
| 535 | - if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude) |
|
| 535 | + if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude) |
|
| 536 | 536 | { |
| 537 | 537 | print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>'; |
| 538 | 538 | } else { |
@@ -655,10 +655,10 @@ discard block |
||
| 655 | 655 | <div class="col-sm-10"> |
| 656 | 656 | <select class="form-control" name="number_results"> |
| 657 | 657 | <?php |
| 658 | -$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000); |
|
| 659 | -foreach($number_results_array as $number) |
|
| 658 | +$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000); |
|
| 659 | +foreach ($number_results_array as $number) |
|
| 660 | 660 | { |
| 661 | - if(isset($_GET['number_results']) && $_GET['number_results'] == $number) |
|
| 661 | + if (isset($_GET['number_results']) && $_GET['number_results'] == $number) |
|
| 662 | 662 | { |
| 663 | 663 | print '<option value="'.$number.'" selected="selected">'.$number.'</option>'; |
| 664 | 664 | } else { |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | <fieldset> |
| 678 | 678 | <div class="form-group"> |
| 679 | 679 | <div class="col-sm-offset-2 col-sm-10"> |
| 680 | - <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label> |
|
| 680 | + <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label> |
|
| 681 | 681 | <p class="help-block">Disabled in demo</p> |
| 682 | 682 | </div> |
| 683 | 683 | </div> |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | <fieldset> |
| 689 | 689 | <div class="form-group"> |
| 690 | 690 | <div class="col-sm-offset-2 col-sm-10"> |
| 691 | - <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label> |
|
| 691 | + <label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label> |
|
| 692 | 692 | </div> |
| 693 | 693 | </div> |
| 694 | 694 | </fieldset> |
@@ -46,8 +46,10 @@ discard block |
||
| 46 | 46 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00"; |
| 47 | 47 | $sql_date = $end_date; |
| 48 | 48 | } |
| 49 | - } else $sql_date = ''; |
|
| 50 | -} |
|
| 49 | + } else { |
|
| 50 | + $sql_date = ''; |
|
| 51 | + } |
|
| 52 | + } |
|
| 51 | 53 | |
| 52 | 54 | if (isset($_GET['highest_altitude'])) { |
| 53 | 55 | //for altitude manipulation |
@@ -61,8 +63,12 @@ discard block |
||
| 61 | 63 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 62 | 64 | $start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000"; |
| 63 | 65 | $sql_altitude = $start_altitude; |
| 64 | - } else $sql_altitude = ''; |
|
| 65 | -} else $sql_altitude = ''; |
|
| 66 | + } else { |
|
| 67 | + $sql_altitude = ''; |
|
| 68 | + } |
|
| 69 | + } else { |
|
| 70 | + $sql_altitude = ''; |
|
| 71 | +} |
|
| 66 | 72 | |
| 67 | 73 | //calculuation for the pagination |
| 68 | 74 | if(!isset($_GET['limit'])) |
@@ -80,7 +86,7 @@ discard block |
||
| 80 | 86 | $limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
| 81 | 87 | $absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
| 82 | 88 | } |
| 83 | -} else { |
|
| 89 | +} else { |
|
| 84 | 90 | $limit_explode = explode(",", $_GET['limit']); |
| 85 | 91 | $limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT); |
| 86 | 92 | $limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT); |
@@ -138,10 +144,15 @@ discard block |
||
| 138 | 144 | $dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT); |
| 139 | 145 | $number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT); |
| 140 | 146 | if ($dist != '') { |
| 141 | - if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934; |
|
| 142 | - elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852; |
|
| 147 | + if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') { |
|
| 148 | + $dist = $dist*1.60934; |
|
| 149 | + } elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') { |
|
| 150 | + $dist = $dist*1.852; |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | + if (!isset($sql_date)) { |
|
| 154 | + $sql_date = ''; |
|
| 143 | 155 | } |
| 144 | - if (!isset($sql_date)) $sql_date = ''; |
|
| 145 | 156 | if ($archive == 1) { |
| 146 | 157 | if ($type == 'aircraft') { |
| 147 | 158 | $SpotterArchive = new SpotterArchive(); |
@@ -219,7 +230,10 @@ discard block |
||
| 219 | 230 | if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; } |
| 220 | 231 | if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; } |
| 221 | 232 | if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; } |
| 222 | - if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; } |
|
| 233 | + if (isset($_GET['highlights'])) { |
|
| 234 | + if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; |
|
| 235 | + } |
|
| 236 | + } |
|
| 223 | 237 | if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; } |
| 224 | 238 | if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; } |
| 225 | 239 | if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; } |
@@ -355,7 +369,10 @@ discard block |
||
| 355 | 369 | <div class="form-group"> |
| 356 | 370 | <label class="control-label col-sm-2"><?php echo _("Keywords"); ?></label> |
| 357 | 371 | <div class="col-sm-10"> |
| 358 | - <input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) print $q; ?>" size="10" placeholder="<?php echo _("Keywords"); ?>" /> |
|
| 372 | + <input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) { |
|
| 373 | + print $q; |
|
| 374 | +} |
|
| 375 | +?>" size="10" placeholder="<?php echo _("Keywords"); ?>" /> |
|
| 359 | 376 | </div> |
| 360 | 377 | </div> |
| 361 | 378 | </fieldset> |
@@ -374,7 +391,10 @@ discard block |
||
| 374 | 391 | </select> |
| 375 | 392 | </div> |
| 376 | 393 | </div> |
| 377 | - <script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script> |
|
| 394 | + <script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) { |
|
| 395 | + print $manufacturer; |
|
| 396 | +} |
|
| 397 | +?>')</script> |
|
| 378 | 398 | <div class="form-group"> |
| 379 | 399 | <label class="control-label col-sm-2"><?php echo _("Type"); ?></label> |
| 380 | 400 | <div class="col-sm-10"> |
@@ -383,11 +403,17 @@ discard block |
||
| 383 | 403 | </select> |
| 384 | 404 | </div> |
| 385 | 405 | </div> |
| 386 | - <script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script> |
|
| 406 | + <script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) { |
|
| 407 | + print $aircraft_icao; |
|
| 408 | +} |
|
| 409 | +?>');</script> |
|
| 387 | 410 | <div class="form-group"> |
| 388 | 411 | <label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> |
| 389 | 412 | <div class="col-sm-10"> |
| 390 | - <input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) print $registration; ?>" size="8" placeholder="<?php echo _("Registration"); ?>" /> |
|
| 413 | + <input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) { |
|
| 414 | + print $registration; |
|
| 415 | +} |
|
| 416 | +?>" size="8" placeholder="<?php echo _("Registration"); ?>" /> |
|
| 391 | 417 | </div> |
| 392 | 418 | </div> |
| 393 | 419 | <?php |
@@ -396,22 +422,31 @@ discard block |
||
| 396 | 422 | <div class="form-group"> |
| 397 | 423 | <label class="control-label col-sm-2"><?php echo _("Pilot id"); ?></label> |
| 398 | 424 | <div class="col-sm-10"> |
| 399 | - <input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) print $pilot_id; ?>" size="15" placeholder="<?php echo _("Pilot id"); ?>" /> |
|
| 425 | + <input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) { |
|
| 426 | + print $pilot_id; |
|
| 427 | +} |
|
| 428 | +?>" size="15" placeholder="<?php echo _("Pilot id"); ?>" /> |
|
| 400 | 429 | </div> |
| 401 | 430 | </div> |
| 402 | 431 | <div class="form-group"> |
| 403 | 432 | <label class="control-label col-sm-2"><?php echo _("Pilot name"); ?></label> |
| 404 | 433 | <div class="col-sm-10"> |
| 405 | - <input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) print $pilot_name; ?>" size="15" placeholder="<?php echo _("Pilot name"); ?>" /> |
|
| 434 | + <input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) { |
|
| 435 | + print $pilot_name; |
|
| 436 | +} |
|
| 437 | +?>" size="15" placeholder="<?php echo _("Pilot name"); ?>" /> |
|
| 406 | 438 | </div> |
| 407 | 439 | </div> |
| 408 | 440 | <?php |
| 409 | - }else { |
|
| 441 | + } else { |
|
| 410 | 442 | ?> |
| 411 | 443 | <div class="form-group"> |
| 412 | 444 | <label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> |
| 413 | 445 | <div class="col-sm-10"> |
| 414 | - <input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) print $owner; ?>" size="15" placeholder="<?php echo _("Owner name"); ?>" /> |
|
| 446 | + <input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) { |
|
| 447 | + print $owner; |
|
| 448 | +} |
|
| 449 | +?>" size="15" placeholder="<?php echo _("Owner name"); ?>" /> |
|
| 415 | 450 | </div> |
| 416 | 451 | </div> |
| 417 | 452 | <?php |
@@ -419,8 +454,14 @@ discard block |
||
| 419 | 454 | ?> |
| 420 | 455 | <div class="form-group"> |
| 421 | 456 | <div class="col-sm-offset-2 col-sm-10"> |
| 422 | - <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 423 | - <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 457 | + <!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) { |
|
| 458 | + if ($_GET['highlights'] == "true"){ print 'checked="checked"'; |
|
| 459 | +} |
|
| 460 | +} ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>--> |
|
| 461 | + <label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) { |
|
| 462 | + if ($_GET['highlights'] == "true"){ print 'checked="checked"'; |
|
| 463 | +} |
|
| 464 | +} ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label> |
|
| 424 | 465 | </div> |
| 425 | 466 | </div> |
| 426 | 467 | </fieldset> |
@@ -434,7 +475,10 @@ discard block |
||
| 434 | 475 | </select> |
| 435 | 476 | </div> |
| 436 | 477 | </div> |
| 437 | - <script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script> |
|
| 478 | + <script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) { |
|
| 479 | + print $airline; |
|
| 480 | +} |
|
| 481 | +?>');</script> |
|
| 438 | 482 | <div class="form-group"> |
| 439 | 483 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 440 | 484 | <div class="col-sm-10"> |
@@ -443,19 +487,34 @@ discard block |
||
| 443 | 487 | </select> |
| 444 | 488 | </div> |
| 445 | 489 | </div> |
| 446 | - <script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script> |
|
| 490 | + <script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) { |
|
| 491 | + print $airline_country; |
|
| 492 | +} |
|
| 493 | +?>');</script> |
|
| 447 | 494 | <div class="form-group"> |
| 448 | 495 | <label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> |
| 449 | 496 | <div class="col-sm-10"> |
| 450 | - <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 497 | + <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) { |
|
| 498 | + print $callsign; |
|
| 499 | +} |
|
| 500 | +?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 451 | 501 | </div> |
| 452 | 502 | </div> |
| 453 | 503 | <div class="form-group"> |
| 454 | 504 | <div class="col-sm-offset-2 col-sm-10"> |
| 455 | 505 | <label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label> |
| 456 | - <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 457 | - <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 458 | - <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 506 | + <label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) { |
|
| 507 | + if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; |
|
| 508 | +} |
|
| 509 | +} ?>> <?php echo _("Only Passenger airlines"); ?></label> |
|
| 510 | + <label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) { |
|
| 511 | + if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; |
|
| 512 | +} |
|
| 513 | +} ?>> <?php echo _("Only Cargo airlines"); ?></label> |
|
| 514 | + <label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) { |
|
| 515 | + if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; |
|
| 516 | +} |
|
| 517 | +} ?>> <?php echo _("Only Military airlines"); ?></label> |
|
| 459 | 518 | </div> |
| 460 | 519 | </div> |
| 461 | 520 | </fieldset> |
@@ -469,7 +528,10 @@ discard block |
||
| 469 | 528 | </select> |
| 470 | 529 | </div> |
| 471 | 530 | </div> |
| 472 | - <script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script> |
|
| 531 | + <script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) { |
|
| 532 | + print $airport_icao; |
|
| 533 | +} |
|
| 534 | +?>');</script> |
|
| 473 | 535 | <div class="form-group"> |
| 474 | 536 | <label class="control-label col-sm-2"><?php echo _("Country"); ?></label> |
| 475 | 537 | <div class="col-sm-10"> |
@@ -478,7 +540,10 @@ discard block |
||
| 478 | 540 | </select> |
| 479 | 541 | </div> |
| 480 | 542 | </div> |
| 481 | - <script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script> |
|
| 543 | + <script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) { |
|
| 544 | + print $airport_country; |
|
| 545 | +} |
|
| 546 | +?>');</script> |
|
| 482 | 547 | </fieldset> |
| 483 | 548 | <fieldset> |
| 484 | 549 | <legend><?php echo _("Route"); ?></legend> |
@@ -490,7 +555,10 @@ discard block |
||
| 490 | 555 | </select> |
| 491 | 556 | </div> |
| 492 | 557 | </div> |
| 493 | - <script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script> |
|
| 558 | + <script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) { |
|
| 559 | + print $departure_airport_route; |
|
| 560 | +} |
|
| 561 | +?>');</script> |
|
| 494 | 562 | <div class="form-group"> |
| 495 | 563 | <label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> |
| 496 | 564 | <div class="col-sm-10"> |
@@ -499,7 +567,10 @@ discard block |
||
| 499 | 567 | </select> |
| 500 | 568 | </div> |
| 501 | 569 | </div> |
| 502 | - <script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script> |
|
| 570 | + <script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) { |
|
| 571 | + print $arrival_airport_route; |
|
| 572 | +} |
|
| 573 | +?>');</script> |
|
| 503 | 574 | </fieldset> |
| 504 | 575 | <fieldset> |
| 505 | 576 | <legend>Altitude</legend> |
@@ -549,19 +620,33 @@ discard block |
||
| 549 | 620 | <div class="form-group"> |
| 550 | 621 | <label class="control-label col-sm-2"><?php echo _("Latitude"); ?></label> |
| 551 | 622 | <div class="col-sm-10"> |
| 552 | - <input type="text" name="origlat" class="form-control" placeholder="<?php echo _("Center point latitude"); ?>" value="<?php if (isset($_GET['origlat'])) print $origlat; ?>" /> |
|
| 623 | + <input type="text" name="origlat" class="form-control" placeholder="<?php echo _("Center point latitude"); ?>" value="<?php if (isset($_GET['origlat'])) { |
|
| 624 | + print $origlat; |
|
| 625 | +} |
|
| 626 | +?>" /> |
|
| 553 | 627 | </div> |
| 554 | 628 | </div> |
| 555 | 629 | <div class="form-group"> |
| 556 | 630 | <label class="control-label col-sm-2"><?php echo _("Longitude"); ?></label> |
| 557 | 631 | <div class="col-sm-10"> |
| 558 | - <input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" value="<?php if (isset($_GET['origlon'])) print $origlon; ?>" /> |
|
| 632 | + <input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" value="<?php if (isset($_GET['origlon'])) { |
|
| 633 | + print $origlon; |
|
| 634 | +} |
|
| 635 | +?>" /> |
|
| 559 | 636 | </div> |
| 560 | 637 | </div> |
| 561 | 638 | <div class="form-group"> |
| 562 | - <label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) print $globalDistanceUnit; else print 'km'; print ')'; ?></label> |
|
| 639 | + <label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) { |
|
| 640 | + print $globalDistanceUnit; |
|
| 641 | +} else { |
|
| 642 | + print 'km'; |
|
| 643 | +} |
|
| 644 | +print ')'; ?></label> |
|
| 563 | 645 | <div class="col-sm-10"> |
| 564 | - <input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" value="<?php if (isset($_GET['distance'])) print $distance; ?>" /> |
|
| 646 | + <input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" value="<?php if (isset($_GET['distance'])) { |
|
| 647 | + print $distance; |
|
| 648 | +} |
|
| 649 | +?>" /> |
|
| 565 | 650 | </div> |
| 566 | 651 | </div> |
| 567 | 652 | </fieldset> |
@@ -572,7 +657,10 @@ discard block |
||
| 572 | 657 | <div class="form-group"> |
| 573 | 658 | <label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> |
| 574 | 659 | <div class="col-sm-10"> |
| 575 | - <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 660 | + <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) { |
|
| 661 | + print $callsign; |
|
| 662 | +} |
|
| 663 | +?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 576 | 664 | </div> |
| 577 | 665 | </div> |
| 578 | 666 | </fieldset> |
@@ -583,7 +671,10 @@ discard block |
||
| 583 | 671 | <div class="form-group"> |
| 584 | 672 | <label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> |
| 585 | 673 | <div class="col-sm-10"> |
| 586 | - <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 674 | + <input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) { |
|
| 675 | + print $callsign; |
|
| 676 | +} |
|
| 677 | +?>" size="8" placeholder="<?php echo _("Callsign"); ?>" /> |
|
| 587 | 678 | </div> |
| 588 | 679 | </div> |
| 589 | 680 | </fieldset> |
@@ -591,7 +682,10 @@ discard block |
||
| 591 | 682 | <div class="form-group"> |
| 592 | 683 | <label class="control-label col-sm-2"><?php echo _("MMSI"); ?></label> |
| 593 | 684 | <div class="col-sm-10"> |
| 594 | - <input type="text" name="mmsi" class="form-control" value="<?php if (isset($_GET['mmsi'])) print $mmsi; ?>" size="8" placeholder="<?php echo _("MMSI"); ?>" /> |
|
| 685 | + <input type="text" name="mmsi" class="form-control" value="<?php if (isset($_GET['mmsi'])) { |
|
| 686 | + print $mmsi; |
|
| 687 | +} |
|
| 688 | +?>" size="8" placeholder="<?php echo _("MMSI"); ?>" /> |
|
| 595 | 689 | </div> |
| 596 | 690 | </div> |
| 597 | 691 | </fieldset> |
@@ -599,7 +693,10 @@ discard block |
||
| 599 | 693 | <div class="form-group"> |
| 600 | 694 | <label class="control-label col-sm-2"><?php echo _("IMO"); ?></label> |
| 601 | 695 | <div class="col-sm-10"> |
| 602 | - <input type="text" name="imo" class="form-control" value="<?php if (isset($_GET['imo'])) print $imo; ?>" size="8" placeholder="<?php echo _("IMO"); ?>" /> |
|
| 696 | + <input type="text" name="imo" class="form-control" value="<?php if (isset($_GET['imo'])) { |
|
| 697 | + print $imo; |
|
| 698 | +} |
|
| 699 | +?>" size="8" placeholder="<?php echo _("IMO"); ?>" /> |
|
| 603 | 700 | </div> |
| 604 | 701 | </div> |
| 605 | 702 | </fieldset> |
@@ -612,7 +709,10 @@ discard block |
||
| 612 | 709 | <label class="control-label col-sm-2"><?php echo _("Start Date"); ?></label> |
| 613 | 710 | <div class="col-sm-10"> |
| 614 | 711 | <div class='input-group date' id='datetimepicker1'> |
| 615 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date']) && $_GET['start_date'] != '') print $start_date; ?>" placeholder="<?php echo _("Start Date/Time"); ?>" /> |
|
| 712 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date']) && $_GET['start_date'] != '') { |
|
| 713 | + print $start_date; |
|
| 714 | +} |
|
| 715 | +?>" placeholder="<?php echo _("Start Date/Time"); ?>" /> |
|
| 616 | 716 | <span class="input-group-addon"> |
| 617 | 717 | <span class="glyphicon glyphicon-calendar"></span> |
| 618 | 718 | </span> |
@@ -623,7 +723,10 @@ discard block |
||
| 623 | 723 | <label class="control-label col-sm-2"><?php echo _("End Date"); ?></label> |
| 624 | 724 | <div class="col-sm-10"> |
| 625 | 725 | <div class='input-group date' id='datetimepicker2'> |
| 626 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date']) && $_GET['end_date'] != '') print $end_date; ?>" placeholder="<?php echo _("End Date/Time"); ?>" /> |
|
| 726 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date']) && $_GET['end_date'] != '') { |
|
| 727 | + print $end_date; |
|
| 728 | +} |
|
| 729 | +?>" placeholder="<?php echo _("End Date/Time"); ?>" /> |
|
| 627 | 730 | <span class="input-group-addon"> |
| 628 | 731 | <span class="glyphicon glyphicon-calendar"></span> |
| 629 | 732 | </span> |
@@ -22,7 +22,9 @@ |
||
| 22 | 22 | print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">'; |
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | - if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 25 | + if (empty($all_manufacturers)) { |
|
| 26 | + $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 27 | + } |
|
| 26 | 28 | foreach($all_manufacturers as $all_manufacturer) |
| 27 | 29 | { |
| 28 | 30 | if($manufacturer == ucwords($all_manufacturer['aircraft_manufacturer'])) |
@@ -8,13 +8,13 @@ discard block |
||
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | -$manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)))); |
|
| 12 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 13 | -$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort); |
|
| 11 | +$manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)))); |
|
| 12 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 13 | +$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort); |
|
| 14 | 14 | |
| 15 | 15 | if (!empty($spotter_array)) |
| 16 | 16 | { |
| 17 | - $title = sprintf(_("Most Common Airlines by Country from %s"),$manufacturer); |
|
| 17 | + $title = sprintf(_("Most Common Airlines by Country from %s"), $manufacturer); |
|
| 18 | 18 | |
| 19 | 19 | require_once('header.php'); |
| 20 | 20 | print '<div class="select-item">'; |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | 25 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 26 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 26 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 27 | 27 | { |
| 28 | - if($manufacturer == ucwords($all_manufacturer['aircraft_manufacturer'])) |
|
| 28 | + if ($manufacturer == ucwords($all_manufacturer['aircraft_manufacturer'])) |
|
| 29 | 29 | { |
| 30 | 30 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 31 | 31 | } else { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | include('manufacturer-sub-menu.php'); |
| 45 | 45 | print '<div class="column">'; |
| 46 | 46 | print '<h2>'._("Most Common Airlines by Country").'</h2>'; |
| 47 | - print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s</strong>."),$manufacturer).'</p>'; |
|
| 47 | + print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s</strong>."), $manufacturer).'</p>'; |
|
| 48 | 48 | $airline_array = $Spotter->countAllAirlineCountriesByManufacturer($manufacturer); |
| 49 | 49 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
| 50 | 50 | print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>'; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | print '<div id="chartCountry" class="chart" width="100%"></div><script>'; |
| 53 | 53 | print 'var series = ['; |
| 54 | 54 | $country_data = ''; |
| 55 | - foreach($airline_array as $airline_item) |
|
| 55 | + foreach ($airline_array as $airline_item) |
|
| 56 | 56 | { |
| 57 | 57 | $country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airline_item['airline_country_count'].'],'; |
| 58 | 58 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | print '</thead>'; |
| 100 | 100 | print '<tbody>'; |
| 101 | 101 | $i = 1; |
| 102 | - foreach($airline_array as $airline_item) |
|
| 102 | + foreach ($airline_array as $airline_item) |
|
| 103 | 103 | { |
| 104 | 104 | print '<tr>'; |
| 105 | 105 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['aircraft_manufacturer'])) { |
| 7 | - header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | 11 | $manufacturer = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)))); |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['country'])) { |
| 6 | - header('Location: '.$globalURL.'/country'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/country'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)))); |
@@ -7,8 +7,8 @@ discard block |
||
| 7 | 7 | die(); |
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | -$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)))); |
|
| 11 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 10 | +$country = ucwords(str_replace("-", " ", urldecode(filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)))); |
|
| 11 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 12 | 12 | if (isset($_GET['sort'])) { |
| 13 | 13 | $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort); |
| 14 | 14 | } else { |
@@ -17,16 +17,16 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | if (!empty($spotter_array)) |
| 19 | 19 | { |
| 20 | - $title = sprintf(_("Most Common Aircraft by registration from %s"),$country); |
|
| 20 | + $title = sprintf(_("Most Common Aircraft by registration from %s"), $country); |
|
| 21 | 21 | require_once('header.php'); |
| 22 | 22 | print '<div class="select-item">'; |
| 23 | 23 | print '<form action="'.$globalURL.'/country" method="post">'; |
| 24 | 24 | print '<select name="country" class="selectpicker" data-live-search="true">'; |
| 25 | 25 | print '<option></option>'; |
| 26 | 26 | $all_countries = $Spotter->getAllCountries(); |
| 27 | - foreach($all_countries as $all_country) |
|
| 27 | + foreach ($all_countries as $all_country) |
|
| 28 | 28 | { |
| 29 | - if($country == $all_country['country']) |
|
| 29 | + if ($country == $all_country['country']) |
|
| 30 | 30 | { |
| 31 | 31 | print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>'; |
| 32 | 32 | } else { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if ($_GET['country'] != "NA") |
| 42 | 42 | { |
| 43 | 43 | print '<div class="info column">'; |
| 44 | - print '<h1>'.sprintf(_("Airports & Airlines from %s"),$country).'</h1>'; |
|
| 44 | + print '<h1>'.sprintf(_("Airports & Airlines from %s"), $country).'</h1>'; |
|
| 45 | 45 | print '</div>'; |
| 46 | 46 | } else { |
| 47 | 47 | print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>'; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | include('country-sub-menu.php'); |
| 51 | 51 | print '<div class="column">'; |
| 52 | 52 | print '<h2>'._("Most Common Aircraft by Registration").'</h2>'; |
| 53 | - print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."),$country).'</p>'; |
|
| 53 | + print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of airlines or departure/arrival airports from <strong>%s</strong>."), $country).'</p>'; |
|
| 54 | 54 | $aircraft_array = $Spotter->countAllAircraftRegistrationByCountry($country); |
| 55 | 55 | if (!empty($aircraft_array)) |
| 56 | 56 | { |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | print '</thead>'; |
| 66 | 66 | print '<tbody>'; |
| 67 | 67 | $i = 1; |
| 68 | - foreach($aircraft_array as $aircraft_item) |
|
| 68 | + foreach ($aircraft_array as $aircraft_item) |
|
| 69 | 69 | { |
| 70 | 70 | print '<tr>'; |
| 71 | 71 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -15,9 +15,9 @@ discard block |
||
| 15 | 15 | </span> |
| 16 | 16 | <div class="sub-menu sub-menu-container"> |
| 17 | 17 | <ul class="nav nav-pills"> |
| 18 | - <li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 18 | + <li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 19 | 19 | <li class="dropdown"> |
| 20 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 20 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 21 | 21 | <?php _("Airport"); ?> <span class="caret"></span> |
| 22 | 22 | </a> |
| 23 | 23 | <ul class="dropdown-menu" role="menu"> |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | <li><a href="<?php print $globalURL; ?>/registration/statistics/arrival-airport-country/<?php print $registration; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
| 28 | 28 | </ul> |
| 29 | 29 | </li> |
| 30 | - <li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
| 31 | - <li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
| 30 | + <li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
| 31 | + <li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $registration; ?>" <?php if (strtolower($current_page) == "registration-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
| 32 | 32 | </ul> |
| 33 | 33 | </div> |
| 34 | 34 | \ No newline at end of file |
@@ -147,18 +147,18 @@ |
||
| 147 | 147 | |
| 148 | 148 | <?php |
| 149 | 149 | if (isset($_GET['image']) && isset($_GET['q'])) { |
| 150 | - $image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING); |
|
| 151 | - $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
|
| 150 | + $image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING); |
|
| 151 | + $q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 152 | 152 | ?> |
| 153 | 153 | $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>&q=<?php print $q; ?>", function( data ) { |
| 154 | 154 | <?php |
| 155 | 155 | } elseif (isset($_GET['image'])) { |
| 156 | - $image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING); |
|
| 156 | + $image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING); |
|
| 157 | 157 | ?> |
| 158 | 158 | $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>", function( data ) { |
| 159 | 159 | <?php |
| 160 | 160 | } elseif (isset($_GET['q'])) { |
| 161 | - $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
|
| 161 | + $q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING); |
|
| 162 | 162 | ?> |
| 163 | 163 | $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&q=<?php print $q; ?>", function( data ) { |
| 164 | 164 | <?php |
