Ysurac /
FlightAirMap
@@ -553,8 +553,8 @@ discard block |
||
| 553 | 553 | } |
| 554 | 554 | } |
| 555 | 555 | <?php |
| 556 | - } else { |
|
| 557 | - ?> |
|
| 556 | + } else { |
|
| 557 | + ?> |
|
| 558 | 558 | if (map.getZoom() > 7) { |
| 559 | 559 | var style = { |
| 560 | 560 | "color": "#1a3151", |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | layer_satellite_data.addLayer(layer); |
| 574 | 574 | } |
| 575 | 575 | <?php |
| 576 | - } |
|
| 576 | + } |
|
| 577 | 577 | ?> |
| 578 | 578 | } |
| 579 | 579 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | require_once('../require/settings.php'); |
| 3 | 3 | require_once('../require/class.Language.php'); |
| 4 | 4 | |
| 5 | -setcookie("MapFormat",'2d'); |
|
| 5 | +setcookie("MapFormat", '2d'); |
|
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | 8 | if (!isset($globalJsonCompress)) $compress = true; |
@@ -18,10 +18,10 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | <?php |
| 20 | 20 | if (isset($_GET['famsatid'])) { |
| 21 | - $famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING); |
|
| 21 | + $famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING); |
|
| 22 | 22 | } |
| 23 | 23 | if (isset($_GET['ident'])) { |
| 24 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 24 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 25 | 25 | } |
| 26 | 26 | if (!isset($ident) && !isset($famsatid)) { |
| 27 | 27 | ?> |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | <?php |
| 195 | 195 | } else { |
| 196 | 196 | ?> |
| 197 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 197 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 198 | 198 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 199 | 199 | <?php |
| 200 | 200 | } |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | /* |
| 211 | 211 | shadowUrl: iconURLShadowpath, |
| 212 | 212 | shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>], |
| 213 | - shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 213 | + shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 214 | 214 | */ |
| 215 | 215 | }) |
| 216 | 216 | }) |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | <?php |
| 251 | 251 | } else { |
| 252 | 252 | ?> |
| 253 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 253 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 254 | 254 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 255 | 255 | <?php |
| 256 | 256 | } |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | <?php |
| 306 | 306 | } else { |
| 307 | 307 | ?> |
| 308 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 308 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 309 | 309 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 310 | 310 | <?php |
| 311 | 311 | } |
@@ -5,8 +5,11 @@ discard block |
||
| 5 | 5 | setcookie("MapFormat",'2d'); |
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 9 | -else $compress = $globalJsonCompress; |
|
| 8 | +if (!isset($globalJsonCompress)) { |
|
| 9 | + $compress = true; |
|
| 10 | +} else { |
|
| 11 | + $compress = $globalJsonCompress; |
|
| 12 | +} |
|
| 10 | 13 | $compress = false; |
| 11 | 14 | ?> |
| 12 | 15 | |
@@ -159,9 +162,13 @@ discard block |
||
| 159 | 162 | if (callsign != ""){ markerSatelliteLabel += callsign; } |
| 160 | 163 | if (type != ""){ markerSatelliteLabel += ' - '+type; } |
| 161 | 164 | <?php |
| 162 | - if (isset($_COOKIE['SatelliteIconColor'])) $IconColor = $_COOKIE['SatelliteIconColor']; |
|
| 163 | - elseif (isset($globalSatelliteIconColor)) $IconColor = $globalSatelliteIconColor; |
|
| 164 | - else $IconColor = '1a3151'; |
|
| 165 | + if (isset($_COOKIE['SatelliteIconColor'])) { |
|
| 166 | + $IconColor = $_COOKIE['SatelliteIconColor']; |
|
| 167 | + } elseif (isset($globalSatelliteIconColor)) { |
|
| 168 | + $IconColor = $globalSatelliteIconColor; |
|
| 169 | + } else { |
|
| 170 | + $IconColor = '1a3151'; |
|
| 171 | + } |
|
| 165 | 172 | if (!isset($ident) && !isset($famsatid)) { |
| 166 | 173 | ?> |
| 167 | 174 | info_satellite_update(feature.properties.fc); |
@@ -195,7 +202,12 @@ discard block |
||
| 195 | 202 | <?php |
| 196 | 203 | } else { |
| 197 | 204 | ?> |
| 198 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 205 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 206 | + print $archiveupdatetime*1000; |
|
| 207 | +} else { |
|
| 208 | + print $globalMapRefresh*1000+20000; |
|
| 209 | +} |
|
| 210 | +?>+feature.properties.sqt*1000); |
|
| 199 | 211 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 200 | 212 | <?php |
| 201 | 213 | } |
@@ -251,7 +263,12 @@ discard block |
||
| 251 | 263 | <?php |
| 252 | 264 | } else { |
| 253 | 265 | ?> |
| 254 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 266 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 267 | + print $archiveupdatetime*1000; |
|
| 268 | +} else { |
|
| 269 | + print $globalMapRefresh*1000+20000; |
|
| 270 | +} |
|
| 271 | +?>+feature.properties.sqt*1000); |
|
| 255 | 272 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 256 | 273 | <?php |
| 257 | 274 | } |
@@ -306,7 +323,12 @@ discard block |
||
| 306 | 323 | <?php |
| 307 | 324 | } else { |
| 308 | 325 | ?> |
| 309 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 326 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 327 | + print $archiveupdatetime*1000; |
|
| 328 | +} else { |
|
| 329 | + print $globalMapRefresh*1000+20000; |
|
| 330 | +} |
|
| 331 | +?>+feature.properties.sqt*1000); |
|
| 310 | 332 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 311 | 333 | <?php |
| 312 | 334 | } |
@@ -601,14 +623,24 @@ discard block |
||
| 601 | 623 | if (isset($archive) && $archive) { |
| 602 | 624 | ?> |
| 603 | 625 | //then load it again every 30 seconds |
| 604 | -// var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>); |
|
| 626 | +// var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) { |
|
| 627 | + print ($globalMapRefresh*1000)/2; |
|
| 628 | +} else { |
|
| 629 | + print '15000'; |
|
| 630 | +} |
|
| 631 | +?>); |
|
| 605 | 632 | reloadSatellitePage = setInterval(function(){if (noTimeout) updateSat(0)},<?php print $archiveupdatetime*1000; ?>); |
| 606 | 633 | <?php |
| 607 | 634 | } else { |
| 608 | 635 | ?> |
| 609 | 636 | //then load it again every 30 seconds |
| 610 | 637 | reloadSatellitePage = setInterval( |
| 611 | - function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 638 | + function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) { |
|
| 639 | + print $globalMapRefresh*1000; |
|
| 640 | +} else { |
|
| 641 | + print '30000'; |
|
| 642 | +} |
|
| 643 | +?>); |
|
| 612 | 644 | <?php |
| 613 | 645 | } |
| 614 | 646 | ?> |
@@ -74,7 +74,9 @@ discard block |
||
| 74 | 74 | if ($error != '') { |
| 75 | 75 | $_SESSION['error'] = $error; |
| 76 | 76 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
| 77 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 77 | + } else { |
|
| 78 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 79 | + } |
|
| 78 | 80 | $_SESSION['install'] = 'database_import'; |
| 79 | 81 | $_SESSION['next'] = 'Create and import tables'; |
| 80 | 82 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -89,7 +91,9 @@ discard block |
||
| 89 | 91 | if ($error != '') { |
| 90 | 92 | $_SESSION['error'] = $error; |
| 91 | 93 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
| 92 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 94 | + } else { |
|
| 95 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 96 | + } |
|
| 93 | 97 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 94 | 98 | $_SESSION['install'] = 'populate'; |
| 95 | 99 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -104,7 +108,9 @@ discard block |
||
| 104 | 108 | if ($error != '') { |
| 105 | 109 | $_SESSION['error'] = $error; |
| 106 | 110 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
| 107 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 111 | + } else { |
|
| 112 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 113 | + } |
|
| 108 | 114 | $_SESSION['install'] = 'sources'; |
| 109 | 115 | $_SESSION['next'] = 'Insert data in source table'; |
| 110 | 116 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -117,7 +123,9 @@ discard block |
||
| 117 | 123 | if ($error != '') { |
| 118 | 124 | $_SESSION['error'] = $error; |
| 119 | 125 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
| 120 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 126 | + } else { |
|
| 127 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 128 | + } |
|
| 121 | 129 | $_SESSION['install'] = 'airspace'; |
| 122 | 130 | $_SESSION['next'] = 'Populate airspace table'; |
| 123 | 131 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -129,7 +137,9 @@ discard block |
||
| 129 | 137 | if ($error != '') { |
| 130 | 138 | $_SESSION['error'] = $error; |
| 131 | 139 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
| 132 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 140 | + } else { |
|
| 141 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 142 | + } |
|
| 133 | 143 | $_SESSION['install'] = 'countries'; |
| 134 | 144 | $_SESSION['next'] = 'Populate countries table'; |
| 135 | 145 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -141,7 +151,9 @@ discard block |
||
| 141 | 151 | if ($error != '') { |
| 142 | 152 | $_SESSION['error'] = $error; |
| 143 | 153 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 144 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 154 | + } else { |
|
| 155 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 156 | + } |
|
| 145 | 157 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 146 | 158 | $_SESSION['install'] = 'notam'; |
| 147 | 159 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
@@ -173,7 +185,9 @@ discard block |
||
| 173 | 185 | if ($error != '') { |
| 174 | 186 | $_SESSION['error'] = $error; |
| 175 | 187 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
| 176 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 188 | + } else { |
|
| 189 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 190 | + } |
|
| 177 | 191 | $_SESSION['install'] = 'populate_flarm'; |
| 178 | 192 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 179 | 193 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -194,18 +208,26 @@ discard block |
||
| 194 | 208 | if ($error != '') { |
| 195 | 209 | $_SESSION['error'] = $error; |
| 196 | 210 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
| 197 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 211 | + } else { |
|
| 212 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 213 | + } |
|
| 198 | 214 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 199 | 215 | $_SESSION['install'] = 'vatsim'; |
| 200 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 201 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 216 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 217 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 218 | + } else { |
|
| 219 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 220 | + } |
|
| 202 | 221 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 203 | 222 | $_SESSION['install'] = 'vatsim'; |
| 204 | 223 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 205 | 224 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 206 | 225 | $_SESSION['install'] = 'vatsim'; |
| 207 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 208 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 226 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 227 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 228 | + } else { |
|
| 229 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 230 | + } |
|
| 209 | 231 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 210 | 232 | $_SESSION['install'] = 'vatsim'; |
| 211 | 233 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -230,7 +252,9 @@ discard block |
||
| 230 | 252 | if ($error != '') { |
| 231 | 253 | $_SESSION['error'] = $error; |
| 232 | 254 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
| 233 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 255 | + } else { |
|
| 256 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 257 | + } |
|
| 234 | 258 | $_SESSION['install'] = 'translation'; |
| 235 | 259 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 236 | 260 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -250,7 +274,9 @@ discard block |
||
| 250 | 274 | if ($error != '') { |
| 251 | 275 | $_SESSION['error'] = $error; |
| 252 | 276 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
| 253 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 277 | + } else { |
|
| 278 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 279 | + } |
|
| 254 | 280 | if ($_SESSION['waypoints'] == 1) { |
| 255 | 281 | $_SESSION['install'] = 'waypoints'; |
| 256 | 282 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -283,7 +309,9 @@ discard block |
||
| 283 | 309 | if ($error != '') { |
| 284 | 310 | $_SESSION['error'] = $error; |
| 285 | 311 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
| 286 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 312 | + } else { |
|
| 313 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 314 | + } |
|
| 287 | 315 | $_SESSION['install'] = 'sources'; |
| 288 | 316 | $_SESSION['next'] = 'Insert data in source table'; |
| 289 | 317 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -304,12 +332,16 @@ discard block |
||
| 304 | 332 | if ($error != '') { |
| 305 | 333 | $_SESSION['error'] = $error; |
| 306 | 334 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
| 307 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 335 | + } else { |
|
| 336 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 337 | + } |
|
| 308 | 338 | } else { |
| 309 | 339 | if ($error != '') { |
| 310 | 340 | $_SESSION['error'] = $error; |
| 311 | 341 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
| 312 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 342 | + } else { |
|
| 343 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 344 | + } |
|
| 313 | 345 | } |
| 314 | 346 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 315 | 347 | $_SESSION['install'] = 'owner'; |
@@ -357,7 +389,9 @@ discard block |
||
| 357 | 389 | $Source = new Source(); |
| 358 | 390 | $Source->deleteAllLocation(); |
| 359 | 391 | foreach ($sources as $src) { |
| 360 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 392 | + if (isset($src['latitude']) && $src['latitude'] != '') { |
|
| 393 | + $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 394 | + } |
|
| 361 | 395 | } |
| 362 | 396 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
| 363 | 397 | unset($_SESSION['sources']); |
@@ -368,15 +402,21 @@ discard block |
||
| 368 | 402 | */ |
| 369 | 403 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 370 | 404 | $_SESSION['install'] = 'vatsim'; |
| 371 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 372 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 405 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 406 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 407 | + } else { |
|
| 408 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 409 | + } |
|
| 373 | 410 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 374 | 411 | $_SESSION['install'] = 'vatsim'; |
| 375 | 412 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 376 | 413 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 377 | 414 | $_SESSION['install'] = 'vatsim'; |
| 378 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 379 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 415 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 416 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 417 | + } else { |
|
| 418 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 419 | + } |
|
| 380 | 420 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 381 | 421 | $_SESSION['install'] = 'vatsim'; |
| 382 | 422 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -397,33 +437,43 @@ discard block |
||
| 397 | 437 | if ($error != '') { |
| 398 | 438 | $_SESSION['error'] = $error; |
| 399 | 439 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 400 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 440 | + } else { |
|
| 441 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 442 | + } |
|
| 401 | 443 | } else { |
| 402 | 444 | $error .= update_db::update_vatsim(); |
| 403 | 445 | if ($error != '') { |
| 404 | 446 | $_SESSION['error'] = $error; |
| 405 | 447 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 406 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 448 | + } else { |
|
| 449 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 450 | + } |
|
| 407 | 451 | } |
| 408 | 452 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 409 | 453 | $error .= update_db::update_vatsim(); |
| 410 | 454 | if ($error != '') { |
| 411 | 455 | $_SESSION['error'] = $error; |
| 412 | 456 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 413 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 457 | + } else { |
|
| 458 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 459 | + } |
|
| 414 | 460 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 415 | 461 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 416 | 462 | $error .= update_db::update_IVAO(); |
| 417 | 463 | if ($error != '') { |
| 418 | 464 | $_SESSION['error'] = $error; |
| 419 | 465 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 420 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 466 | + } else { |
|
| 467 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 468 | + } |
|
| 421 | 469 | } else { |
| 422 | 470 | $error .= update_db::update_vatsim(); |
| 423 | 471 | if ($error != '') { |
| 424 | 472 | $_SESSION['error'] = $error; |
| 425 | 473 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
| 426 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 474 | + } else { |
|
| 475 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 476 | + } |
|
| 427 | 477 | } |
| 428 | 478 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 429 | 479 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | if ($check_version == '0') { |
| 85 | 85 | |
| 86 | 86 | if ($globalDBdriver == 'mysql') { |
| 87 | - $error .= create_db::import_all_db('../db/'); |
|
| 87 | + $error .= create_db::import_all_db('../db/'); |
|
| 88 | 88 | } elseif ($globalDBdriver == 'pgsql') { |
| 89 | - $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 89 | + $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 90 | 90 | } |
| 91 | 91 | if ($error != '') { |
| 92 | 92 | $_SESSION['error'] = $error; |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | $_SESSION['install'] = 'populate'; |
| 97 | 97 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
| 98 | 98 | } else { |
| 99 | - $_SESSION['install'] = 'sources'; |
|
| 100 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 99 | + $_SESSION['install'] = 'sources'; |
|
| 100 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 101 | 101 | } |
| 102 | 102 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 103 | 103 | print json_encode($result); |
@@ -149,21 +149,21 @@ discard block |
||
| 149 | 149 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 150 | 150 | } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
| 151 | 151 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 152 | - $_SESSION['install'] = 'notam'; |
|
| 153 | - $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 154 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 155 | - print json_encode($result); |
|
| 152 | + $_SESSION['install'] = 'notam'; |
|
| 153 | + $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 154 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 155 | + print json_encode($result); |
|
| 156 | 156 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 157 | - $_SESSION['install'] = 'owner'; |
|
| 158 | - $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 159 | - unset($_SESSION['owner']); |
|
| 160 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 161 | - print json_encode($result); |
|
| 157 | + $_SESSION['install'] = 'owner'; |
|
| 158 | + $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 159 | + unset($_SESSION['owner']); |
|
| 160 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 161 | + print json_encode($result); |
|
| 162 | 162 | } else { |
| 163 | - $_SESSION['install'] = 'sources'; |
|
| 164 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 165 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 166 | - print json_encode($result); |
|
| 163 | + $_SESSION['install'] = 'sources'; |
|
| 164 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 165 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 166 | + print json_encode($result); |
|
| 167 | 167 | } |
| 168 | 168 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 169 | 169 | if (!is_writable('tmp')) { |
@@ -70,15 +70,15 @@ discard block |
||
| 70 | 70 | $globalDebug = FALSE; |
| 71 | 71 | $dbroot = $_SESSION['database_root']; |
| 72 | 72 | $dbrootpass = $_SESSION['database_rootpass']; |
| 73 | - $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost); |
|
| 73 | + $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost); |
|
| 74 | 74 | sleep(5); |
| 75 | 75 | if ($error != '') { |
| 76 | 76 | $_SESSION['error'] = $error; |
| 77 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
|
| 78 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 77 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database')); |
|
| 78 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database')); |
|
| 79 | 79 | $_SESSION['install'] = 'database_import'; |
| 80 | 80 | $_SESSION['next'] = 'Create and import tables'; |
| 81 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 81 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 82 | 82 | print json_encode($result); |
| 83 | 83 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 84 | 84 | $globalDebug = FALSE; |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | if ($error != '') { |
| 94 | 94 | $_SESSION['error'] = $error; |
| 95 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
|
| 96 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 95 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables')); |
|
| 96 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables')); |
|
| 97 | 97 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 98 | 98 | $_SESSION['install'] = 'populate'; |
| 99 | 99 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -101,23 +101,23 @@ discard block |
||
| 101 | 101 | $_SESSION['install'] = 'sources'; |
| 102 | 102 | $_SESSION['next'] = 'Insert data in source table'; |
| 103 | 103 | } |
| 104 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 104 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 105 | 105 | print json_encode($result); |
| 106 | 106 | } elseif (!is_numeric($check_version)) { |
| 107 | 107 | $error .= $check_version; |
| 108 | 108 | $_SESSION['error'] = $error; |
| 109 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
|
| 110 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 109 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables')); |
|
| 110 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 111 | 111 | print json_encode($result); |
| 112 | 112 | } else { |
| 113 | 113 | $error .= update_schema::check_version(true); |
| 114 | 114 | if ($error != '') { |
| 115 | 115 | $_SESSION['error'] = $error; |
| 116 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
|
| 117 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 116 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed')); |
|
| 117 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed')); |
|
| 118 | 118 | $_SESSION['install'] = 'sources'; |
| 119 | 119 | $_SESSION['next'] = 'Insert data in source table'; |
| 120 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 120 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 121 | 121 | print json_encode($result); |
| 122 | 122 | } |
| 123 | 123 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') { |
@@ -126,11 +126,11 @@ discard block |
||
| 126 | 126 | $error .= update_db::update_waypoints(); |
| 127 | 127 | if ($error != '') { |
| 128 | 128 | $_SESSION['error'] = $error; |
| 129 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
|
| 130 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 129 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database')); |
|
| 130 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database')); |
|
| 131 | 131 | $_SESSION['install'] = 'airspace'; |
| 132 | 132 | $_SESSION['next'] = 'Populate airspace table'; |
| 133 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 133 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 134 | 134 | print json_encode($result); |
| 135 | 135 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') { |
| 136 | 136 | include_once('class.update_db.php'); |
@@ -138,11 +138,11 @@ discard block |
||
| 138 | 138 | $error .= update_db::update_airspace_fam(); |
| 139 | 139 | if ($error != '') { |
| 140 | 140 | $_SESSION['error'] = $error; |
| 141 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
|
| 142 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 141 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate airspace database')); |
|
| 142 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database')); |
|
| 143 | 143 | $_SESSION['install'] = 'countries'; |
| 144 | 144 | $_SESSION['next'] = 'Populate countries table'; |
| 145 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 145 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 146 | 146 | print json_encode($result); |
| 147 | 147 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') { |
| 148 | 148 | include_once('class.update_db.php'); |
@@ -150,31 +150,31 @@ discard block |
||
| 150 | 150 | $error .= update_db::update_countries(); |
| 151 | 151 | if ($error != '') { |
| 152 | 152 | $_SESSION['error'] = $error; |
| 153 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
|
| 154 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 153 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database')); |
|
| 154 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database')); |
|
| 155 | 155 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 156 | 156 | $_SESSION['install'] = 'notam'; |
| 157 | 157 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
| 158 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 158 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 159 | 159 | print json_encode($result); |
| 160 | 160 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 161 | 161 | $_SESSION['install'] = 'owner'; |
| 162 | 162 | $_SESSION['next'] = 'Populate owner table with externals data'; |
| 163 | 163 | unset($_SESSION['owner']); |
| 164 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 164 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 165 | 165 | print json_encode($result); |
| 166 | 166 | } else { |
| 167 | 167 | $_SESSION['install'] = 'sources'; |
| 168 | 168 | $_SESSION['next'] = 'Insert data in source table'; |
| 169 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 169 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 170 | 170 | print json_encode($result); |
| 171 | 171 | } |
| 172 | 172 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 173 | 173 | if (!is_writable('tmp')) { |
| 174 | 174 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 175 | 175 | $_SESSION['error'] = $error; |
| 176 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 177 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 176 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 177 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 178 | 178 | print json_encode($result); |
| 179 | 179 | } else { |
| 180 | 180 | include_once('class.update_db.php'); |
@@ -182,19 +182,19 @@ discard block |
||
| 182 | 182 | $error .= update_db::update_ModeS_fam(); |
| 183 | 183 | if ($error != '') { |
| 184 | 184 | $_SESSION['error'] = $error; |
| 185 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 186 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 185 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 186 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 187 | 187 | $_SESSION['install'] = 'populate_flarm'; |
| 188 | 188 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 189 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 189 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 190 | 190 | print json_encode($result); |
| 191 | 191 | } |
| 192 | 192 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
| 193 | 193 | if (!is_writable('tmp')) { |
| 194 | 194 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 195 | 195 | $_SESSION['error'] = $error; |
| 196 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 197 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 196 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 197 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 198 | 198 | print json_encode($result); |
| 199 | 199 | } else { |
| 200 | 200 | include_once('class.update_db.php'); |
@@ -203,8 +203,8 @@ discard block |
||
| 203 | 203 | $error .= update_db::update_ModeS_ogn(); |
| 204 | 204 | if ($error != '') { |
| 205 | 205 | $_SESSION['error'] = $error; |
| 206 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 207 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 206 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 207 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 208 | 208 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 209 | 209 | $_SESSION['install'] = 'vatsim'; |
| 210 | 210 | if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
@@ -223,15 +223,15 @@ discard block |
||
| 223 | 223 | $_SESSION['install'] = 'routes'; |
| 224 | 224 | $_SESSION['next'] = 'Populate routes table with externals data'; |
| 225 | 225 | } |
| 226 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 226 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 227 | 227 | print json_encode($result); |
| 228 | 228 | } |
| 229 | 229 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
| 230 | 230 | if (!is_writable('tmp')) { |
| 231 | 231 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 232 | 232 | $_SESSION['error'] = $error; |
| 233 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 234 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 233 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 234 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 235 | 235 | print json_encode($result); |
| 236 | 236 | } else { |
| 237 | 237 | include_once('class.update_db.php'); |
@@ -239,19 +239,19 @@ discard block |
||
| 239 | 239 | $error .= update_db::update_routes_fam(); |
| 240 | 240 | if ($error != '') { |
| 241 | 241 | $_SESSION['error'] = $error; |
| 242 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
|
| 243 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 242 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data')); |
|
| 243 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data')); |
|
| 244 | 244 | $_SESSION['install'] = 'translation'; |
| 245 | 245 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 246 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 246 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 247 | 247 | print json_encode($result); |
| 248 | 248 | } |
| 249 | 249 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') { |
| 250 | 250 | if (!is_writable('tmp')) { |
| 251 | 251 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 252 | 252 | $_SESSION['error'] = $error; |
| 253 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
| 254 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 253 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
| 254 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 255 | 255 | print json_encode($result); |
| 256 | 256 | } else { |
| 257 | 257 | include_once('class.update_db.php'); |
@@ -259,8 +259,8 @@ discard block |
||
| 259 | 259 | $error .= update_db::update_translation_fam(); |
| 260 | 260 | if ($error != '') { |
| 261 | 261 | $_SESSION['error'] = $error; |
| 262 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
| 263 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 262 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
| 263 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data')); |
|
| 264 | 264 | if ($_SESSION['waypoints'] == 1) { |
| 265 | 265 | $_SESSION['install'] = 'waypoints'; |
| 266 | 266 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -276,15 +276,15 @@ discard block |
||
| 276 | 276 | $_SESSION['install'] = 'sources'; |
| 277 | 277 | $_SESSION['next'] = 'Insert data in source table'; |
| 278 | 278 | } |
| 279 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 279 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 280 | 280 | print json_encode($result); |
| 281 | 281 | } |
| 282 | 282 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
| 283 | 283 | if (!is_writable('tmp')) { |
| 284 | 284 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 285 | 285 | $_SESSION['error'] = $error; |
| 286 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
| 287 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 286 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
| 287 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 288 | 288 | print json_encode($result); |
| 289 | 289 | } else { |
| 290 | 290 | include_once('class.update_db.php'); |
@@ -292,19 +292,19 @@ discard block |
||
| 292 | 292 | $error = update_db::update_owner_fam(); |
| 293 | 293 | if ($error != '') { |
| 294 | 294 | $_SESSION['error'] = $error; |
| 295 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
| 296 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 295 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
| 296 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data')); |
|
| 297 | 297 | $_SESSION['install'] = 'sources'; |
| 298 | 298 | $_SESSION['next'] = 'Insert data in source table'; |
| 299 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 299 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 300 | 300 | print json_encode($result); |
| 301 | 301 | } |
| 302 | 302 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
| 303 | 303 | if (!is_writable('tmp')) { |
| 304 | 304 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 305 | 305 | $_SESSION['error'] = $error; |
| 306 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
| 307 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 306 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
| 307 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 308 | 308 | print json_encode($result); |
| 309 | 309 | } else { |
| 310 | 310 | include_once('class.update_db.php'); |
@@ -313,24 +313,24 @@ discard block |
||
| 313 | 313 | $error .= update_db::update_notam(); |
| 314 | 314 | if ($error != '') { |
| 315 | 315 | $_SESSION['error'] = $error; |
| 316 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
| 317 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 316 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
| 317 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data')); |
|
| 318 | 318 | } else { |
| 319 | 319 | if ($error != '') { |
| 320 | 320 | $_SESSION['error'] = $error; |
| 321 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
|
| 322 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 321 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)')); |
|
| 322 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)')); |
|
| 323 | 323 | } |
| 324 | 324 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 325 | 325 | $_SESSION['install'] = 'owner'; |
| 326 | 326 | $_SESSION['next'] = 'Populate owner table'; |
| 327 | 327 | unset($_SESSION['owner']); |
| 328 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 328 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 329 | 329 | print json_encode($result); |
| 330 | 330 | } else { |
| 331 | 331 | $_SESSION['install'] = 'sources'; |
| 332 | 332 | $_SESSION['next'] = 'Insert data in source table'; |
| 333 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 333 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 334 | 334 | print json_encode($result); |
| 335 | 335 | } |
| 336 | 336 | } |
@@ -367,9 +367,9 @@ discard block |
||
| 367 | 367 | $Source = new Source(); |
| 368 | 368 | $Source->deleteAllLocation(); |
| 369 | 369 | foreach ($sources as $src) { |
| 370 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 370 | + if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png'); |
|
| 371 | 371 | } |
| 372 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 372 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table')); |
|
| 373 | 373 | unset($_SESSION['sources']); |
| 374 | 374 | } |
| 375 | 375 | /* |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | $_SESSION['install'] = 'finish'; |
| 395 | 395 | $_SESSION['next'] = 'finish'; |
| 396 | 396 | } |
| 397 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 397 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 398 | 398 | print json_encode($result); |
| 399 | 399 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') { |
| 400 | 400 | include_once('../install/class.create_db.php'); |
@@ -406,48 +406,48 @@ discard block |
||
| 406 | 406 | $error .= update_db::update_IVAO(); |
| 407 | 407 | if ($error != '') { |
| 408 | 408 | $_SESSION['error'] = $error; |
| 409 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
| 410 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 409 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
| 410 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 411 | 411 | } else { |
| 412 | 412 | $error .= update_db::update_vatsim(); |
| 413 | 413 | if ($error != '') { |
| 414 | 414 | $_SESSION['error'] = $error; |
| 415 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
| 416 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 415 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
| 416 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 417 | 417 | } |
| 418 | 418 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 419 | 419 | $error .= update_db::update_vatsim(); |
| 420 | 420 | if ($error != '') { |
| 421 | 421 | $_SESSION['error'] = $error; |
| 422 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
| 423 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 422 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
| 423 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 424 | 424 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 425 | 425 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 426 | 426 | $error .= update_db::update_IVAO(); |
| 427 | 427 | if ($error != '') { |
| 428 | 428 | $_SESSION['error'] = $error; |
| 429 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
| 430 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 429 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
| 430 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 431 | 431 | } else { |
| 432 | 432 | $error .= update_db::update_vatsim(); |
| 433 | 433 | if ($error != '') { |
| 434 | 434 | $_SESSION['error'] = $error; |
| 435 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
|
| 436 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 435 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)')); |
|
| 436 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)')); |
|
| 437 | 437 | } |
| 438 | 438 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 439 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
|
| 439 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data')); |
|
| 440 | 440 | } |
| 441 | 441 | //$_SESSION['install'] = 'routes'; |
| 442 | 442 | //$_SESSION['next'] = 'Populate routes table with externals data'; |
| 443 | 443 | $_SESSION['install'] = 'finish'; |
| 444 | 444 | $_SESSION['next'] = 'finish'; |
| 445 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 445 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 446 | 446 | print json_encode($result); |
| 447 | 447 | } else { |
| 448 | 448 | //unset($_SESSION['install']); |
| 449 | 449 | $_SESSION['error'] = 'Unknwon task : '.$_SESSION['install']; |
| 450 | - $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish'); |
|
| 450 | + $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish'); |
|
| 451 | 451 | print json_encode($result); |
| 452 | 452 | } |
| 453 | 453 | ?> |
| 454 | 454 | \ No newline at end of file |
@@ -8,25 +8,25 @@ discard block |
||
| 8 | 8 | * @param string $filename |
| 9 | 9 | */ |
| 10 | 10 | public static function import_file($filename) { |
| 11 | - $filename = filter_var($filename,FILTER_SANITIZE_STRING); |
|
| 11 | + $filename = filter_var($filename, FILTER_SANITIZE_STRING); |
|
| 12 | 12 | $Connection = new Connection(); |
| 13 | 13 | if (!$Connection->connectionExists()) return 'error: DB connection failed'; |
| 14 | 14 | //Connection::$db->beginTransaction(); |
| 15 | 15 | $templine = ''; |
| 16 | - $handle = @fopen($filename,"r"); |
|
| 16 | + $handle = @fopen($filename, "r"); |
|
| 17 | 17 | if ($handle) { |
| 18 | 18 | //$lines = file($filename); |
| 19 | 19 | //foreach ($lines as $line) |
| 20 | - while (($line = fgets($handle,4096)) !== false) |
|
| 20 | + while (($line = fgets($handle, 4096)) !== false) |
|
| 21 | 21 | { |
| 22 | - if (substr($line,0,2) == '--' || $line == '') continue; |
|
| 22 | + if (substr($line, 0, 2) == '--' || $line == '') continue; |
|
| 23 | 23 | $templine .= $line; |
| 24 | - if (substr(trim($line), -1,1) == ';') |
|
| 24 | + if (substr(trim($line), -1, 1) == ';') |
|
| 25 | 25 | { |
| 26 | 26 | try { |
| 27 | 27 | $sth = $Connection->db->prepare($templine); |
| 28 | 28 | $sth->execute(); |
| 29 | - } catch(PDOException $e) { |
|
| 29 | + } catch (PDOException $e) { |
|
| 30 | 30 | return "error (import ".$filename.") : ".$e->getMessage()."\n"; |
| 31 | 31 | } |
| 32 | 32 | $templine = ''; |
@@ -43,21 +43,21 @@ discard block |
||
| 43 | 43 | $error = ''; |
| 44 | 44 | $dh = opendir($directory); |
| 45 | 45 | //foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename) |
| 46 | - while(false !== ($filename = readdir($dh))) |
|
| 46 | + while (false !== ($filename = readdir($dh))) |
|
| 47 | 47 | { |
| 48 | - if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename); |
|
| 48 | + if (preg_match('/\.sql$/', $filename)) $error .= create_db::import_file($directory.$filename); |
|
| 49 | 49 | } |
| 50 | 50 | return $error; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public static function create_database($root,$root_pass,$user,$pass,$db,$db_type,$host,$port = '') { |
|
| 54 | - $root = filter_var($root,FILTER_SANITIZE_STRING); |
|
| 55 | - $root_pass = filter_var($root_pass,FILTER_SANITIZE_STRING); |
|
| 56 | - $user = filter_var($user,FILTER_SANITIZE_STRING); |
|
| 57 | - $password = filter_var($pass,FILTER_SANITIZE_STRING); |
|
| 58 | - $db = filter_var($db,FILTER_SANITIZE_STRING); |
|
| 59 | - $db_type = filter_var($db_type,FILTER_SANITIZE_STRING); |
|
| 60 | - $host = filter_var($host,FILTER_SANITIZE_STRING); |
|
| 53 | + public static function create_database($root, $root_pass, $user, $pass, $db, $db_type, $host, $port = '') { |
|
| 54 | + $root = filter_var($root, FILTER_SANITIZE_STRING); |
|
| 55 | + $root_pass = filter_var($root_pass, FILTER_SANITIZE_STRING); |
|
| 56 | + $user = filter_var($user, FILTER_SANITIZE_STRING); |
|
| 57 | + $password = filter_var($pass, FILTER_SANITIZE_STRING); |
|
| 58 | + $db = filter_var($db, FILTER_SANITIZE_STRING); |
|
| 59 | + $db_type = filter_var($db_type, FILTER_SANITIZE_STRING); |
|
| 60 | + $host = filter_var($host, FILTER_SANITIZE_STRING); |
|
| 61 | 61 | if ($db_type == 'mysql' && $port == '') $port = 3306; |
| 62 | 62 | elseif ($port == '') $port = 5432; |
| 63 | 63 | // Dirty hack |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | $grantright = $_SERVER['SERVER_ADDR']; |
| 66 | 66 | } else $grantright = 'localhost'; |
| 67 | 67 | try { |
| 68 | - if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass); |
|
| 69 | - else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass); |
|
| 68 | + if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1', $root, $root_pass); |
|
| 69 | + else $dbh = new PDO($db_type.':host='.$host.';port='.$port, $root, $root_pass); |
|
| 70 | 70 | $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 71 | 71 | if ($db_type == 'mysql') { |
| 72 | 72 | $dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."'; |
| 77 | 77 | GRANT ALL PRIVILEGES ON DATABASE ".$db." TO ".$user.";"); |
| 78 | 78 | } |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | $dbh = null; |
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
@@ -10,7 +10,9 @@ discard block |
||
| 10 | 10 | public static function import_file($filename) { |
| 11 | 11 | $filename = filter_var($filename,FILTER_SANITIZE_STRING); |
| 12 | 12 | $Connection = new Connection(); |
| 13 | - if (!$Connection->connectionExists()) return 'error: DB connection failed'; |
|
| 13 | + if (!$Connection->connectionExists()) { |
|
| 14 | + return 'error: DB connection failed'; |
|
| 15 | + } |
|
| 14 | 16 | //Connection::$db->beginTransaction(); |
| 15 | 17 | $templine = ''; |
| 16 | 18 | $handle = @fopen($filename,"r"); |
@@ -19,7 +21,9 @@ discard block |
||
| 19 | 21 | //foreach ($lines as $line) |
| 20 | 22 | while (($line = fgets($handle,4096)) !== false) |
| 21 | 23 | { |
| 22 | - if (substr($line,0,2) == '--' || $line == '') continue; |
|
| 24 | + if (substr($line,0,2) == '--' || $line == '') { |
|
| 25 | + continue; |
|
| 26 | + } |
|
| 23 | 27 | $templine .= $line; |
| 24 | 28 | if (substr(trim($line), -1,1) == ';') |
| 25 | 29 | { |
@@ -45,7 +49,9 @@ discard block |
||
| 45 | 49 | //foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename) |
| 46 | 50 | while(false !== ($filename = readdir($dh))) |
| 47 | 51 | { |
| 48 | - if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename); |
|
| 52 | + if (preg_match('/\.sql$/',$filename)) { |
|
| 53 | + $error .= create_db::import_file($directory.$filename); |
|
| 54 | + } |
|
| 49 | 55 | } |
| 50 | 56 | return $error; |
| 51 | 57 | } |
@@ -58,19 +64,29 @@ discard block |
||
| 58 | 64 | $db = filter_var($db,FILTER_SANITIZE_STRING); |
| 59 | 65 | $db_type = filter_var($db_type,FILTER_SANITIZE_STRING); |
| 60 | 66 | $host = filter_var($host,FILTER_SANITIZE_STRING); |
| 61 | - if ($db_type == 'mysql' && $port == '') $port = 3306; |
|
| 62 | - elseif ($port == '') $port = 5432; |
|
| 67 | + if ($db_type == 'mysql' && $port == '') { |
|
| 68 | + $port = 3306; |
|
| 69 | + } elseif ($port == '') { |
|
| 70 | + $port = 5432; |
|
| 71 | + } |
|
| 63 | 72 | // Dirty hack |
| 64 | 73 | if ($host != 'localhost' && $host != '127.0.0.1') { |
| 65 | 74 | $grantright = $_SERVER['SERVER_ADDR']; |
| 66 | - } else $grantright = 'localhost'; |
|
| 75 | + } else { |
|
| 76 | + $grantright = 'localhost'; |
|
| 77 | + } |
|
| 67 | 78 | try { |
| 68 | - if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass); |
|
| 69 | - else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass); |
|
| 79 | + if ($host == 'localhost') { |
|
| 80 | + $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass); |
|
| 81 | + } else { |
|
| 82 | + $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass); |
|
| 83 | + } |
|
| 70 | 84 | $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 71 | 85 | if ($db_type == 'mysql') { |
| 72 | 86 | $dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
| 73 | - if ($grantright == 'localhost') $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
|
| 87 | + if ($grantright == 'localhost') { |
|
| 88 | + $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
|
| 89 | + } |
|
| 74 | 90 | } else if ($db_type == 'pgsql') { |
| 75 | 91 | $dbh->exec("CREATE DATABASE ".$db.";"); |
| 76 | 92 | $dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."'; |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | header('Content-disposition: attachment; filename="flightairmap-sat.json"'); |
| 14 | 14 | } |
| 15 | 15 | } |
| 16 | -$history = urldecode(filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING)); |
|
| 16 | +$history = urldecode(filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING)); |
|
| 17 | 17 | header('Content-Type: text/javascript'); |
| 18 | 18 | |
| 19 | 19 | $begintime = microtime(true); |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | $spotter_array = array(); |
| 23 | 23 | if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') { |
| 24 | - $sattypes = explode(',',$_COOKIE['sattypes']); |
|
| 24 | + $sattypes = explode(',', $_COOKIE['sattypes']); |
|
| 25 | 25 | foreach ($sattypes as $sattype) { |
| 26 | 26 | //$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array); |
| 27 | - $spotter_array = array_merge($Satellite->position_all_type($sattype),$spotter_array); |
|
| 27 | + $spotter_array = array_merge($Satellite->position_all_type($sattype), $spotter_array); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | //$spotter_array = array_unique($spotter_array,SORT_REGULAR); |
| 38 | 38 | //print_r($spotter_array); |
| 39 | -$sqltime = round(microtime(true)-$begintime,2); |
|
| 39 | +$sqltime = round(microtime(true) - $begintime, 2); |
|
| 40 | 40 | |
| 41 | 41 | $output = '{"type":"FeatureCollection","features":['; |
| 42 | 42 | if (!empty($spotter_array) && is_array($spotter_array)) |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $last_name = ''; |
| 45 | 45 | $coordinatearray = ''; |
| 46 | 46 | $timearray = array(); |
| 47 | - foreach($spotter_array as $spotter_item) |
|
| 47 | + foreach ($spotter_array as $spotter_item) |
|
| 48 | 48 | { |
| 49 | 49 | $output_data = ''; |
| 50 | 50 | $output_data .= '{"type":"Feature","properties":{'; |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | $output_data .= '"altitude":0,'; |
| 63 | 63 | $output_data .= '"sqt":'.$sqltime.','; |
| 64 | - $nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20); |
|
| 64 | + $nextlatlon = $Satellite->position($spotter_item['name'], time() + $globalMapRefresh + 20); |
|
| 65 | 65 | $nextlat = $nextlatlon['latitude']; |
| 66 | - if (abs($nextlat-$spotter_item['latitude']) > 90) { |
|
| 66 | + if (abs($nextlat - $spotter_item['latitude']) > 90) { |
|
| 67 | 67 | if ($spotter_item['latitude'] < 0) $nexlat = -90; |
| 68 | 68 | else $nexlat = 90; |
| 69 | 69 | } |
| 70 | 70 | $nextlon = $nextlatlon['longitude']; |
| 71 | - if (abs($nextlon-$spotter_item['longitude']) > 180) { |
|
| 71 | + if (abs($nextlon - $spotter_item['longitude']) > 180) { |
|
| 72 | 72 | if ($spotter_item['longitude'] < 0) $nextlon = -180; |
| 73 | 73 | else $nextlon = 180; |
| 74 | 74 | } |
@@ -79,27 +79,27 @@ discard block |
||
| 79 | 79 | $output_data .= ']}},'; |
| 80 | 80 | $output .= $output_data; |
| 81 | 81 | if ($history == $spotter_item['name']) { |
| 82 | - $spotter_history_array = $Satellite->position($spotter_item['name'],time()-6000,time()); |
|
| 82 | + $spotter_history_array = $Satellite->position($spotter_item['name'], time() - 6000, time()); |
|
| 83 | 83 | $spotter_history_array = array_reverse($spotter_history_array); |
| 84 | 84 | $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['name'].'","type": "history"},"geometry": {"type": "LineString","coordinates": ['; |
| 85 | 85 | foreach ($spotter_history_array as $key => $spotter_history) { |
| 86 | - if ((isset($previous_lon) && abs($previous_lon-$spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat-$spotter_history['latitude']) > 90)) { |
|
| 86 | + if ((isset($previous_lon) && abs($previous_lon - $spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat - $spotter_history['latitude']) > 90)) { |
|
| 87 | 87 | break; |
| 88 | 88 | } |
| 89 | 89 | $output_history .= '['; |
| 90 | - $output_history .= $spotter_history['longitude'].', '; |
|
| 91 | - $output_history .= $spotter_history['latitude']; |
|
| 90 | + $output_history .= $spotter_history['longitude'].', '; |
|
| 91 | + $output_history .= $spotter_history['latitude']; |
|
| 92 | 92 | $output_history .= '],'; |
| 93 | 93 | $previous_lon = $spotter_history['longitude']; |
| 94 | 94 | $previous_lat = $spotter_history['latitude']; |
| 95 | 95 | } |
| 96 | - $output_history = substr($output_history,0,-1); |
|
| 96 | + $output_history = substr($output_history, 0, -1); |
|
| 97 | 97 | $output_history .= ']}},'; |
| 98 | 98 | $output .= $output_history; |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | -if (isset($output_data)) $output = substr($output,0,-1); |
|
| 102 | +if (isset($output_data)) $output = substr($output, 0, -1); |
|
| 103 | 103 | $output .= ']}'; |
| 104 | 104 | print $output; |
| 105 | 105 | ?> |
@@ -64,13 +64,19 @@ discard block |
||
| 64 | 64 | $nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20); |
| 65 | 65 | $nextlat = $nextlatlon['latitude']; |
| 66 | 66 | if (abs($nextlat-$spotter_item['latitude']) > 90) { |
| 67 | - if ($spotter_item['latitude'] < 0) $nexlat = -90; |
|
| 68 | - else $nexlat = 90; |
|
| 67 | + if ($spotter_item['latitude'] < 0) { |
|
| 68 | + $nexlat = -90; |
|
| 69 | + } else { |
|
| 70 | + $nexlat = 90; |
|
| 71 | + } |
|
| 69 | 72 | } |
| 70 | 73 | $nextlon = $nextlatlon['longitude']; |
| 71 | 74 | if (abs($nextlon-$spotter_item['longitude']) > 180) { |
| 72 | - if ($spotter_item['longitude'] < 0) $nextlon = -180; |
|
| 73 | - else $nextlon = 180; |
|
| 75 | + if ($spotter_item['longitude'] < 0) { |
|
| 76 | + $nextlon = -180; |
|
| 77 | + } else { |
|
| 78 | + $nextlon = 180; |
|
| 79 | + } |
|
| 74 | 80 | } |
| 75 | 81 | $output_data .= '"nextlatlon":['.$nextlat.','.$nextlon.']},'; |
| 76 | 82 | //$output_data .= '"heading":"'.$Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$nextlatlon['latitude'],$nextlatlon['longitude']).'",'; |
@@ -99,7 +105,9 @@ discard block |
||
| 99 | 105 | } |
| 100 | 106 | } |
| 101 | 107 | } |
| 102 | -if (isset($output_data)) $output = substr($output,0,-1); |
|
| 108 | +if (isset($output_data)) { |
|
| 109 | + $output = substr($output,0,-1); |
|
| 110 | +} |
|
| 103 | 111 | $output .= ']}'; |
| 104 | 112 | print $output; |
| 105 | 113 | ?> |
@@ -20,17 +20,17 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | $spotter_array = array(); |
| 22 | 22 | if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') { |
| 23 | - $sattypes = explode(',',$_COOKIE['sattypes']); |
|
| 23 | + $sattypes = explode(',', $_COOKIE['sattypes']); |
|
| 24 | 24 | foreach ($sattypes as $sattype) { |
| 25 | - $spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array); |
|
| 25 | + $spotter_array = array_merge($Satellite->position_all_type($sattype, $timeb - $globalLiveInterval, $timeb), $spotter_array); |
|
| 26 | 26 | } |
| 27 | 27 | } |
| 28 | 28 | if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) { |
| 29 | - $spotter_array = array_merge($Satellite->position('ISS (ZARYA)',time()-$globalLiveInterval,time()),$spotter_array); |
|
| 30 | - $spotter_array = array_merge($Satellite->position('TIANGONG 1',time()-$globalLiveInterval,time()),$spotter_array); |
|
| 31 | - $spotter_array = array_merge($Satellite->position('TIANGONG-2',time()-$globalLiveInterval,time()),$spotter_array); |
|
| 29 | + $spotter_array = array_merge($Satellite->position('ISS (ZARYA)', time() - $globalLiveInterval, time()), $spotter_array); |
|
| 30 | + $spotter_array = array_merge($Satellite->position('TIANGONG 1', time() - $globalLiveInterval, time()), $spotter_array); |
|
| 31 | + $spotter_array = array_merge($Satellite->position('TIANGONG-2', time() - $globalLiveInterval, time()), $spotter_array); |
|
| 32 | 32 | } |
| 33 | -$spotter_array = array_unique($spotter_array,SORT_REGULAR); |
|
| 33 | +$spotter_array = array_unique($spotter_array, SORT_REGULAR); |
|
| 34 | 34 | /* |
| 35 | 35 | $modelsdb = array(); |
| 36 | 36 | if (file_exists('models/space/space_modelsdb')) { |
@@ -54,14 +54,14 @@ discard block |
||
| 54 | 54 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 55 | 55 | |
| 56 | 56 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 57 | -$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
|
| 57 | +$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
|
| 58 | 58 | //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 59 | 59 | |
| 60 | 60 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
| 61 | 61 | $output .= '},'; |
| 62 | 62 | if (!empty($spotter_array) && is_array($spotter_array)) |
| 63 | 63 | { |
| 64 | - foreach($spotter_array as $spotter_item) |
|
| 64 | + foreach ($spotter_array as $spotter_item) |
|
| 65 | 65 | { |
| 66 | 66 | $j++; |
| 67 | 67 | date_default_timezone_set('UTC'); |
@@ -115,23 +115,23 @@ discard block |
||
| 115 | 115 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubiesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 116 | 116 | } elseif ($spotter_item['name'] == 'TERRA') { |
| 117 | 117 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/terra.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 118 | - } elseif (strpos($spotter_item['name'],'O3B') !== false) { |
|
| 118 | + } elseif (strpos($spotter_item['name'], 'O3B') !== false) { |
|
| 119 | 119 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/o3b.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 120 | - } elseif (strpos($spotter_item['name'],'GLOBALSTAR') !== false) { |
|
| 120 | + } elseif (strpos($spotter_item['name'], 'GLOBALSTAR') !== false) { |
|
| 121 | 121 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/globalstar.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 122 | - } elseif (strpos($spotter_item['name'],'GPS') !== false) { |
|
| 122 | + } elseif (strpos($spotter_item['name'], 'GPS') !== false) { |
|
| 123 | 123 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/gps.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 124 | - } elseif (strpos($spotter_item['name'],'GENESIS') !== false) { |
|
| 124 | + } elseif (strpos($spotter_item['name'], 'GENESIS') !== false) { |
|
| 125 | 125 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/genesis.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 126 | - } elseif (strpos($spotter_item['name'],'OSCAR 7') !== false) { |
|
| 126 | + } elseif (strpos($spotter_item['name'], 'OSCAR 7') !== false) { |
|
| 127 | 127 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/oscar7.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 128 | - } elseif (strpos($spotter_item['name'],'FLOCK') !== false) { |
|
| 128 | + } elseif (strpos($spotter_item['name'], 'FLOCK') !== false) { |
|
| 129 | 129 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/cubesat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 130 | - } elseif (strpos($spotter_item['name'],'PLEIADES') !== false) { |
|
| 130 | + } elseif (strpos($spotter_item['name'], 'PLEIADES') !== false) { |
|
| 131 | 131 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/pleiades.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 132 | - } elseif (strpos($spotter_item['name'],'DUCHIFAT') !== false) { |
|
| 132 | + } elseif (strpos($spotter_item['name'], 'DUCHIFAT') !== false) { |
|
| 133 | 133 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/duchifat.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 134 | - } elseif (strpos($spotter_item['name'],'FORMOSAT-2') !== false) { |
|
| 134 | + } elseif (strpos($spotter_item['name'], 'FORMOSAT-2') !== false) { |
|
| 135 | 135 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/formosat2.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
| 136 | 136 | } elseif ($spotter_item['type'] == 'iridium') { |
| 137 | 137 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/space/iridium.glb'.'","scale" : 1.0,"minimumPixelSize": 25,"maximunPixelSize": 300 },'; |
@@ -153,14 +153,14 @@ discard block |
||
| 153 | 153 | // $output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", '; |
| 154 | 154 | $output .= '"interpolationAlgorithm":"HERMITE","interpolationDegree":3,'; |
| 155 | 155 | $output .= '"cartographicDegrees": ['; |
| 156 | - $output .= '"'.date("c",$spotter_item['timestamp']).'", '; |
|
| 156 | + $output .= '"'.date("c", $spotter_item['timestamp']).'", '; |
|
| 157 | 157 | $output .= $spotter_item['longitude'].', '; |
| 158 | 158 | $output .= $spotter_item['latitude'].', '; |
| 159 | 159 | $output .= $spotter_item['altitude']*1000; |
| 160 | 160 | $orientation = '"orientation" : { '; |
| 161 | 161 | $orientation .= '"unitQuaternion": ['; |
| 162 | 162 | } else { |
| 163 | - $output .= ',"'.date("c",$spotter_item['timestamp']).'", '; |
|
| 163 | + $output .= ',"'.date("c", $spotter_item['timestamp']).'", '; |
|
| 164 | 164 | $output .= $spotter_item['longitude'].', '; |
| 165 | 165 | $output .= $spotter_item['latitude'].', '; |
| 166 | 166 | $output .= $spotter_item['altitude']*1000; |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class Schedule { |
| 10 | 10 | protected $cookies = array(); |
| 11 | - public $db; |
|
| 11 | + public $db; |
|
| 12 | 12 | public function __construct($dbc = null) { |
| 13 | 13 | $Connection = new Connection($dbc); |
| 14 | 14 | $this->db = $Connection->db(); |
@@ -16,22 +16,22 @@ discard block |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | - * Add schedule data to database |
|
| 20 | - * @param String $ident aircraft ident |
|
| 21 | - * @param String $departure_airport_icao departure airport icao |
|
| 22 | - * @param String $departure_airport_time departure airport time |
|
| 23 | - * @param String $arrival_airport_icao arrival airport icao |
|
| 24 | - * @param String $arrival_airport_time arrival airport time |
|
| 19 | + * Add schedule data to database |
|
| 20 | + * @param String $ident aircraft ident |
|
| 21 | + * @param String $departure_airport_icao departure airport icao |
|
| 22 | + * @param String $departure_airport_time departure airport time |
|
| 23 | + * @param String $arrival_airport_icao arrival airport icao |
|
| 24 | + * @param String $arrival_airport_time arrival airport time |
|
| 25 | 25 | / @param String $source source of data |
| 26 | - */ |
|
| 26 | + */ |
|
| 27 | 27 | |
| 28 | 28 | public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') { |
| 29 | 29 | date_default_timezone_set('UTC'); |
| 30 | 30 | $date = date("Y-m-d H:i:s",time()); |
| 31 | - //if ($departure_airport_time == '' && $arrival_airport_time == '') exit; |
|
| 32 | - //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident"; |
|
| 33 | - $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident"; |
|
| 34 | - $query_values = array(':ident' => $ident); |
|
| 31 | + //if ($departure_airport_time == '' && $arrival_airport_time == '') exit; |
|
| 32 | + //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident"; |
|
| 33 | + $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident"; |
|
| 34 | + $query_values = array(':ident' => $ident); |
|
| 35 | 35 | try { |
| 36 | 36 | $sth = $this->db->prepare($query); |
| 37 | 37 | $sth->execute($query_values); |
@@ -40,18 +40,18 @@ discard block |
||
| 40 | 40 | } |
| 41 | 41 | if ($sth->fetchColumn() > 0) { |
| 42 | 42 | if ($departure_airport_time == '' && $arrival_airport_time == '') { |
| 43 | - $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao"; |
|
| 44 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao); |
|
| 43 | + $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao"; |
|
| 44 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao); |
|
| 45 | 45 | } elseif ($arrival_airport_time == '') { |
| 46 | - $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao"; |
|
| 47 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao); |
|
| 46 | + $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao"; |
|
| 47 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao); |
|
| 48 | 48 | } elseif ($departure_airport_time == '') { |
| 49 | - $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time"; |
|
| 50 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time); |
|
| 49 | + $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time"; |
|
| 50 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time); |
|
| 51 | 51 | } else { |
| 52 | - //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time"; |
|
| 53 | - $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time"; |
|
| 54 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time); |
|
| 52 | + //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time"; |
|
| 53 | + $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time"; |
|
| 54 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time); |
|
| 55 | 55 | } |
| 56 | 56 | try { |
| 57 | 57 | $sth = $this->db->prepare($query); |
@@ -62,17 +62,17 @@ discard block |
||
| 62 | 62 | if ($sth->fetchColumn() == 0) { |
| 63 | 63 | //$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident'; |
| 64 | 64 | if ($departure_airport_time == '' && $arrival_airport_time == '') { |
| 65 | - $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 66 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 65 | + $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 66 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 67 | 67 | } elseif ($arrival_airport_time == '') { |
| 68 | - $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 69 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 68 | + $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 69 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 70 | 70 | } elseif ($departure_airport_time == '') { |
| 71 | - $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 72 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 71 | + $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 72 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 73 | 73 | } else { |
| 74 | - $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 75 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 74 | + $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
|
| 75 | + $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 76 | 76 | } |
| 77 | 77 | try { |
| 78 | 78 | $sth = $this->db->prepare($query); |
@@ -105,15 +105,15 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | public function getSchedule($ident) { |
| 108 | - $Translation = new Translation($this->db); |
|
| 109 | - $operator = $Translation->checkTranslation($ident,false); |
|
| 110 | - if ($ident != $operator) { |
|
| 111 | - $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1"; |
|
| 112 | - $query_values = array(':ident' => $ident,'operator' => $operator); |
|
| 113 | - } else { |
|
| 114 | - $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1"; |
|
| 115 | - $query_values = array(':ident' => $ident); |
|
| 116 | - } |
|
| 108 | + $Translation = new Translation($this->db); |
|
| 109 | + $operator = $Translation->checkTranslation($ident,false); |
|
| 110 | + if ($ident != $operator) { |
|
| 111 | + $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1"; |
|
| 112 | + $query_values = array(':ident' => $ident,'operator' => $operator); |
|
| 113 | + } else { |
|
| 114 | + $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1"; |
|
| 115 | + $query_values = array(':ident' => $ident); |
|
| 116 | + } |
|
| 117 | 117 | try { |
| 118 | 118 | $sth = $this->db->prepare($query); |
| 119 | 119 | $sth->execute($query_values); |
@@ -129,15 +129,15 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | public function checkSchedule($ident) { |
| 131 | 131 | global $globalDBdriver; |
| 132 | - //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1"; |
|
| 133 | - if ($globalDBdriver == 'mysql') { |
|
| 132 | + //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1"; |
|
| 133 | + if ($globalDBdriver == 'mysql') { |
|
| 134 | 134 | $query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident AND ((date_added BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) AND DATE(NOW()) and date_modified IS NULL) OR (date_modified BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()))) LIMIT 1"; |
| 135 | 135 | } else { |
| 136 | 136 | $query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident |
| 137 | 137 | AND ((date_added::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) and date_modified::timestamp IS NULL) |
| 138 | 138 | OR (date_modified::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) LIMIT 1"; |
| 139 | 139 | } |
| 140 | - $query_values = array(':ident' => $ident); |
|
| 140 | + $query_values = array(':ident' => $ident); |
|
| 141 | 141 | try { |
| 142 | 142 | $sth = $this->db->prepare($query); |
| 143 | 143 | $sth->execute($query_values); |
@@ -150,12 +150,12 @@ discard block |
||
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
| 153 | - * Get flight info from Air France |
|
| 154 | - * @param String $callsign The callsign |
|
| 155 | - * @param String $date date we want flight number info |
|
| 156 | - * @param String $carrier IATA code |
|
| 157 | - * @return Flight departure and arrival airports and time |
|
| 158 | - */ |
|
| 153 | + * Get flight info from Air France |
|
| 154 | + * @param String $callsign The callsign |
|
| 155 | + * @param String $date date we want flight number info |
|
| 156 | + * @param String $carrier IATA code |
|
| 157 | + * @return Flight departure and arrival airports and time |
|
| 158 | + */ |
|
| 159 | 159 | private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') { |
| 160 | 160 | $Common = new Common(); |
| 161 | 161 | $check_date = new Datetime($date); |
@@ -191,11 +191,11 @@ discard block |
||
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | /** |
| 194 | - * Get flight info from EasyJet |
|
| 195 | - * @param String $callsign The callsign |
|
| 196 | - * @param String $date date we want flight number info |
|
| 197 | - * @return Flight departure and arrival airports and time |
|
| 198 | - */ |
|
| 194 | + * Get flight info from EasyJet |
|
| 195 | + * @param String $callsign The callsign |
|
| 196 | + * @param String $date date we want flight number info |
|
| 197 | + * @return Flight departure and arrival airports and time |
|
| 198 | + */ |
|
| 199 | 199 | private function getEasyJet($callsign, $date = 'NOW') { |
| 200 | 200 | global $globalTimezone; |
| 201 | 201 | $Common = new Common(); |
@@ -219,10 +219,10 @@ discard block |
||
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /** |
| 222 | - * Get flight info from Ryanair |
|
| 223 | - * @param String $callsign The callsign |
|
| 224 | - * @return Flight departure and arrival airports and time |
|
| 225 | - */ |
|
| 222 | + * Get flight info from Ryanair |
|
| 223 | + * @param String $callsign The callsign |
|
| 224 | + * @return Flight departure and arrival airports and time |
|
| 225 | + */ |
|
| 226 | 226 | private function getRyanair($callsign) { |
| 227 | 227 | $Common = new Common(); |
| 228 | 228 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -245,10 +245,10 @@ discard block |
||
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | /** |
| 248 | - * Get flight info from Swiss |
|
| 249 | - * @param String $callsign The callsign |
|
| 250 | - * @return Flight departure and arrival airports and time |
|
| 251 | - */ |
|
| 248 | + * Get flight info from Swiss |
|
| 249 | + * @param String $callsign The callsign |
|
| 250 | + * @return Flight departure and arrival airports and time |
|
| 251 | + */ |
|
| 252 | 252 | private function getSwiss($callsign) { |
| 253 | 253 | $Common = new Common(); |
| 254 | 254 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -277,11 +277,11 @@ discard block |
||
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | /** |
| 280 | - * Get flight info from British Airways API |
|
| 281 | - * @param String $callsign The callsign |
|
| 282 | - * @param String $date date we want flight number info |
|
| 283 | - * @return Flight departure and arrival airports and time |
|
| 284 | - */ |
|
| 280 | + * Get flight info from British Airways API |
|
| 281 | + * @param String $callsign The callsign |
|
| 282 | + * @param String $date date we want flight number info |
|
| 283 | + * @return Flight departure and arrival airports and time |
|
| 284 | + */ |
|
| 285 | 285 | public function getBritishAirways($callsign, $date = 'NOW') { |
| 286 | 286 | global $globalBritishAirwaysKey; |
| 287 | 287 | $Common = new Common(); |
@@ -305,11 +305,11 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | /** |
| 308 | - * Get flight info from Lutfhansa API |
|
| 309 | - * @param String $callsign The callsign |
|
| 310 | - * @param String $date date we want flight number info |
|
| 311 | - * @return Flight departure and arrival airports and time |
|
| 312 | - */ |
|
| 308 | + * Get flight info from Lutfhansa API |
|
| 309 | + * @param String $callsign The callsign |
|
| 310 | + * @param String $date date we want flight number info |
|
| 311 | + * @return Flight departure and arrival airports and time |
|
| 312 | + */ |
|
| 313 | 313 | public function getLufthansa($callsign, $date = 'NOW') { |
| 314 | 314 | global $globalLufthansaKey; |
| 315 | 315 | $Common = new Common(); |
@@ -339,11 +339,11 @@ discard block |
||
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | /** |
| 342 | - * Get flight info from Transavia API |
|
| 343 | - * @param String $callsign The callsign |
|
| 344 | - * @param String $date date we want flight number info |
|
| 345 | - * @return Flight departure and arrival airports and time |
|
| 346 | - */ |
|
| 342 | + * Get flight info from Transavia API |
|
| 343 | + * @param String $callsign The callsign |
|
| 344 | + * @param String $date date we want flight number info |
|
| 345 | + * @return Flight departure and arrival airports and time |
|
| 346 | + */ |
|
| 347 | 347 | public function getTransavia($callsign, $date = 'NOW') { |
| 348 | 348 | global $globalTransaviaKey; |
| 349 | 349 | $Common = new Common(); |
@@ -369,10 +369,10 @@ discard block |
||
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | /** |
| 372 | - * Get flight info from Tunisair |
|
| 373 | - * @param String $callsign The callsign |
|
| 374 | - * @return Flight departure and arrival airports and time |
|
| 375 | - */ |
|
| 372 | + * Get flight info from Tunisair |
|
| 373 | + * @param String $callsign The callsign |
|
| 374 | + * @return Flight departure and arrival airports and time |
|
| 375 | + */ |
|
| 376 | 376 | public function getTunisair($callsign) { |
| 377 | 377 | $Common = new Common(); |
| 378 | 378 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -389,10 +389,10 @@ discard block |
||
| 389 | 389 | } |
| 390 | 390 | |
| 391 | 391 | /** |
| 392 | - * Get flight info from Vueling |
|
| 393 | - * @param String $callsign The callsign |
|
| 394 | - * @return Flight departure and arrival airports and time |
|
| 395 | - */ |
|
| 392 | + * Get flight info from Vueling |
|
| 393 | + * @param String $callsign The callsign |
|
| 394 | + * @return Flight departure and arrival airports and time |
|
| 395 | + */ |
|
| 396 | 396 | public function getVueling($callsign,$date = 'NOW') { |
| 397 | 397 | $Common = new Common(); |
| 398 | 398 | $check_date = new Datetime($date); |
@@ -414,11 +414,11 @@ discard block |
||
| 414 | 414 | } |
| 415 | 415 | |
| 416 | 416 | /** |
| 417 | - * Get flight info from Iberia |
|
| 418 | - * @param String $callsign The callsign |
|
| 419 | - * @param String $date date we want flight number info |
|
| 420 | - * @return Flight departure and arrival airports and time |
|
| 421 | - */ |
|
| 417 | + * Get flight info from Iberia |
|
| 418 | + * @param String $callsign The callsign |
|
| 419 | + * @param String $date date we want flight number info |
|
| 420 | + * @return Flight departure and arrival airports and time |
|
| 421 | + */ |
|
| 422 | 422 | public function getIberia($callsign, $date = 'NOW') { |
| 423 | 423 | $Common = new Common(); |
| 424 | 424 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -448,11 +448,11 @@ discard block |
||
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | /** |
| 451 | - * Get flight info from Star Alliance |
|
| 452 | - * @param String $callsign The callsign |
|
| 453 | - * @param String $date date we want flight number info |
|
| 454 | - * @return Flight departure and arrival airports and time |
|
| 455 | - */ |
|
| 451 | + * Get flight info from Star Alliance |
|
| 452 | + * @param String $callsign The callsign |
|
| 453 | + * @param String $date date we want flight number info |
|
| 454 | + * @return Flight departure and arrival airports and time |
|
| 455 | + */ |
|
| 456 | 456 | |
| 457 | 457 | private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') { |
| 458 | 458 | $Common = new Common(); |
@@ -484,11 +484,11 @@ discard block |
||
| 484 | 484 | |
| 485 | 485 | |
| 486 | 486 | /** |
| 487 | - * Get flight info from Alitalia |
|
| 488 | - * @param String $callsign The callsign |
|
| 489 | - * @param String $date date we want flight number info |
|
| 490 | - * @return Flight departure and arrival airports and time |
|
| 491 | - */ |
|
| 487 | + * Get flight info from Alitalia |
|
| 488 | + * @param String $callsign The callsign |
|
| 489 | + * @param String $date date we want flight number info |
|
| 490 | + * @return Flight departure and arrival airports and time |
|
| 491 | + */ |
|
| 492 | 492 | private function getAlitalia($callsign, $date = 'NOW') { |
| 493 | 493 | $Common = new Common(); |
| 494 | 494 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -507,11 +507,11 @@ discard block |
||
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | /** |
| 510 | - * Get flight info from Brussels airlines |
|
| 511 | - * @param String $callsign The callsign |
|
| 512 | - * @param String $date date we want flight number info |
|
| 513 | - * @return Flight departure and arrival airports and time |
|
| 514 | - */ |
|
| 510 | + * Get flight info from Brussels airlines |
|
| 511 | + * @param String $callsign The callsign |
|
| 512 | + * @param String $date date we want flight number info |
|
| 513 | + * @return Flight departure and arrival airports and time |
|
| 514 | + */ |
|
| 515 | 515 | private function getBrussels($callsign, $date = 'NOW') { |
| 516 | 516 | $Common = new Common(); |
| 517 | 517 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -521,24 +521,24 @@ discard block |
||
| 521 | 521 | if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
| 522 | 522 | $data = $Common->getData($url); |
| 523 | 523 | if ($data != '') { |
| 524 | - //echo $data; |
|
| 525 | - $parsed_json = json_decode($data,true); |
|
| 526 | - if (isset($parsed_json[0]['FromAirportCode'])) { |
|
| 524 | + //echo $data; |
|
| 525 | + $parsed_json = json_decode($data,true); |
|
| 526 | + if (isset($parsed_json[0]['FromAirportCode'])) { |
|
| 527 | 527 | $DepartureAirportIata = $parsed_json[0]['FromAirportCode']; |
| 528 | 528 | $ArrivalAirportIata = $parsed_json[0]['ToAirportCode']; |
| 529 | 529 | $departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate'])); |
| 530 | 530 | $arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate'])); |
| 531 | 531 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels'); |
| 532 | - } |
|
| 532 | + } |
|
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | 536 | /** |
| 537 | - * Get flight info from FlightRadar24 |
|
| 538 | - * @param String $callsign The callsign |
|
| 539 | - * @param String $date date we want flight number info |
|
| 540 | - * @return Flight departure and arrival airports and time |
|
| 541 | - */ |
|
| 537 | + * Get flight info from FlightRadar24 |
|
| 538 | + * @param String $callsign The callsign |
|
| 539 | + * @param String $date date we want flight number info |
|
| 540 | + * @return Flight departure and arrival airports and time |
|
| 541 | + */ |
|
| 542 | 542 | /* |
| 543 | 543 | public function getFlightRadar24($callsign, $date = 'NOW') { |
| 544 | 544 | $Common = new Common(); |
@@ -567,11 +567,11 @@ discard block |
||
| 567 | 567 | } |
| 568 | 568 | */ |
| 569 | 569 | /** |
| 570 | - * Get flight info from Lufthansa |
|
| 571 | - * @param String $callsign The callsign |
|
| 572 | - * @param String $date date we want flight number info |
|
| 573 | - * @return Flight departure and arrival airports and time |
|
| 574 | - */ |
|
| 570 | + * Get flight info from Lufthansa |
|
| 571 | + * @param String $callsign The callsign |
|
| 572 | + * @param String $date date we want flight number info |
|
| 573 | + * @return Flight departure and arrival airports and time |
|
| 574 | + */ |
|
| 575 | 575 | |
| 576 | 576 | /* private function getLufthansa($callsign, $date = 'NOW') { |
| 577 | 577 | $Common = new Common(); |
@@ -599,10 +599,10 @@ discard block |
||
| 599 | 599 | } |
| 600 | 600 | */ |
| 601 | 601 | /** |
| 602 | - * Get flight info from flytap |
|
| 603 | - * @param String $callsign The callsign |
|
| 604 | - * @return Flight departure and arrival airports and time |
|
| 605 | - */ |
|
| 602 | + * Get flight info from flytap |
|
| 603 | + * @param String $callsign The callsign |
|
| 604 | + * @return Flight departure and arrival airports and time |
|
| 605 | + */ |
|
| 606 | 606 | private function getFlyTap($callsign) { |
| 607 | 607 | $Common = new Common(); |
| 608 | 608 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -625,10 +625,10 @@ discard block |
||
| 625 | 625 | } |
| 626 | 626 | |
| 627 | 627 | /** |
| 628 | - * Get flight info from flightmapper |
|
| 629 | - * @param String $callsign The callsign |
|
| 630 | - * @return Flight departure and arrival airports and time |
|
| 631 | - */ |
|
| 628 | + * Get flight info from flightmapper |
|
| 629 | + * @param String $callsign The callsign |
|
| 630 | + * @return Flight departure and arrival airports and time |
|
| 631 | + */ |
|
| 632 | 632 | public function getFlightMapper($callsign) { |
| 633 | 633 | $Common = new Common(); |
| 634 | 634 | $airline_icao = ''; |
@@ -656,11 +656,11 @@ discard block |
||
| 656 | 656 | $aarr = ''; |
| 657 | 657 | $n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr); |
| 658 | 658 | if ($n == 7) { |
| 659 | - $departureTime = $dhour; |
|
| 660 | - $arrivalTime = $ahour; |
|
| 661 | - $DepartureAirportIata = str_replace(array('(',')'),'',$darr); |
|
| 662 | - $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr); |
|
| 663 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper'); |
|
| 659 | + $departureTime = $dhour; |
|
| 660 | + $arrivalTime = $ahour; |
|
| 661 | + $DepartureAirportIata = str_replace(array('(',')'),'',$darr); |
|
| 662 | + $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr); |
|
| 663 | + return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper'); |
|
| 664 | 664 | } |
| 665 | 665 | } |
| 666 | 666 | } |
@@ -668,10 +668,10 @@ discard block |
||
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | /** |
| 671 | - * Get flight info from flightaware |
|
| 672 | - * @param String $callsign The callsign |
|
| 673 | - * @return Flight departure and arrival airports and time |
|
| 674 | - */ |
|
| 671 | + * Get flight info from flightaware |
|
| 672 | + * @param String $callsign The callsign |
|
| 673 | + * @return Flight departure and arrival airports and time |
|
| 674 | + */ |
|
| 675 | 675 | public function getFlightAware($callsign) { |
| 676 | 676 | $Common = new Common(); |
| 677 | 677 | /* |
@@ -704,10 +704,10 @@ discard block |
||
| 704 | 704 | } |
| 705 | 705 | |
| 706 | 706 | /** |
| 707 | - * Get flight info from CostToTravel |
|
| 708 | - * @param String $callsign The callsign |
|
| 709 | - * @return Flight departure and arrival airports and time |
|
| 710 | - */ |
|
| 707 | + * Get flight info from CostToTravel |
|
| 708 | + * @param String $callsign The callsign |
|
| 709 | + * @return Flight departure and arrival airports and time |
|
| 710 | + */ |
|
| 711 | 711 | public function getCostToTravel($callsign) { |
| 712 | 712 | $Common = new Common(); |
| 713 | 713 | $url= "http://www.costtotravel.com/flight-number/".$callsign; |
@@ -729,11 +729,11 @@ discard block |
||
| 729 | 729 | } |
| 730 | 730 | |
| 731 | 731 | /** |
| 732 | - * Get flight info from Air Canada |
|
| 733 | - * @param String $callsign The callsign |
|
| 734 | - * @param String $date date we want flight number info |
|
| 735 | - * @return Flight departure and arrival airports and time |
|
| 736 | - */ |
|
| 732 | + * Get flight info from Air Canada |
|
| 733 | + * @param String $callsign The callsign |
|
| 734 | + * @param String $date date we want flight number info |
|
| 735 | + * @return Flight departure and arrival airports and time |
|
| 736 | + */ |
|
| 737 | 737 | private function getAirCanada($callsign,$date = 'NOW') { |
| 738 | 738 | $Common = new Common(); |
| 739 | 739 | if (class_exists("DomDocument") === FALSE) return array(); |
@@ -758,11 +758,11 @@ discard block |
||
| 758 | 758 | } |
| 759 | 759 | |
| 760 | 760 | /** |
| 761 | - * Get flight info from Vietnam Airlines |
|
| 762 | - * @param String $callsign The callsign |
|
| 763 | - * @param String $date date we want flight number info |
|
| 764 | - * @return Flight departure and arrival airports and time |
|
| 765 | - */ |
|
| 761 | + * Get flight info from Vietnam Airlines |
|
| 762 | + * @param String $callsign The callsign |
|
| 763 | + * @param String $date date we want flight number info |
|
| 764 | + * @return Flight departure and arrival airports and time |
|
| 765 | + */ |
|
| 766 | 766 | private function getVietnamAirlines($callsign, $date = 'NOW') { |
| 767 | 767 | $Common = new Common(); |
| 768 | 768 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
@@ -784,12 +784,12 @@ discard block |
||
| 784 | 784 | } |
| 785 | 785 | |
| 786 | 786 | /** |
| 787 | - * Get flight info from Air Berlin |
|
| 788 | - * @param String $callsign The callsign |
|
| 789 | - * @param String $date date we want flight number info |
|
| 790 | - * @param String $carrier airline code |
|
| 791 | - * @return Flight departure and arrival airports and time |
|
| 792 | - */ |
|
| 787 | + * Get flight info from Air Berlin |
|
| 788 | + * @param String $callsign The callsign |
|
| 789 | + * @param String $date date we want flight number info |
|
| 790 | + * @param String $carrier airline code |
|
| 791 | + * @return Flight departure and arrival airports and time |
|
| 792 | + */ |
|
| 793 | 793 | private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') { |
| 794 | 794 | $Common = new Common(); |
| 795 | 795 | date_default_timezone_set('UTC'); |
@@ -818,11 +818,11 @@ discard block |
||
| 818 | 818 | $table = $Common->table2array($data); |
| 819 | 819 | $flight = $table; |
| 820 | 820 | if (isset($flight[5][4])) { |
| 821 | - $arrivalTime = $flight[5][4]; |
|
| 822 | - $arrivalAirport = $flight[5][3]; |
|
| 821 | + $arrivalTime = $flight[5][4]; |
|
| 822 | + $arrivalAirport = $flight[5][3]; |
|
| 823 | 823 | } else { |
| 824 | - $arrivalTime = ''; |
|
| 825 | - $arrivalAirport = ''; |
|
| 824 | + $arrivalTime = ''; |
|
| 825 | + $arrivalAirport = ''; |
|
| 826 | 826 | } |
| 827 | 827 | } else return array(); |
| 828 | 828 | $url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner'; |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | } |
| 1091 | 1091 | } |
| 1092 | 1092 | } |
| 1093 | - return array(); |
|
| 1093 | + return array(); |
|
| 1094 | 1094 | } |
| 1095 | 1095 | } |
| 1096 | 1096 | |
@@ -25,9 +25,9 @@ discard block |
||
| 25 | 25 | / @param String $source source of data |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | - public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') { |
|
| 28 | + public function addSchedule($ident, $departure_airport_icao, $departure_airport_time, $arrival_airport_icao, $arrival_airport_time, $source = 'website') { |
|
| 29 | 29 | date_default_timezone_set('UTC'); |
| 30 | - $date = date("Y-m-d H:i:s",time()); |
|
| 30 | + $date = date("Y-m-d H:i:s", time()); |
|
| 31 | 31 | //if ($departure_airport_time == '' && $arrival_airport_time == '') exit; |
| 32 | 32 | //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident"; |
| 33 | 33 | $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident"; |
@@ -35,69 +35,69 @@ discard block |
||
| 35 | 35 | try { |
| 36 | 36 | $sth = $this->db->prepare($query); |
| 37 | 37 | $sth->execute($query_values); |
| 38 | - } catch(PDOException $e) { |
|
| 38 | + } catch (PDOException $e) { |
|
| 39 | 39 | return "error : ".$e->getMessage(); |
| 40 | 40 | } |
| 41 | 41 | if ($sth->fetchColumn() > 0) { |
| 42 | 42 | if ($departure_airport_time == '' && $arrival_airport_time == '') { |
| 43 | 43 | $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao"; |
| 44 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao); |
|
| 44 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao); |
|
| 45 | 45 | } elseif ($arrival_airport_time == '') { |
| 46 | 46 | $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao"; |
| 47 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao); |
|
| 47 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao); |
|
| 48 | 48 | } elseif ($departure_airport_time == '') { |
| 49 | 49 | $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time"; |
| 50 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time); |
|
| 50 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time); |
|
| 51 | 51 | } else { |
| 52 | 52 | //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time"; |
| 53 | 53 | $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time"; |
| 54 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time); |
|
| 54 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time); |
|
| 55 | 55 | } |
| 56 | 56 | try { |
| 57 | 57 | $sth = $this->db->prepare($query); |
| 58 | 58 | $sth->execute($query_values); |
| 59 | - } catch(PDOException $e) { |
|
| 59 | + } catch (PDOException $e) { |
|
| 60 | 60 | return "error : ".$e->getMessage(); |
| 61 | 61 | } |
| 62 | 62 | if ($sth->fetchColumn() == 0) { |
| 63 | 63 | //$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident'; |
| 64 | 64 | if ($departure_airport_time == '' && $arrival_airport_time == '') { |
| 65 | 65 | $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
| 66 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 66 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 67 | 67 | } elseif ($arrival_airport_time == '') { |
| 68 | 68 | $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
| 69 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 69 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source); |
|
| 70 | 70 | } elseif ($departure_airport_time == '') { |
| 71 | 71 | $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
| 72 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 72 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 73 | 73 | } else { |
| 74 | 74 | $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident'; |
| 75 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 75 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 76 | 76 | } |
| 77 | 77 | try { |
| 78 | 78 | $sth = $this->db->prepare($query); |
| 79 | 79 | $sth->execute($query_values); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | } else { |
| 84 | 84 | //$query = 'UPDATE schedule SET date_lastseen = :date WHERE ident = :ident'; |
| 85 | 85 | $query = 'UPDATE routes SET date_lastseen = :date WHERE CallSign = :ident'; |
| 86 | - $query_values = array(':ident' => $ident,':date' => $date); |
|
| 86 | + $query_values = array(':ident' => $ident, ':date' => $date); |
|
| 87 | 87 | try { |
| 88 | 88 | $sth = $this->db->prepare($query); |
| 89 | 89 | $sth->execute($query_values); |
| 90 | - } catch(PDOException $e) { |
|
| 90 | + } catch (PDOException $e) { |
|
| 91 | 91 | return "error : ".$e->getMessage(); |
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | } else { |
| 95 | 95 | $query = 'INSERT INTO routes (CallSign,FromAirport_ICAO, FromAirport_Time, ToAirport_ICAO, ToAirport_Time,date_added,source) VALUES (:ident,:departure_airport_icao,:departure_airport_time,:arrival_airport_icao,:arrival_airport_time,:date,:source)'; |
| 96 | - $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 96 | + $query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source); |
|
| 97 | 97 | try { |
| 98 | 98 | $sth = $this->db->prepare($query); |
| 99 | 99 | $sth->execute($query_values); |
| 100 | - } catch(PDOException $e) { |
|
| 100 | + } catch (PDOException $e) { |
|
| 101 | 101 | return "error : ".$e->getMessage(); |
| 102 | 102 | } |
| 103 | 103 | } |
@@ -106,10 +106,10 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | public function getSchedule($ident) { |
| 108 | 108 | $Translation = new Translation($this->db); |
| 109 | - $operator = $Translation->checkTranslation($ident,false); |
|
| 109 | + $operator = $Translation->checkTranslation($ident, false); |
|
| 110 | 110 | if ($ident != $operator) { |
| 111 | 111 | $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1"; |
| 112 | - $query_values = array(':ident' => $ident,'operator' => $operator); |
|
| 112 | + $query_values = array(':ident' => $ident, 'operator' => $operator); |
|
| 113 | 113 | } else { |
| 114 | 114 | $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1"; |
| 115 | 115 | $query_values = array(':ident' => $ident); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | try { |
| 118 | 118 | $sth = $this->db->prepare($query); |
| 119 | 119 | $sth->execute($query_values); |
| 120 | - } catch(PDOException $e) { |
|
| 120 | + } catch (PDOException $e) { |
|
| 121 | 121 | return "error : ".$e->getMessage(); |
| 122 | 122 | } |
| 123 | 123 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | try { |
| 142 | 142 | $sth = $this->db->prepare($query); |
| 143 | 143 | $sth->execute($query_values); |
| 144 | - } catch(PDOException $e) { |
|
| 144 | + } catch (PDOException $e) { |
|
| 145 | 145 | return "error : ".$e->getMessage(); |
| 146 | 146 | } |
| 147 | 147 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -156,16 +156,16 @@ discard block |
||
| 156 | 156 | * @param String $carrier IATA code |
| 157 | 157 | * @return Flight departure and arrival airports and time |
| 158 | 158 | */ |
| 159 | - private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') { |
|
| 159 | + private function getAirFrance($callsign, $date = 'NOW', $carrier = 'AF') { |
|
| 160 | 160 | $Common = new Common(); |
| 161 | 161 | $check_date = new Datetime($date); |
| 162 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 163 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 162 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 163 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 164 | 164 | $url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym'); |
| 165 | 165 | $json = $Common->getData($url); |
| 166 | 166 | |
| 167 | 167 | $parsed_json = json_decode($json); |
| 168 | - if (property_exists($parsed_json,'errors') === false) { |
|
| 168 | + if (property_exists($parsed_json, 'errors') === false) { |
|
| 169 | 169 | //$originLong = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originLong'}; |
| 170 | 170 | $originShort = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originShort'}; |
| 171 | 171 | //$departureDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'departureDateMedium'}; |
@@ -175,9 +175,9 @@ discard block |
||
| 175 | 175 | //$arrivalDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalDateMedium'}; |
| 176 | 176 | $arrivalTime = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalTime'}; |
| 177 | 177 | |
| 178 | - preg_match('/\((.*?)\)/',$originShort,$originiata); |
|
| 178 | + preg_match('/\((.*?)\)/', $originShort, $originiata); |
|
| 179 | 179 | $DepartureAirportIata = $originiata[1]; |
| 180 | - preg_match('/\((.*?)\)/',$destinationShort,$destinationiata); |
|
| 180 | + preg_match('/\((.*?)\)/', $destinationShort, $destinationiata); |
|
| 181 | 181 | $ArrivalAirportIata = $destinationiata[1]; |
| 182 | 182 | |
| 183 | 183 | /* |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | $arrivalTime = gmdate('H:i',strtotime($arrivalTime)); |
| 187 | 187 | */ |
| 188 | 188 | |
| 189 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance'); |
|
| 189 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airfrance'); |
|
| 190 | 190 | } else return array(); |
| 191 | 191 | } |
| 192 | 192 | |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | $Common = new Common(); |
| 202 | 202 | date_default_timezone_set($globalTimezone); |
| 203 | 203 | $check_date = new Datetime($date); |
| 204 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 205 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 204 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 205 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 206 | 206 | $url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign; |
| 207 | 207 | $json = $Common->getData($url); |
| 208 | 208 | $parsed_json = json_decode($json); |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $departureTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fstd'}; |
| 215 | 215 | $arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'}; |
| 216 | 216 | |
| 217 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet'); |
|
| 217 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_easyjet'); |
|
| 218 | 218 | } else return array(); |
| 219 | 219 | } |
| 220 | 220 | |
@@ -225,12 +225,12 @@ discard block |
||
| 225 | 225 | */ |
| 226 | 226 | private function getRyanair($callsign) { |
| 227 | 227 | $Common = new Common(); |
| 228 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 229 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 228 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 229 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 230 | 230 | $url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/"; |
| 231 | 231 | $post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}'; |
| 232 | - $headers = array('Content-Type: application/json','Content-Length: ' . strlen($post)); |
|
| 233 | - $json = $Common->getData($url,'post',$post,$headers); |
|
| 232 | + $headers = array('Content-Type: application/json', 'Content-Length: '.strlen($post)); |
|
| 233 | + $json = $Common->getData($url, 'post', $post, $headers); |
|
| 234 | 234 | $parsed_json = json_decode($json); |
| 235 | 235 | if (isset($parsed_json->{'flightInfo'})) { |
| 236 | 236 | $flights = $parsed_json->{'flightInfo'}; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $ArrivalAirportIata = $parsed_json->{'flightInfo'}[0]->{'arrivalAirport'}->{'iata'}; //name |
| 240 | 240 | $departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'}; |
| 241 | 241 | $arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'}; |
| 242 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair'); |
|
| 242 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair'); |
|
| 243 | 243 | } else return array(); |
| 244 | 244 | } else return array(); |
| 245 | 245 | } |
@@ -251,8 +251,8 @@ discard block |
||
| 251 | 251 | */ |
| 252 | 252 | private function getSwiss($callsign) { |
| 253 | 253 | $Common = new Common(); |
| 254 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 255 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 254 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 255 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 256 | 256 | $url = "http://www.world-of-swiss.com/fr/routenetwork.json"; |
| 257 | 257 | $json = $Common->getData($url); |
| 258 | 258 | $parsed_json = json_decode($json); |
@@ -266,12 +266,12 @@ discard block |
||
| 266 | 266 | if ($flight->{'no'} == "Vol LX ".$numvol) { |
| 267 | 267 | $DepartureAirportIata = $flight->{'from'}->{'code'}; //city |
| 268 | 268 | $ArrivalAirportIata = $flight->{'to'}->{'code'}; //city |
| 269 | - $departureTime = substr($flight->{'from'}->{'hour'},0,5); |
|
| 270 | - $arrivalTime = substr($flight->{'to'}->{'hour'},0,5); |
|
| 269 | + $departureTime = substr($flight->{'from'}->{'hour'},0, 5); |
|
| 270 | + $arrivalTime = substr($flight->{'to'}->{'hour'},0, 5); |
|
| 271 | 271 | } |
| 272 | 272 | } |
| 273 | 273 | if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) { |
| 274 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss'); |
|
| 274 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_swiss'); |
|
| 275 | 275 | } else return array(); |
| 276 | 276 | } else return array(); |
| 277 | 277 | } |
@@ -286,21 +286,21 @@ discard block |
||
| 286 | 286 | global $globalBritishAirwaysKey; |
| 287 | 287 | $Common = new Common(); |
| 288 | 288 | $check_date = new Datetime($date); |
| 289 | - $numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign)); |
|
| 290 | - if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array(); |
|
| 289 | + $numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign)); |
|
| 290 | + if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array(); |
|
| 291 | 291 | if ($globalBritishAirwaysKey == '') return array(); |
| 292 | 292 | $url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json"; |
| 293 | 293 | $headers = array('Client-Key: '.$globalBritishAirwaysKey); |
| 294 | - $json = $Common->getData($url,'get','',$headers); |
|
| 294 | + $json = $Common->getData($url, 'get', '', $headers); |
|
| 295 | 295 | if ($json == '') return array(); |
| 296 | 296 | $parsed_json = json_decode($json); |
| 297 | 297 | $flights = $parsed_json->{'FlightsResponse'}; |
| 298 | 298 | if (count($flights) > 0) { |
| 299 | 299 | $DepartureAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'DepartureAirport'}; |
| 300 | 300 | $ArrivalAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ArrivalAirport'}; |
| 301 | - $departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'})); |
|
| 302 | - $arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'})); |
|
| 303 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways'); |
|
| 301 | + $departureTime = date('H:i', strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'})); |
|
| 302 | + $arrivalTime = date('H:i', strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'})); |
|
| 303 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_britishairways'); |
|
| 304 | 304 | } else return array(); |
| 305 | 305 | } |
| 306 | 306 | |
@@ -314,27 +314,27 @@ discard block |
||
| 314 | 314 | global $globalLufthansaKey; |
| 315 | 315 | $Common = new Common(); |
| 316 | 316 | $check_date = new Datetime($date); |
| 317 | - $numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign)); |
|
| 318 | - if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array(); |
|
| 317 | + $numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign)); |
|
| 318 | + if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array(); |
|
| 319 | 319 | if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array(); |
| 320 | 320 | $url = "https://api.lufthansa.com/v1/oauth/token"; |
| 321 | - $post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials'); |
|
| 322 | - $data = $Common->getData($url,'post',$post); |
|
| 321 | + $post = array('client_id' => $globalLufthansaKey['key'], 'client_secret' => $globalLufthansaKey['secret'], 'grant_type' => 'client_credentials'); |
|
| 322 | + $data = $Common->getData($url, 'post', $post); |
|
| 323 | 323 | $parsed_data = json_decode($data); |
| 324 | 324 | if (!isset($parsed_data->{'access_token'})) return array(); |
| 325 | 325 | $token = $parsed_data->{'access_token'}; |
| 326 | 326 | |
| 327 | 327 | $url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d'); |
| 328 | - $headers = array('Authorization: Bearer '.$token,'Accept: application/json'); |
|
| 329 | - $json = $Common->getData($url,'get','',$headers); |
|
| 328 | + $headers = array('Authorization: Bearer '.$token, 'Accept: application/json'); |
|
| 329 | + $json = $Common->getData($url, 'get', '', $headers); |
|
| 330 | 330 | if ($json == '') return array(); |
| 331 | 331 | $parsed_json = json_decode($json); |
| 332 | 332 | if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) { |
| 333 | 333 | $DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'}; |
| 334 | - $departureTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'})); |
|
| 334 | + $departureTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'})); |
|
| 335 | 335 | $ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'}; |
| 336 | - $arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'})); |
|
| 337 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa'); |
|
| 336 | + $arrivalTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'})); |
|
| 337 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_lufthansa'); |
|
| 338 | 338 | } else return array(); |
| 339 | 339 | } |
| 340 | 340 | |
@@ -348,23 +348,23 @@ discard block |
||
| 348 | 348 | global $globalTransaviaKey; |
| 349 | 349 | $Common = new Common(); |
| 350 | 350 | $check_date = new Datetime($date); |
| 351 | - $numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign)); |
|
| 352 | - if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array(); |
|
| 351 | + $numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign)); |
|
| 352 | + if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array(); |
|
| 353 | 353 | if ($globalTransaviaKey == '') return array(); |
| 354 | 354 | $url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol; |
| 355 | 355 | //$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol; |
| 356 | 356 | $headers = array('apikey: '.$globalTransaviaKey); |
| 357 | - $json = $Common->getData($url,'get','',$headers); |
|
| 357 | + $json = $Common->getData($url, 'get', '', $headers); |
|
| 358 | 358 | //echo 'result : '.$json; |
| 359 | 359 | if ($json == '') return array(); |
| 360 | 360 | $parsed_json = json_decode($json); |
| 361 | 361 | |
| 362 | 362 | if (isset($parsed_json->{'data'}[0])) { |
| 363 | 363 | $DepartureAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'departureAirport'}->{'locationCode'}; |
| 364 | - $departureTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'})); |
|
| 364 | + $departureTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'})); |
|
| 365 | 365 | $ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'}; |
| 366 | - $arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'})); |
|
| 367 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia'); |
|
| 366 | + $arrivalTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'})); |
|
| 367 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_transavia'); |
|
| 368 | 368 | } else return array(); |
| 369 | 369 | } |
| 370 | 370 | |
@@ -375,14 +375,14 @@ discard block |
||
| 375 | 375 | */ |
| 376 | 376 | public function getTunisair($callsign) { |
| 377 | 377 | $Common = new Common(); |
| 378 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 379 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 378 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 379 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 380 | 380 | $url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp"; |
| 381 | 381 | $data = $Common->getData($url); |
| 382 | 382 | $table = $Common->table2array($data); |
| 383 | 383 | foreach ($table as $flight) { |
| 384 | - if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d',$numvol)) { |
|
| 385 | - return array('DepartureAirportIATA' => $flight[2],'DepartureTime' => str_replace('.',':',$flight[5]),'ArrivalAirportIATA' => $flight[3],'ArrivalTime' => str_replace('.',':',$flight[6]),'Source' => 'website_tunisair'); |
|
| 384 | + if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d', $numvol)) { |
|
| 385 | + return array('DepartureAirportIATA' => $flight[2], 'DepartureTime' => str_replace('.', ':', $flight[5]), 'ArrivalAirportIATA' => $flight[3], 'ArrivalTime' => str_replace('.', ':', $flight[6]), 'Source' => 'website_tunisair'); |
|
| 386 | 386 | } |
| 387 | 387 | } |
| 388 | 388 | return array(); |
@@ -393,21 +393,21 @@ discard block |
||
| 393 | 393 | * @param String $callsign The callsign |
| 394 | 394 | * @return Flight departure and arrival airports and time |
| 395 | 395 | */ |
| 396 | - public function getVueling($callsign,$date = 'NOW') { |
|
| 396 | + public function getVueling($callsign, $date = 'NOW') { |
|
| 397 | 397 | $Common = new Common(); |
| 398 | 398 | $check_date = new Datetime($date); |
| 399 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 400 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 401 | - $final_date = str_replace('/','%2F',$check_date->format('d/m/Y')); |
|
| 399 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 400 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 401 | + $final_date = str_replace('/', '%2F', $check_date->format('d/m/Y')); |
|
| 402 | 402 | $url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB"; |
| 403 | 403 | $data = $Common->getData($url); |
| 404 | - $data=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$data)); |
|
| 404 | + $data = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $data)); |
|
| 405 | 405 | if ($data != '') { |
| 406 | - preg_match('/flightOri=[A-Z]{3}/',$data,$result); |
|
| 407 | - $DepartureAirportIata = str_replace('flightOri=','',$result[0]); |
|
| 408 | - preg_match('/flightDest=[A-Z]{3}/',$data,$result); |
|
| 409 | - $ArrivalAirportIata = str_replace('flightDest=','',$result[0]); |
|
| 410 | - if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling'); |
|
| 406 | + preg_match('/flightOri=[A-Z]{3}/', $data, $result); |
|
| 407 | + $DepartureAirportIata = str_replace('flightOri=', '', $result[0]); |
|
| 408 | + preg_match('/flightDest=[A-Z]{3}/', $data, $result); |
|
| 409 | + $ArrivalAirportIata = str_replace('flightDest=', '', $result[0]); |
|
| 410 | + if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'Source' => 'website_vueling'); |
|
| 411 | 411 | else return array(); |
| 412 | 412 | } |
| 413 | 413 | return array(); |
@@ -421,27 +421,27 @@ discard block |
||
| 421 | 421 | */ |
| 422 | 422 | public function getIberia($callsign, $date = 'NOW') { |
| 423 | 423 | $Common = new Common(); |
| 424 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 424 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 425 | 425 | $check_date = new Datetime($date); |
| 426 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 426 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 427 | 427 | $url = "https://www.iberia.com/web/flightDetail.do"; |
| 428 | - $post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB'); |
|
| 429 | - $data = $Common->getData($url,'post',$post); |
|
| 428 | + $post = array('numvuelo' => $numvol, 'fecha' => $check_date->format('Ymd'), 'airlineID' => 'IB'); |
|
| 429 | + $data = $Common->getData($url, 'post', $post); |
|
| 430 | 430 | if ($data != '') { |
| 431 | 431 | $table = $Common->table2array($data); |
| 432 | 432 | //print_r($table); |
| 433 | 433 | if (count($table) > 0) { |
| 434 | 434 | $flight = $table; |
| 435 | - preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch); |
|
| 436 | - preg_match('/([A-Z]{3})/',$flight[5][0],$ArrivalAirportIataMatch); |
|
| 435 | + preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch); |
|
| 436 | + preg_match('/([A-Z]{3})/', $flight[5][0], $ArrivalAirportIataMatch); |
|
| 437 | 437 | $DepartureAirportIata = $DepartureAirportIataMatch[0]; |
| 438 | 438 | $ArrivalAirportIata = $ArrivalAirportIataMatch[0]; |
| 439 | - $departureTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[3][2]))),0,5); |
|
| 440 | - $arrivalTime = trim(str_replace(' lunes','',str_replace(' ','',$flight[5][1]))); |
|
| 439 | + $departureTime = substr(trim(str_replace(' lunes', '', str_replace(' ', '', $flight[3][2]))), 0, 5); |
|
| 440 | + $arrivalTime = trim(str_replace(' lunes', '', str_replace(' ', '', $flight[5][1]))); |
|
| 441 | 441 | if ($arrivalTime == 'Hora estimada de llegada') { |
| 442 | - $arrivalTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[5][2]))),0,5); |
|
| 443 | - } else $arrivalTime = substr($arrivalTime,0,5); |
|
| 444 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia'); |
|
| 442 | + $arrivalTime = substr(trim(str_replace(' lunes', '', str_replace(' ', '', $flight[5][2]))), 0, 5); |
|
| 443 | + } else $arrivalTime = substr($arrivalTime, 0, 5); |
|
| 444 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_iberia'); |
|
| 445 | 445 | } |
| 446 | 446 | } |
| 447 | 447 | return array(); |
@@ -454,11 +454,11 @@ discard block |
||
| 454 | 454 | * @return Flight departure and arrival airports and time |
| 455 | 455 | */ |
| 456 | 456 | |
| 457 | - private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') { |
|
| 457 | + private function getStarAlliance($callsign, $date = 'NOW', $carrier = '') { |
|
| 458 | 458 | $Common = new Common(); |
| 459 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 459 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 460 | 460 | $check_date = new Datetime($date); |
| 461 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 461 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 462 | 462 | $url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y'); |
| 463 | 463 | $data = $Common->getData($url); |
| 464 | 464 | if ($data != '') { |
@@ -467,13 +467,13 @@ discard block |
||
| 467 | 467 | $flight = $table; |
| 468 | 468 | //print_r($table); |
| 469 | 469 | if (isset($flight[25]) && isset($flight[29])) { |
| 470 | - preg_match('/([A-Z]{3})/',$flight[25][1],$DepartureAirportIataMatch); |
|
| 471 | - preg_match('/([A-Z]{3})/',$flight[25][3],$ArrivalAirportIataMatch); |
|
| 470 | + preg_match('/([A-Z]{3})/', $flight[25][1], $DepartureAirportIataMatch); |
|
| 471 | + preg_match('/([A-Z]{3})/', $flight[25][3], $ArrivalAirportIataMatch); |
|
| 472 | 472 | $DepartureAirportIata = $DepartureAirportIataMatch[0]; |
| 473 | 473 | $ArrivalAirportIata = $ArrivalAirportIataMatch[0]; |
| 474 | - $departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5); |
|
| 475 | - $arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5); |
|
| 476 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance'); |
|
| 474 | + $departureTime = substr(trim(str_replace('Scheduled: ', '', $flight[29][0])), 0, 5); |
|
| 475 | + $arrivalTime = substr(trim(str_replace('Scheduled: ', '', $flight[29][1])), 0, 5); |
|
| 476 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_staralliance'); |
|
| 477 | 477 | } else return array(); |
| 478 | 478 | } |
| 479 | 479 | |
@@ -491,10 +491,10 @@ discard block |
||
| 491 | 491 | */ |
| 492 | 492 | private function getAlitalia($callsign, $date = 'NOW') { |
| 493 | 493 | $Common = new Common(); |
| 494 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 494 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 495 | 495 | $check_date = new Datetime($date); |
| 496 | - $url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y'); |
|
| 497 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 496 | + $url = "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y'); |
|
| 497 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 498 | 498 | $data = $Common->getData($url); |
| 499 | 499 | if ($data != '') { |
| 500 | 500 | $table = $Common->text2array($data); |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | $ArrivalAirportIata = ''; |
| 503 | 503 | $departureTime = $table[4]; |
| 504 | 504 | $arrivalTime = $table[5]; |
| 505 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_alitalia'); |
|
| 505 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_alitalia'); |
|
| 506 | 506 | } |
| 507 | 507 | } |
| 508 | 508 | |
@@ -514,21 +514,21 @@ discard block |
||
| 514 | 514 | */ |
| 515 | 515 | private function getBrussels($callsign, $date = 'NOW') { |
| 516 | 516 | $Common = new Common(); |
| 517 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 517 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 518 | 518 | $check_date = new Datetime($date); |
| 519 | - $url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302"; |
|
| 519 | + $url = "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302"; |
|
| 520 | 520 | //http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber"; |
| 521 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 521 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 522 | 522 | $data = $Common->getData($url); |
| 523 | 523 | if ($data != '') { |
| 524 | 524 | //echo $data; |
| 525 | - $parsed_json = json_decode($data,true); |
|
| 525 | + $parsed_json = json_decode($data, true); |
|
| 526 | 526 | if (isset($parsed_json[0]['FromAirportCode'])) { |
| 527 | 527 | $DepartureAirportIata = $parsed_json[0]['FromAirportCode']; |
| 528 | 528 | $ArrivalAirportIata = $parsed_json[0]['ToAirportCode']; |
| 529 | - $departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate'])); |
|
| 530 | - $arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate'])); |
|
| 531 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels'); |
|
| 529 | + $departureTime = date('H:i', strtotime($parsed_json[0]['ScheduledDepatureDate'])); |
|
| 530 | + $arrivalTime = date('H:i', strtotime($parsed_json[0]['ScheduledArrivalDate'])); |
|
| 531 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_brussels'); |
|
| 532 | 532 | } |
| 533 | 533 | } |
| 534 | 534 | } |
@@ -605,21 +605,21 @@ discard block |
||
| 605 | 605 | */ |
| 606 | 606 | private function getFlyTap($callsign) { |
| 607 | 607 | $Common = new Common(); |
| 608 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 609 | - $url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees"; |
|
| 608 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 609 | + $url = "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees"; |
|
| 610 | 610 | //$check_date = new Datetime($date); |
| 611 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 612 | - $post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1'); |
|
| 613 | - $data = $Common->getData($url,'post',$post); |
|
| 611 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 612 | + $post = array('arrivalsdepartures_content' => 'number', 'arrivalsdepartures_tp' => $numvol, 'arrivalsdepartures_trk' => 'ARR', 'arrivalsdepartures_date_trk' => '1', 'aptCode' => '', 'arrivalsdepartures' => 'DEP', 'arrivalsdepartures_date' => '1', 'aptCodeFrom' => '', 'aptCodeTo' => '', 'arrivalsdepartures2' => 'DEP', 'arrivalsdepartures_date2' => '1'); |
|
| 613 | + $data = $Common->getData($url, 'post', $post); |
|
| 614 | 614 | if ($data != '') { |
| 615 | 615 | $table = $Common->table2array($data); |
| 616 | - $departureTime = trim(substr($table[15][0],0,5)); |
|
| 617 | - $arrivalTime = trim(substr($table[35][0],0,5)); |
|
| 618 | - preg_match('/([A-Z]{3})/',$table[11][0],$DepartureAirportIataMatch); |
|
| 619 | - preg_match('/([A-Z]{3})/',$table[31][0],$ArrivalAirportIataMatch); |
|
| 616 | + $departureTime = trim(substr($table[15][0], 0, 5)); |
|
| 617 | + $arrivalTime = trim(substr($table[35][0], 0, 5)); |
|
| 618 | + preg_match('/([A-Z]{3})/', $table[11][0], $DepartureAirportIataMatch); |
|
| 619 | + preg_match('/([A-Z]{3})/', $table[31][0], $ArrivalAirportIataMatch); |
|
| 620 | 620 | $DepartureAirportIata = $DepartureAirportIataMatch[0]; |
| 621 | 621 | $ArrivalAirportIata = $ArrivalAirportIataMatch[0]; |
| 622 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flytap'); |
|
| 622 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flytap'); |
|
| 623 | 623 | } |
| 624 | 624 | return array(); |
| 625 | 625 | } |
@@ -641,10 +641,10 @@ discard block |
||
| 641 | 641 | } |
| 642 | 642 | } |
| 643 | 643 | if ($airline_icao == '') return array(); |
| 644 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 645 | - $url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol; |
|
| 644 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 645 | + $url = "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol; |
|
| 646 | 646 | //$check_date = new Datetime($date); |
| 647 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 647 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 648 | 648 | $data = $Common->getData($url); |
| 649 | 649 | if ($data != '') { |
| 650 | 650 | $table = $Common->table2array($data); |
@@ -654,13 +654,13 @@ discard block |
||
| 654 | 654 | $darr = ''; |
| 655 | 655 | $ahour = ''; |
| 656 | 656 | $aarr = ''; |
| 657 | - $n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr); |
|
| 657 | + $n = sscanf($sched, '%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])', $dhour, $darr, $ahour, $aarr); |
|
| 658 | 658 | if ($n == 7) { |
| 659 | 659 | $departureTime = $dhour; |
| 660 | 660 | $arrivalTime = $ahour; |
| 661 | - $DepartureAirportIata = str_replace(array('(',')'),'',$darr); |
|
| 662 | - $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr); |
|
| 663 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper'); |
|
| 661 | + $DepartureAirportIata = str_replace(array('(', ')'), '', $darr); |
|
| 662 | + $ArrivalAirportIata = str_replace(array('(', ')'), '', $aarr); |
|
| 663 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightmapper'); |
|
| 664 | 664 | } |
| 665 | 665 | } |
| 666 | 666 | } |
@@ -684,20 +684,20 @@ discard block |
||
| 684 | 684 | } |
| 685 | 685 | } |
| 686 | 686 | */ |
| 687 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 688 | - $url= "http://fr.flightaware.com/live/flight/".$callsign; |
|
| 687 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 688 | + $url = "http://fr.flightaware.com/live/flight/".$callsign; |
|
| 689 | 689 | //$check_date = new Datetime($date); |
| 690 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 690 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 691 | 691 | $data = $Common->getData($url); |
| 692 | 692 | if ($data != '') { |
| 693 | 693 | $table = $Common->table2array($data); |
| 694 | 694 | if (isset($table[11][0])) { |
| 695 | - $departureTime = str_replace('h',':',substr($table[5][0],0,5)); |
|
| 696 | - $arrivalTime = str_replace('h',':',substr($table[5][1],0,5)); |
|
| 695 | + $departureTime = str_replace('h', ':', substr($table[5][0], 0, 5)); |
|
| 696 | + $arrivalTime = str_replace('h', ':', substr($table[5][1], 0, 5)); |
|
| 697 | 697 | echo $table[3][0]; |
| 698 | - sscanf($table[3][0],'%*[^(] (%3[A-Z] / %*4[A-Z])',$DepartureAirportIata); |
|
| 699 | - sscanf($table[3][1],'%*[^(] (%3[A-Z] / %*4[A-Z])',$ArrivalAirportIata); |
|
| 700 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightaware'); |
|
| 698 | + sscanf($table[3][0], '%*[^(] (%3[A-Z] / %*4[A-Z])', $DepartureAirportIata); |
|
| 699 | + sscanf($table[3][1], '%*[^(] (%3[A-Z] / %*4[A-Z])', $ArrivalAirportIata); |
|
| 700 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightaware'); |
|
| 701 | 701 | } |
| 702 | 702 | } |
| 703 | 703 | return array(); |
@@ -710,7 +710,7 @@ discard block |
||
| 710 | 710 | */ |
| 711 | 711 | public function getCostToTravel($callsign) { |
| 712 | 712 | $Common = new Common(); |
| 713 | - $url= "http://www.costtotravel.com/flight-number/".$callsign; |
|
| 713 | + $url = "http://www.costtotravel.com/flight-number/".$callsign; |
|
| 714 | 714 | //$check_date = new Datetime($date); |
| 715 | 715 | //if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
| 716 | 716 | $data = $Common->getData($url); |
@@ -718,11 +718,11 @@ discard block |
||
| 718 | 718 | $table = $Common->table2array($data); |
| 719 | 719 | //print_r($table); |
| 720 | 720 | if (isset($table[11][1])) { |
| 721 | - $departureTime = substr($table[11][1],0,5); |
|
| 722 | - $arrivalTime = substr($table[17][1],0,5); |
|
| 723 | - $DepartureAirportIata = substr($table[13][1],0,3); |
|
| 724 | - $ArrivalAirportIata = substr($table[15][1],0,3); |
|
| 725 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_costtotravel'); |
|
| 721 | + $departureTime = substr($table[11][1], 0, 5); |
|
| 722 | + $arrivalTime = substr($table[17][1], 0, 5); |
|
| 723 | + $DepartureAirportIata = substr($table[13][1], 0, 3); |
|
| 724 | + $ArrivalAirportIata = substr($table[15][1], 0, 3); |
|
| 725 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_costtotravel'); |
|
| 726 | 726 | } |
| 727 | 727 | } |
| 728 | 728 | return array(); |
@@ -734,14 +734,14 @@ discard block |
||
| 734 | 734 | * @param String $date date we want flight number info |
| 735 | 735 | * @return Flight departure and arrival airports and time |
| 736 | 736 | */ |
| 737 | - private function getAirCanada($callsign,$date = 'NOW') { |
|
| 737 | + private function getAirCanada($callsign, $date = 'NOW') { |
|
| 738 | 738 | $Common = new Common(); |
| 739 | 739 | if (class_exists("DomDocument") === FALSE) return array(); |
| 740 | 740 | date_default_timezone_set('UTC'); |
| 741 | 741 | $check_date = new Datetime($date); |
| 742 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 743 | - $url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249"; |
|
| 744 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 742 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 743 | + $url = "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249"; |
|
| 744 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 745 | 745 | $data = $Common->getData($url); |
| 746 | 746 | $dom = new DomDocument(); |
| 747 | 747 | $dom->loadXML($data); |
@@ -749,11 +749,11 @@ discard block |
||
| 749 | 749 | $departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0); |
| 750 | 750 | if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) { |
| 751 | 751 | $DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue; |
| 752 | - $departureTime = date('H:i',strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue)); |
|
| 752 | + $departureTime = date('H:i', strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue)); |
|
| 753 | 753 | $arrival = $dom->getElementsByTagName('ArrivalStationInfo')->item(0); |
| 754 | 754 | $ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue; |
| 755 | - $arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue)); |
|
| 756 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada'); |
|
| 755 | + $arrivalTime = date('H:i', strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue)); |
|
| 756 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_aircanada'); |
|
| 757 | 757 | } else return array(); |
| 758 | 758 | } |
| 759 | 759 | |
@@ -765,21 +765,21 @@ discard block |
||
| 765 | 765 | */ |
| 766 | 766 | private function getVietnamAirlines($callsign, $date = 'NOW') { |
| 767 | 767 | $Common = new Common(); |
| 768 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 768 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 769 | 769 | $check_date = new Datetime($date); |
| 770 | - $url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&"; |
|
| 771 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 770 | + $url = "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&"; |
|
| 771 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 772 | 772 | $data = $Common->getData($url); |
| 773 | 773 | if ($data != '') { |
| 774 | 774 | $table = $Common->table2array($data); |
| 775 | 775 | $flight = $table; |
| 776 | - preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch); |
|
| 777 | - preg_match('/([A-Z]{3})/',$flight[21][0],$ArrivalAirportIataMatch); |
|
| 776 | + preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch); |
|
| 777 | + preg_match('/([A-Z]{3})/', $flight[21][0], $ArrivalAirportIataMatch); |
|
| 778 | 778 | $DepartureAirportIata = $DepartureAirportIataMatch[0]; |
| 779 | 779 | $ArrivalAirportIata = $ArrivalAirportIataMatch[0]; |
| 780 | 780 | $departureTime = $flight[5][1]; |
| 781 | 781 | $arrivalTime = $flight[23][1]; |
| 782 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_vietnamairlines'); |
|
| 782 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_vietnamairlines'); |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | |
@@ -790,16 +790,16 @@ discard block |
||
| 790 | 790 | * @param String $carrier airline code |
| 791 | 791 | * @return Flight departure and arrival airports and time |
| 792 | 792 | */ |
| 793 | - private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') { |
|
| 793 | + private function getAirBerlin($callsign, $date = 'NOW', $carrier = 'AB') { |
|
| 794 | 794 | $Common = new Common(); |
| 795 | 795 | date_default_timezone_set('UTC'); |
| 796 | 796 | //AB = airberlin, HG/NLY = NIKI, 4T/BHP = Belair |
| 797 | - $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
|
| 797 | + $numvol = preg_replace('/^[A-Z]*/', '', $callsign); |
|
| 798 | 798 | $check_date = new Datetime($date); |
| 799 | - $url= "http://www.airberlin.com/en-US/site/aims.php"; |
|
| 800 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 801 | - $post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier); |
|
| 802 | - $data = $Common->getData($url,'post',$post); |
|
| 799 | + $url = "http://www.airberlin.com/en-US/site/aims.php"; |
|
| 800 | + if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array(); |
|
| 801 | + $post = array('type' => 'departure', 'searchFlightNo' => '1', 'requestsent' => 'true', 'flightno' => $numvol, 'date' => $check_date->format('Y-m-d'), 'carrier' => $carrier); |
|
| 802 | + $data = $Common->getData($url, 'post', $post); |
|
| 803 | 803 | //echo $data; |
| 804 | 804 | $DepartureAirportIata = ''; |
| 805 | 805 | $ArrivalAirportIata = ''; |
@@ -812,8 +812,8 @@ discard block |
||
| 812 | 812 | if (isset($flight[5][2])) $departureAirport = $flight[5][2]; |
| 813 | 813 | else $departureAirport = ''; |
| 814 | 814 | } else return array(); |
| 815 | - $post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB'); |
|
| 816 | - $data = $Common->getData($url,'post',$post); |
|
| 815 | + $post = array('type' => 'arrival', 'searchFlightNo' => '1', 'requestsent' => 'true', 'flightno' => $numvol, 'date' => $check_date->format('Y-m-d'), 'carrier' => 'AB'); |
|
| 816 | + $data = $Common->getData($url, 'post', $post); |
|
| 817 | 817 | if ($data != '') { |
| 818 | 818 | $table = $Common->table2array($data); |
| 819 | 819 | $flight = $table; |
@@ -841,13 +841,13 @@ discard block |
||
| 841 | 841 | } |
| 842 | 842 | } |
| 843 | 843 | if (isset($DepartureAirportIata)) { |
| 844 | - return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin'); |
|
| 844 | + return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airberlin'); |
|
| 845 | 845 | } else return array(); |
| 846 | 846 | } |
| 847 | 847 | |
| 848 | 848 | |
| 849 | 849 | |
| 850 | - public function fetchSchedule($ident,$date = 'NOW') { |
|
| 850 | + public function fetchSchedule($ident, $date = 'NOW') { |
|
| 851 | 851 | global $globalSchedulesSources, $globalSchedulesFetch; |
| 852 | 852 | //$Common = new Common(); |
| 853 | 853 | if (!$globalSchedulesFetch) return array(); |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | // Brussels Airlines |
| 918 | 918 | case "BEL": |
| 919 | 919 | case "SN": |
| 920 | - return $this->getBrussels($ident,$date); |
|
| 920 | + return $this->getBrussels($ident, $date); |
|
| 921 | 921 | /* |
| 922 | 922 | // Copa Airlines |
| 923 | 923 | case "CMP": |
@@ -1002,17 +1002,17 @@ discard block |
||
| 1002 | 1002 | // Air France |
| 1003 | 1003 | case "AF": |
| 1004 | 1004 | case "AFR": |
| 1005 | - return $this->getAirFrance($ident,$date,'AF'); |
|
| 1005 | + return $this->getAirFrance($ident, $date, 'AF'); |
|
| 1006 | 1006 | // HOP |
| 1007 | 1007 | case "A5": |
| 1008 | 1008 | case "HOP": |
| 1009 | - return $this->getAirFrance($ident,$date,'A5'); |
|
| 1009 | + return $this->getAirFrance($ident, $date, 'A5'); |
|
| 1010 | 1010 | // EasyJet |
| 1011 | 1011 | case "U2": |
| 1012 | 1012 | case "DS": |
| 1013 | 1013 | case "EZY": |
| 1014 | 1014 | case "EZS": |
| 1015 | - return $this->getEasyJet($ident,$date); |
|
| 1015 | + return $this->getEasyJet($ident, $date); |
|
| 1016 | 1016 | // Ryanair |
| 1017 | 1017 | case "FR": |
| 1018 | 1018 | case "RYR": |
@@ -1062,25 +1062,25 @@ discard block |
||
| 1062 | 1062 | return $this->getIberia($ident); |
| 1063 | 1063 | // Vietnam Airlines |
| 1064 | 1064 | case "HVN": |
| 1065 | - return $this->getVietnamAirlines($ident,$date); |
|
| 1065 | + return $this->getVietnamAirlines($ident, $date); |
|
| 1066 | 1066 | // Air Berlin |
| 1067 | 1067 | case "AB": |
| 1068 | 1068 | case "BER": |
| 1069 | - return $this->getAirBerlin($ident,$date,'AB'); |
|
| 1069 | + return $this->getAirBerlin($ident, $date, 'AB'); |
|
| 1070 | 1070 | // NIKI |
| 1071 | 1071 | case "HG": |
| 1072 | 1072 | case "NLY": |
| 1073 | - return $this->getAirBerlin($ident,$date,'HG'); |
|
| 1073 | + return $this->getAirBerlin($ident, $date, 'HG'); |
|
| 1074 | 1074 | // BelAir |
| 1075 | 1075 | case "4T": |
| 1076 | 1076 | case "BHP": |
| 1077 | - return $this->getAirBerlin($ident,$date,'4T'); |
|
| 1077 | + return $this->getAirBerlin($ident, $date, '4T'); |
|
| 1078 | 1078 | default: |
| 1079 | 1079 | // Randomly use a generic function to get hours |
| 1080 | 1080 | if (strlen($airline_icao) == 2) { |
| 1081 | - if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1081 | + if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
| 1082 | 1082 | if (count($globalSchedulesSources) > 0) { |
| 1083 | - $rand = mt_rand(0,count($globalSchedulesSources)-1); |
|
| 1083 | + $rand = mt_rand(0, count($globalSchedulesSources) - 1); |
|
| 1084 | 1084 | $source = $globalSchedulesSources[$rand]; |
| 1085 | 1085 | if ($source == 'flightmapper') return $this->getFlightMapper($ident); |
| 1086 | 1086 | elseif ($source == 'costtotravel') return $this->getCostToTravel($ident); |
@@ -12,7 +12,9 @@ discard block |
||
| 12 | 12 | public function __construct($dbc = null) { |
| 13 | 13 | $Connection = new Connection($dbc); |
| 14 | 14 | $this->db = $Connection->db(); |
| 15 | - if ($this->db === null) die('Error: No DB connection.'); |
|
| 15 | + if ($this->db === null) { |
|
| 16 | + die('Error: No DB connection.'); |
|
| 17 | + } |
|
| 16 | 18 | } |
| 17 | 19 | |
| 18 | 20 | /** |
@@ -124,7 +126,9 @@ discard block |
||
| 124 | 126 | $sth->closeCursor(); |
| 125 | 127 | if (count($row) > 0) { |
| 126 | 128 | return $row; |
| 127 | - } else return array(); |
|
| 129 | + } else { |
|
| 130 | + return array(); |
|
| 131 | + } |
|
| 128 | 132 | } |
| 129 | 133 | |
| 130 | 134 | public function checkSchedule($ident) { |
@@ -160,7 +164,9 @@ discard block |
||
| 160 | 164 | $Common = new Common(); |
| 161 | 165 | $check_date = new Datetime($date); |
| 162 | 166 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 163 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 167 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 168 | + return array(); |
|
| 169 | + } |
|
| 164 | 170 | $url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym'); |
| 165 | 171 | $json = $Common->getData($url); |
| 166 | 172 | |
@@ -187,7 +193,9 @@ discard block |
||
| 187 | 193 | */ |
| 188 | 194 | |
| 189 | 195 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance'); |
| 190 | - } else return array(); |
|
| 196 | + } else { |
|
| 197 | + return array(); |
|
| 198 | + } |
|
| 191 | 199 | } |
| 192 | 200 | |
| 193 | 201 | /** |
@@ -202,7 +210,9 @@ discard block |
||
| 202 | 210 | date_default_timezone_set($globalTimezone); |
| 203 | 211 | $check_date = new Datetime($date); |
| 204 | 212 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 205 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 213 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 214 | + return array(); |
|
| 215 | + } |
|
| 206 | 216 | $url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign; |
| 207 | 217 | $json = $Common->getData($url); |
| 208 | 218 | $parsed_json = json_decode($json); |
@@ -215,7 +225,9 @@ discard block |
||
| 215 | 225 | $arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'}; |
| 216 | 226 | |
| 217 | 227 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet'); |
| 218 | - } else return array(); |
|
| 228 | + } else { |
|
| 229 | + return array(); |
|
| 230 | + } |
|
| 219 | 231 | } |
| 220 | 232 | |
| 221 | 233 | /** |
@@ -226,7 +238,9 @@ discard block |
||
| 226 | 238 | private function getRyanair($callsign) { |
| 227 | 239 | $Common = new Common(); |
| 228 | 240 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 229 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 241 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 242 | + return array(); |
|
| 243 | + } |
|
| 230 | 244 | $url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/"; |
| 231 | 245 | $post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}'; |
| 232 | 246 | $headers = array('Content-Type: application/json','Content-Length: ' . strlen($post)); |
@@ -240,8 +254,12 @@ discard block |
||
| 240 | 254 | $departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'}; |
| 241 | 255 | $arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'}; |
| 242 | 256 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair'); |
| 243 | - } else return array(); |
|
| 244 | - } else return array(); |
|
| 257 | + } else { |
|
| 258 | + return array(); |
|
| 259 | + } |
|
| 260 | + } else { |
|
| 261 | + return array(); |
|
| 262 | + } |
|
| 245 | 263 | } |
| 246 | 264 | |
| 247 | 265 | /** |
@@ -252,7 +270,9 @@ discard block |
||
| 252 | 270 | private function getSwiss($callsign) { |
| 253 | 271 | $Common = new Common(); |
| 254 | 272 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 255 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 273 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 274 | + return array(); |
|
| 275 | + } |
|
| 256 | 276 | $url = "http://www.world-of-swiss.com/fr/routenetwork.json"; |
| 257 | 277 | $json = $Common->getData($url); |
| 258 | 278 | $parsed_json = json_decode($json); |
@@ -272,8 +292,12 @@ discard block |
||
| 272 | 292 | } |
| 273 | 293 | if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) { |
| 274 | 294 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss'); |
| 275 | - } else return array(); |
|
| 276 | - } else return array(); |
|
| 295 | + } else { |
|
| 296 | + return array(); |
|
| 297 | + } |
|
| 298 | + } else { |
|
| 299 | + return array(); |
|
| 300 | + } |
|
| 277 | 301 | } |
| 278 | 302 | |
| 279 | 303 | /** |
@@ -287,12 +311,18 @@ discard block |
||
| 287 | 311 | $Common = new Common(); |
| 288 | 312 | $check_date = new Datetime($date); |
| 289 | 313 | $numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign)); |
| 290 | - if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array(); |
|
| 291 | - if ($globalBritishAirwaysKey == '') return array(); |
|
| 314 | + if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) { |
|
| 315 | + return array(); |
|
| 316 | + } |
|
| 317 | + if ($globalBritishAirwaysKey == '') { |
|
| 318 | + return array(); |
|
| 319 | + } |
|
| 292 | 320 | $url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json"; |
| 293 | 321 | $headers = array('Client-Key: '.$globalBritishAirwaysKey); |
| 294 | 322 | $json = $Common->getData($url,'get','',$headers); |
| 295 | - if ($json == '') return array(); |
|
| 323 | + if ($json == '') { |
|
| 324 | + return array(); |
|
| 325 | + } |
|
| 296 | 326 | $parsed_json = json_decode($json); |
| 297 | 327 | $flights = $parsed_json->{'FlightsResponse'}; |
| 298 | 328 | if (count($flights) > 0) { |
@@ -301,7 +331,9 @@ discard block |
||
| 301 | 331 | $departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'})); |
| 302 | 332 | $arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'})); |
| 303 | 333 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways'); |
| 304 | - } else return array(); |
|
| 334 | + } else { |
|
| 335 | + return array(); |
|
| 336 | + } |
|
| 305 | 337 | } |
| 306 | 338 | |
| 307 | 339 | /** |
@@ -315,19 +347,27 @@ discard block |
||
| 315 | 347 | $Common = new Common(); |
| 316 | 348 | $check_date = new Datetime($date); |
| 317 | 349 | $numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign)); |
| 318 | - if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array(); |
|
| 319 | - if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array(); |
|
| 350 | + if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) { |
|
| 351 | + return array(); |
|
| 352 | + } |
|
| 353 | + if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') { |
|
| 354 | + return array(); |
|
| 355 | + } |
|
| 320 | 356 | $url = "https://api.lufthansa.com/v1/oauth/token"; |
| 321 | 357 | $post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials'); |
| 322 | 358 | $data = $Common->getData($url,'post',$post); |
| 323 | 359 | $parsed_data = json_decode($data); |
| 324 | - if (!isset($parsed_data->{'access_token'})) return array(); |
|
| 360 | + if (!isset($parsed_data->{'access_token'})) { |
|
| 361 | + return array(); |
|
| 362 | + } |
|
| 325 | 363 | $token = $parsed_data->{'access_token'}; |
| 326 | 364 | |
| 327 | 365 | $url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d'); |
| 328 | 366 | $headers = array('Authorization: Bearer '.$token,'Accept: application/json'); |
| 329 | 367 | $json = $Common->getData($url,'get','',$headers); |
| 330 | - if ($json == '') return array(); |
|
| 368 | + if ($json == '') { |
|
| 369 | + return array(); |
|
| 370 | + } |
|
| 331 | 371 | $parsed_json = json_decode($json); |
| 332 | 372 | if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) { |
| 333 | 373 | $DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'}; |
@@ -335,7 +375,9 @@ discard block |
||
| 335 | 375 | $ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'}; |
| 336 | 376 | $arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'})); |
| 337 | 377 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa'); |
| 338 | - } else return array(); |
|
| 378 | + } else { |
|
| 379 | + return array(); |
|
| 380 | + } |
|
| 339 | 381 | } |
| 340 | 382 | |
| 341 | 383 | /** |
@@ -349,14 +391,20 @@ discard block |
||
| 349 | 391 | $Common = new Common(); |
| 350 | 392 | $check_date = new Datetime($date); |
| 351 | 393 | $numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign)); |
| 352 | - if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array(); |
|
| 353 | - if ($globalTransaviaKey == '') return array(); |
|
| 394 | + if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) { |
|
| 395 | + return array(); |
|
| 396 | + } |
|
| 397 | + if ($globalTransaviaKey == '') { |
|
| 398 | + return array(); |
|
| 399 | + } |
|
| 354 | 400 | $url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol; |
| 355 | 401 | //$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol; |
| 356 | 402 | $headers = array('apikey: '.$globalTransaviaKey); |
| 357 | 403 | $json = $Common->getData($url,'get','',$headers); |
| 358 | 404 | //echo 'result : '.$json; |
| 359 | - if ($json == '') return array(); |
|
| 405 | + if ($json == '') { |
|
| 406 | + return array(); |
|
| 407 | + } |
|
| 360 | 408 | $parsed_json = json_decode($json); |
| 361 | 409 | |
| 362 | 410 | if (isset($parsed_json->{'data'}[0])) { |
@@ -365,7 +413,9 @@ discard block |
||
| 365 | 413 | $ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'}; |
| 366 | 414 | $arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'})); |
| 367 | 415 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia'); |
| 368 | - } else return array(); |
|
| 416 | + } else { |
|
| 417 | + return array(); |
|
| 418 | + } |
|
| 369 | 419 | } |
| 370 | 420 | |
| 371 | 421 | /** |
@@ -376,7 +426,9 @@ discard block |
||
| 376 | 426 | public function getTunisair($callsign) { |
| 377 | 427 | $Common = new Common(); |
| 378 | 428 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 379 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 429 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 430 | + return array(); |
|
| 431 | + } |
|
| 380 | 432 | $url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp"; |
| 381 | 433 | $data = $Common->getData($url); |
| 382 | 434 | $table = $Common->table2array($data); |
@@ -397,7 +449,9 @@ discard block |
||
| 397 | 449 | $Common = new Common(); |
| 398 | 450 | $check_date = new Datetime($date); |
| 399 | 451 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 400 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 452 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 453 | + return array(); |
|
| 454 | + } |
|
| 401 | 455 | $final_date = str_replace('/','%2F',$check_date->format('d/m/Y')); |
| 402 | 456 | $url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB"; |
| 403 | 457 | $data = $Common->getData($url); |
@@ -407,8 +461,11 @@ discard block |
||
| 407 | 461 | $DepartureAirportIata = str_replace('flightOri=','',$result[0]); |
| 408 | 462 | preg_match('/flightDest=[A-Z]{3}/',$data,$result); |
| 409 | 463 | $ArrivalAirportIata = str_replace('flightDest=','',$result[0]); |
| 410 | - if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling'); |
|
| 411 | - else return array(); |
|
| 464 | + if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') { |
|
| 465 | + return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling'); |
|
| 466 | + } else { |
|
| 467 | + return array(); |
|
| 468 | + } |
|
| 412 | 469 | } |
| 413 | 470 | return array(); |
| 414 | 471 | } |
@@ -423,7 +480,9 @@ discard block |
||
| 423 | 480 | $Common = new Common(); |
| 424 | 481 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 425 | 482 | $check_date = new Datetime($date); |
| 426 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 483 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 484 | + return array(); |
|
| 485 | + } |
|
| 427 | 486 | $url = "https://www.iberia.com/web/flightDetail.do"; |
| 428 | 487 | $post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB'); |
| 429 | 488 | $data = $Common->getData($url,'post',$post); |
@@ -440,7 +499,9 @@ discard block |
||
| 440 | 499 | $arrivalTime = trim(str_replace(' lunes','',str_replace(' ','',$flight[5][1]))); |
| 441 | 500 | if ($arrivalTime == 'Hora estimada de llegada') { |
| 442 | 501 | $arrivalTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[5][2]))),0,5); |
| 443 | - } else $arrivalTime = substr($arrivalTime,0,5); |
|
| 502 | + } else { |
|
| 503 | + $arrivalTime = substr($arrivalTime,0,5); |
|
| 504 | + } |
|
| 444 | 505 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia'); |
| 445 | 506 | } |
| 446 | 507 | } |
@@ -458,7 +519,9 @@ discard block |
||
| 458 | 519 | $Common = new Common(); |
| 459 | 520 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 460 | 521 | $check_date = new Datetime($date); |
| 461 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 522 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 523 | + return array(); |
|
| 524 | + } |
|
| 462 | 525 | $url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y'); |
| 463 | 526 | $data = $Common->getData($url); |
| 464 | 527 | if ($data != '') { |
@@ -474,7 +537,9 @@ discard block |
||
| 474 | 537 | $departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5); |
| 475 | 538 | $arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5); |
| 476 | 539 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance'); |
| 477 | - } else return array(); |
|
| 540 | + } else { |
|
| 541 | + return array(); |
|
| 542 | + } |
|
| 478 | 543 | } |
| 479 | 544 | |
| 480 | 545 | |
@@ -494,7 +559,9 @@ discard block |
||
| 494 | 559 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 495 | 560 | $check_date = new Datetime($date); |
| 496 | 561 | $url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y'); |
| 497 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 562 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 563 | + return array(); |
|
| 564 | + } |
|
| 498 | 565 | $data = $Common->getData($url); |
| 499 | 566 | if ($data != '') { |
| 500 | 567 | $table = $Common->text2array($data); |
@@ -518,7 +585,9 @@ discard block |
||
| 518 | 585 | $check_date = new Datetime($date); |
| 519 | 586 | $url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302"; |
| 520 | 587 | //http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber"; |
| 521 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 588 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 589 | + return array(); |
|
| 590 | + } |
|
| 522 | 591 | $data = $Common->getData($url); |
| 523 | 592 | if ($data != '') { |
| 524 | 593 | //echo $data; |
@@ -608,7 +677,9 @@ discard block |
||
| 608 | 677 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 609 | 678 | $url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees"; |
| 610 | 679 | //$check_date = new Datetime($date); |
| 611 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 680 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 681 | + return array(); |
|
| 682 | + } |
|
| 612 | 683 | $post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1'); |
| 613 | 684 | $data = $Common->getData($url,'post',$post); |
| 614 | 685 | if ($data != '') { |
@@ -640,11 +711,15 @@ discard block |
||
| 640 | 711 | $airline_icao = substr($callsign, 0, 3); |
| 641 | 712 | } |
| 642 | 713 | } |
| 643 | - if ($airline_icao == '') return array(); |
|
| 714 | + if ($airline_icao == '') { |
|
| 715 | + return array(); |
|
| 716 | + } |
|
| 644 | 717 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 645 | 718 | $url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol; |
| 646 | 719 | //$check_date = new Datetime($date); |
| 647 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 720 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 721 | + return array(); |
|
| 722 | + } |
|
| 648 | 723 | $data = $Common->getData($url); |
| 649 | 724 | if ($data != '') { |
| 650 | 725 | $table = $Common->table2array($data); |
@@ -687,7 +762,9 @@ discard block |
||
| 687 | 762 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 688 | 763 | $url= "http://fr.flightaware.com/live/flight/".$callsign; |
| 689 | 764 | //$check_date = new Datetime($date); |
| 690 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 765 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 766 | + return array(); |
|
| 767 | + } |
|
| 691 | 768 | $data = $Common->getData($url); |
| 692 | 769 | if ($data != '') { |
| 693 | 770 | $table = $Common->table2array($data); |
@@ -736,16 +813,22 @@ discard block |
||
| 736 | 813 | */ |
| 737 | 814 | private function getAirCanada($callsign,$date = 'NOW') { |
| 738 | 815 | $Common = new Common(); |
| 739 | - if (class_exists("DomDocument") === FALSE) return array(); |
|
| 816 | + if (class_exists("DomDocument") === FALSE) { |
|
| 817 | + return array(); |
|
| 818 | + } |
|
| 740 | 819 | date_default_timezone_set('UTC'); |
| 741 | 820 | $check_date = new Datetime($date); |
| 742 | 821 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 743 | 822 | $url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249"; |
| 744 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 823 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 824 | + return array(); |
|
| 825 | + } |
|
| 745 | 826 | $data = $Common->getData($url); |
| 746 | 827 | $dom = new DomDocument(); |
| 747 | 828 | $dom->loadXML($data); |
| 748 | - if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) return array(); |
|
| 829 | + if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) { |
|
| 830 | + return array(); |
|
| 831 | + } |
|
| 749 | 832 | $departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0); |
| 750 | 833 | if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) { |
| 751 | 834 | $DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue; |
@@ -754,7 +837,9 @@ discard block |
||
| 754 | 837 | $ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue; |
| 755 | 838 | $arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue)); |
| 756 | 839 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada'); |
| 757 | - } else return array(); |
|
| 840 | + } else { |
|
| 841 | + return array(); |
|
| 842 | + } |
|
| 758 | 843 | } |
| 759 | 844 | |
| 760 | 845 | /** |
@@ -768,7 +853,9 @@ discard block |
||
| 768 | 853 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 769 | 854 | $check_date = new Datetime($date); |
| 770 | 855 | $url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&"; |
| 771 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 856 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 857 | + return array(); |
|
| 858 | + } |
|
| 772 | 859 | $data = $Common->getData($url); |
| 773 | 860 | if ($data != '') { |
| 774 | 861 | $table = $Common->table2array($data); |
@@ -797,7 +884,9 @@ discard block |
||
| 797 | 884 | $numvol = preg_replace('/^[A-Z]*/','',$callsign); |
| 798 | 885 | $check_date = new Datetime($date); |
| 799 | 886 | $url= "http://www.airberlin.com/en-US/site/aims.php"; |
| 800 | - if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array(); |
|
| 887 | + if (!filter_var($numvol,FILTER_VALIDATE_INT)) { |
|
| 888 | + return array(); |
|
| 889 | + } |
|
| 801 | 890 | $post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier); |
| 802 | 891 | $data = $Common->getData($url,'post',$post); |
| 803 | 892 | //echo $data; |
@@ -807,11 +896,19 @@ discard block |
||
| 807 | 896 | if ($data != '') { |
| 808 | 897 | $table = $Common->table2array($data); |
| 809 | 898 | $flight = $table; |
| 810 | - if (isset($flight[5][4])) $departureTime = $flight[5][4]; |
|
| 811 | - else $departureTime = ''; |
|
| 812 | - if (isset($flight[5][2])) $departureAirport = $flight[5][2]; |
|
| 813 | - else $departureAirport = ''; |
|
| 814 | - } else return array(); |
|
| 899 | + if (isset($flight[5][4])) { |
|
| 900 | + $departureTime = $flight[5][4]; |
|
| 901 | + } else { |
|
| 902 | + $departureTime = ''; |
|
| 903 | + } |
|
| 904 | + if (isset($flight[5][2])) { |
|
| 905 | + $departureAirport = $flight[5][2]; |
|
| 906 | + } else { |
|
| 907 | + $departureAirport = ''; |
|
| 908 | + } |
|
| 909 | + } else { |
|
| 910 | + return array(); |
|
| 911 | + } |
|
| 815 | 912 | $post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB'); |
| 816 | 913 | $data = $Common->getData($url,'post',$post); |
| 817 | 914 | if ($data != '') { |
@@ -824,10 +921,14 @@ discard block |
||
| 824 | 921 | $arrivalTime = ''; |
| 825 | 922 | $arrivalAirport = ''; |
| 826 | 923 | } |
| 827 | - } else return array(); |
|
| 924 | + } else { |
|
| 925 | + return array(); |
|
| 926 | + } |
|
| 828 | 927 | $url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner'; |
| 829 | 928 | $json = $Common->getData($url); |
| 830 | - if ($json == '') return array(); |
|
| 929 | + if ($json == '') { |
|
| 930 | + return array(); |
|
| 931 | + } |
|
| 831 | 932 | $parsed_json = json_decode($json); |
| 832 | 933 | $airports = $parsed_json->{'suggestList'}; |
| 833 | 934 | if (count($airports) > 0) { |
@@ -842,7 +943,9 @@ discard block |
||
| 842 | 943 | } |
| 843 | 944 | if (isset($DepartureAirportIata)) { |
| 844 | 945 | return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin'); |
| 845 | - } else return array(); |
|
| 946 | + } else { |
|
| 947 | + return array(); |
|
| 948 | + } |
|
| 846 | 949 | } |
| 847 | 950 | |
| 848 | 951 | |
@@ -850,7 +953,9 @@ discard block |
||
| 850 | 953 | public function fetchSchedule($ident,$date = 'NOW') { |
| 851 | 954 | global $globalSchedulesSources, $globalSchedulesFetch; |
| 852 | 955 | //$Common = new Common(); |
| 853 | - if (!$globalSchedulesFetch) return array(); |
|
| 956 | + if (!$globalSchedulesFetch) { |
|
| 957 | + return array(); |
|
| 958 | + } |
|
| 854 | 959 | $airline_icao = ''; |
| 855 | 960 | if (!is_numeric(substr($ident, 0, 3))) |
| 856 | 961 | { |
@@ -1078,14 +1183,21 @@ discard block |
||
| 1078 | 1183 | default: |
| 1079 | 1184 | // Randomly use a generic function to get hours |
| 1080 | 1185 | if (strlen($airline_icao) == 2) { |
| 1081 | - if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1186 | + if (!isset($globalSchedulesSources)) { |
|
| 1187 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1188 | + } |
|
| 1082 | 1189 | if (count($globalSchedulesSources) > 0) { |
| 1083 | 1190 | $rand = mt_rand(0,count($globalSchedulesSources)-1); |
| 1084 | 1191 | $source = $globalSchedulesSources[$rand]; |
| 1085 | - if ($source == 'flightmapper') return $this->getFlightMapper($ident); |
|
| 1086 | - elseif ($source == 'costtotravel') return $this->getCostToTravel($ident); |
|
| 1192 | + if ($source == 'flightmapper') { |
|
| 1193 | + return $this->getFlightMapper($ident); |
|
| 1194 | + } elseif ($source == 'costtotravel') { |
|
| 1195 | + return $this->getCostToTravel($ident); |
|
| 1196 | + } |
|
| 1087 | 1197 | //elseif ($source == 'flightradar24') return $this->getFlightRadar24($ident,$date); |
| 1088 | - elseif ($source == 'flightaware') return $this->getFlightAware($ident); |
|
| 1198 | + elseif ($source == 'flightaware') { |
|
| 1199 | + return $this->getFlightAware($ident); |
|
| 1200 | + } |
|
| 1089 | 1201 | } |
| 1090 | 1202 | } |
| 1091 | 1203 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | require_once('require/class.Satellite.php'); |
| 6 | 6 | |
| 7 | -$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING); |
|
| 7 | +$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING); |
|
| 8 | 8 | if ($trackident != '') { |
| 9 | 9 | require_once('require/class.SpotterLive.php'); |
| 10 | 10 | $SpotterLive = new SpotterLive(); |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | $spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident); |
| 15 | 15 | header('Location: '.$globalURL.'/flightid/'.$spotterid); |
| 16 | 16 | } else { |
| 17 | - setcookie('MapTrack',$resulttrackident[0]['flightaware_id']); |
|
| 17 | + setcookie('MapTrack', $resulttrackident[0]['flightaware_id']); |
|
| 18 | 18 | } |
| 19 | 19 | } else { |
| 20 | 20 | unset($_COOKIE['MapTrack']); |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | <div class="form-group"> |
| 195 | 195 | <label>From (UTC):</label> |
| 196 | 196 | <div class='input-group date' id='datetimepicker1'> |
| 197 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required /> |
|
| 197 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a", $_COOKIE['archive_begin']); ?>" required /> |
|
| 198 | 198 | <span class="input-group-addon"> |
| 199 | 199 | <span class="glyphicon glyphicon-calendar"></span> |
| 200 | 200 | </span> |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | <div class="form-group"> |
| 204 | 204 | <label>To (UTC):</label> |
| 205 | 205 | <div class='input-group date' id='datetimepicker2'> |
| 206 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" /> |
|
| 206 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a", $_COOKIE['archive_end']); ?>" /> |
|
| 207 | 207 | <span class="input-group-addon"> |
| 208 | 208 | <span class="glyphicon glyphicon-calendar"></span> |
| 209 | 209 | </span> |
@@ -327,9 +327,9 @@ discard block |
||
| 327 | 327 | <li><?php echo _("Type of Terrain:"); ?> |
| 328 | 328 | <select class="selectpicker" onchange="terrainType(this);"> |
| 329 | 329 | <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
| 330 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
| 331 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
| 332 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
| 330 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option> |
|
| 331 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option> |
|
| 332 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected'; ?>>ArticDEM</option> |
|
| 333 | 333 | </select> |
| 334 | 334 | </li> |
| 335 | 335 | <?php |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 366 | 366 | <?php |
| 367 | 367 | } |
| 368 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 368 | + if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) { |
|
| 369 | 369 | ?> |
| 370 | 370 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 371 | 371 | <?php |
@@ -541,10 +541,10 @@ discard block |
||
| 541 | 541 | $Spotter = new Spotter(); |
| 542 | 542 | $allairlinenames = $Spotter->getAllAirlineNames(); |
| 543 | 543 | } |
| 544 | - foreach($allairlinenames as $airline) { |
|
| 544 | + foreach ($allairlinenames as $airline) { |
|
| 545 | 545 | $airline_name = $airline['airline_name']; |
| 546 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
| 547 | - if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
|
| 546 | + if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...'; |
|
| 547 | + if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) { |
|
| 548 | 548 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
| 549 | 549 | } else { |
| 550 | 550 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
| 564 | 564 | <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
| 565 | 565 | <?php |
| 566 | - foreach($allalliancenames as $alliance) { |
|
| 566 | + foreach ($allalliancenames as $alliance) { |
|
| 567 | 567 | $alliance_name = $alliance['alliance']; |
| 568 | 568 | if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) { |
| 569 | 569 | echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>'; |
@@ -599,8 +599,8 @@ discard block |
||
| 599 | 599 | */ |
| 600 | 600 | $Source = new Source(); |
| 601 | 601 | $datasource = $Source->getLocationInfoByType('gs'); |
| 602 | - foreach($datasource as $src) { |
|
| 603 | - if (isset($_COOKIE['filter_Sources']) && in_array($src['name'],explode(',',$_COOKIE['filter_Sources']))) { |
|
| 602 | + foreach ($datasource as $src) { |
|
| 603 | + if (isset($_COOKIE['filter_Sources']) && in_array($src['name'], explode(',', $_COOKIE['filter_Sources']))) { |
|
| 604 | 604 | echo '<option value="'.$src['name'].'" selected>'.$src['name'].'</option>'; |
| 605 | 605 | } else { |
| 606 | 606 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
| 680 | 680 | else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
| 681 | 681 | |
| 682 | - if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
|
| 682 | + if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) { |
|
| 683 | 683 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
| 684 | 684 | } else { |
| 685 | 685 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
| 48 | 48 | </tr></table></div> |
| 49 | 49 | <?php |
| 50 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 50 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 51 | 51 | ?> |
| 52 | 52 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script> |
| 53 | 53 | <?php |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
| 72 | 72 | <?php |
| 73 | 73 | } |
| 74 | - } |
|
| 74 | + } |
|
| 75 | 75 | ?> |
| 76 | 76 | |
| 77 | 77 | <div id="sidebar" class="sidebar collapsed"> |
@@ -82,34 +82,34 @@ discard block |
||
| 82 | 82 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
| 83 | 83 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
| 84 | 84 | <?php |
| 85 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 85 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 86 | 86 | if (isset($globalArchive) && $globalArchive == TRUE) { |
| 87 | 87 | ?> |
| 88 | 88 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
| 89 | 89 | <?php |
| 90 | 90 | } |
| 91 | - } |
|
| 91 | + } |
|
| 92 | 92 | ?> |
| 93 | 93 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
| 94 | 94 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
| 95 | 95 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
| 96 | 96 | <?php |
| 97 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 97 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 98 | 98 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
| 99 | 99 | ?> |
| 100 | 100 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
| 101 | 101 | <?php |
| 102 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 102 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 103 | 103 | ?> |
| 104 | 104 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
| 105 | 105 | <?php |
| 106 | - } |
|
| 106 | + } |
|
| 107 | 107 | } else { |
| 108 | 108 | ?> |
| 109 | 109 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
| 110 | 110 | <?php |
| 111 | 111 | } |
| 112 | - } |
|
| 112 | + } |
|
| 113 | 113 | ?> |
| 114 | 114 | </ul> |
| 115 | 115 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | ?> |
| 185 | 185 | </div> |
| 186 | 186 | <?php |
| 187 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 187 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 188 | 188 | ?> |
| 189 | 189 | <div class="sidebar-pane" id="archive"> |
| 190 | 190 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | </form> |
| 244 | 244 | </div> |
| 245 | 245 | <?php |
| 246 | - } |
|
| 246 | + } |
|
| 247 | 247 | ?> |
| 248 | 248 | <div class="sidebar-pane" id="settings"> |
| 249 | 249 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -254,56 +254,56 @@ discard block |
||
| 254 | 254 | <?php |
| 255 | 255 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
| 256 | 256 | else $MapType = $_COOKIE['MapType']; |
| 257 | - ?> |
|
| 257 | + ?> |
|
| 258 | 258 | <?php |
| 259 | 259 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 260 | - ?> |
|
| 260 | + ?> |
|
| 261 | 261 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
| 262 | 262 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
| 263 | 263 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
| 264 | 264 | <?php |
| 265 | 265 | } |
| 266 | - ?> |
|
| 266 | + ?> |
|
| 267 | 267 | <?php |
| 268 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 269 | - ?> |
|
| 268 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 269 | + ?> |
|
| 270 | 270 | <?php |
| 271 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 272 | - ?> |
|
| 271 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 272 | + ?> |
|
| 273 | 273 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
| 274 | 274 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
| 275 | 275 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
| 276 | 276 | <?php |
| 277 | - } |
|
| 278 | - ?> |
|
| 277 | + } |
|
| 278 | + ?> |
|
| 279 | 279 | <?php |
| 280 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 281 | - ?> |
|
| 280 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 281 | + ?> |
|
| 282 | 282 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
| 283 | 283 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
| 284 | 284 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
| 285 | 285 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
| 286 | 286 | <?php |
| 287 | - } |
|
| 288 | - ?> |
|
| 287 | + } |
|
| 288 | + ?> |
|
| 289 | 289 | <?php |
| 290 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 291 | - ?> |
|
| 290 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 291 | + ?> |
|
| 292 | 292 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
| 293 | 293 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
| 294 | 294 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
| 295 | 295 | <?php |
| 296 | - } |
|
| 297 | - ?> |
|
| 296 | + } |
|
| 297 | + ?> |
|
| 298 | 298 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
| 299 | 299 | <?php |
| 300 | 300 | } |
| 301 | - ?> |
|
| 301 | + ?> |
|
| 302 | 302 | <?php |
| 303 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 303 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 304 | 304 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 305 | 305 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 306 | - ?> |
|
| 306 | + ?> |
|
| 307 | 307 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 308 | 308 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
| 309 | 309 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -317,13 +317,13 @@ discard block |
||
| 317 | 317 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 318 | 318 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 319 | 319 | <?php |
| 320 | - } |
|
| 321 | - ?> |
|
| 320 | + } |
|
| 321 | + ?> |
|
| 322 | 322 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 323 | 323 | </select> |
| 324 | 324 | </li> |
| 325 | 325 | <?php |
| 326 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 326 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 327 | 327 | ?> |
| 328 | 328 | <li><?php echo _("Type of Terrain:"); ?> |
| 329 | 329 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | </select> |
| 335 | 335 | </li> |
| 336 | 336 | <?php |
| 337 | - } |
|
| 337 | + } |
|
| 338 | 338 | ?> |
| 339 | 339 | <?php |
| 340 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 340 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 341 | 341 | ?> |
| 342 | 342 | <?php |
| 343 | 343 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
| 355 | 355 | <?php |
| 356 | 356 | } |
| 357 | - } |
|
| 357 | + } |
|
| 358 | 358 | ?> |
| 359 | 359 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
| 360 | 360 | <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
@@ -366,81 +366,81 @@ discard block |
||
| 366 | 366 | <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li> |
| 367 | 367 | <?php |
| 368 | 368 | } |
| 369 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 369 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 370 | 370 | ?> |
| 371 | 371 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 372 | 372 | <?php |
| 373 | - } |
|
| 374 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 373 | + } |
|
| 374 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 375 | 375 | ?> |
| 376 | 376 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 377 | 377 | <?php |
| 378 | - } |
|
| 378 | + } |
|
| 379 | 379 | ?> |
| 380 | 380 | <?php |
| 381 | 381 | if (function_exists('array_column')) { |
| 382 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 383 | - ?> |
|
| 382 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 383 | + ?> |
|
| 384 | 384 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 385 | 385 | <?php |
| 386 | - } |
|
| 386 | + } |
|
| 387 | 387 | } elseif (isset($globalSources)) { |
| 388 | - $dispolar = false; |
|
| 389 | - foreach ($globalSources as $testsource) { |
|
| 390 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 391 | - } |
|
| 392 | - if ($dispolar) { |
|
| 393 | - ?> |
|
| 388 | + $dispolar = false; |
|
| 389 | + foreach ($globalSources as $testsource) { |
|
| 390 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 391 | + } |
|
| 392 | + if ($dispolar) { |
|
| 393 | + ?> |
|
| 394 | 394 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 395 | 395 | <?php |
| 396 | - } |
|
| 397 | - } |
|
| 398 | - ?> |
|
| 396 | + } |
|
| 397 | + } |
|
| 398 | + ?> |
|
| 399 | 399 | <?php |
| 400 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 400 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 401 | 401 | ?> |
| 402 | 402 | |
| 403 | 403 | <?php |
| 404 | 404 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 405 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 406 | - ?> |
|
| 405 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 406 | + ?> |
|
| 407 | 407 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
| 408 | 408 | <?php |
| 409 | 409 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 410 | - ?> |
|
| 410 | + ?> |
|
| 411 | 411 | <li><?php echo _("Aircraft icon color:"); ?> |
| 412 | 412 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
| 413 | 413 | </li> |
| 414 | 414 | <?php |
| 415 | 415 | } |
| 416 | - } |
|
| 417 | - } |
|
| 418 | - ?> |
|
| 416 | + } |
|
| 417 | + } |
|
| 418 | + ?> |
|
| 419 | 419 | <?php |
| 420 | 420 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 421 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 422 | - ?> |
|
| 421 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 422 | + ?> |
|
| 423 | 423 | <li><?php echo _("Marine icon color:"); ?> |
| 424 | 424 | <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
| 425 | 425 | </li> |
| 426 | 426 | <?php |
| 427 | - } |
|
| 428 | - } |
|
| 429 | - ?> |
|
| 427 | + } |
|
| 428 | + } |
|
| 429 | + ?> |
|
| 430 | 430 | <?php |
| 431 | 431 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 432 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 433 | - ?> |
|
| 432 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 433 | + ?> |
|
| 434 | 434 | <li><?php echo _("Tracker icon color:"); ?> |
| 435 | 435 | <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
| 436 | 436 | </li> |
| 437 | 437 | <?php |
| 438 | - } |
|
| 439 | - } |
|
| 440 | - ?> |
|
| 438 | + } |
|
| 439 | + } |
|
| 440 | + ?> |
|
| 441 | 441 | <?php |
| 442 | 442 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 443 | - ?> |
|
| 443 | + ?> |
|
| 444 | 444 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 445 | 445 | <div class="range"> |
| 446 | 446 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -449,9 +449,9 @@ discard block |
||
| 449 | 449 | </li> |
| 450 | 450 | <?php |
| 451 | 451 | } |
| 452 | - ?> |
|
| 452 | + ?> |
|
| 453 | 453 | <?php |
| 454 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 454 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 455 | 455 | ?> |
| 456 | 456 | <?php |
| 457 | 457 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | </li> |
| 483 | 483 | <?php |
| 484 | 484 | } |
| 485 | - } |
|
| 485 | + } |
|
| 486 | 486 | ?> |
| 487 | 487 | <li><?php echo _("Distance unit:"); ?> |
| 488 | 488 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -515,19 +515,19 @@ discard block |
||
| 515 | 515 | <ul> |
| 516 | 516 | <?php |
| 517 | 517 | if (!isset($globalAircraft) || $globalAircraft) { |
| 518 | - ?> |
|
| 518 | + ?> |
|
| 519 | 519 | <?php |
| 520 | 520 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 521 | - ?> |
|
| 521 | + ?> |
|
| 522 | 522 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
| 523 | 523 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
| 524 | 524 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
| 525 | 525 | <?php |
| 526 | 526 | } |
| 527 | - ?> |
|
| 527 | + ?> |
|
| 528 | 528 | <?php |
| 529 | 529 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 530 | - ?> |
|
| 530 | + ?> |
|
| 531 | 531 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 532 | 532 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
| 533 | 533 | <?php } ?> |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | <?php } ?> |
| 537 | 537 | <?php |
| 538 | 538 | } |
| 539 | - ?> |
|
| 539 | + ?> |
|
| 540 | 540 | <li><?php echo _("Display airlines:"); ?> |
| 541 | 541 | <br/> |
| 542 | 542 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -556,14 +556,14 @@ discard block |
||
| 556 | 556 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | - ?> |
|
| 559 | + ?> |
|
| 560 | 560 | </select> |
| 561 | 561 | </li> |
| 562 | 562 | <?php |
| 563 | 563 | $Spotter = new Spotter(); |
| 564 | 564 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 565 | 565 | if (!empty($allalliancenames)) { |
| 566 | - ?> |
|
| 566 | + ?> |
|
| 567 | 567 | <li><?php echo _("Display alliance:"); ?> |
| 568 | 568 | <br/> |
| 569 | 569 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -577,18 +577,18 @@ discard block |
||
| 577 | 577 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 578 | 578 | } |
| 579 | 579 | } |
| 580 | - ?> |
|
| 580 | + ?> |
|
| 581 | 581 | </select> |
| 582 | 582 | </li> |
| 583 | 583 | <?php |
| 584 | 584 | } |
| 585 | - ?> |
|
| 585 | + ?> |
|
| 586 | 586 | <?php |
| 587 | 587 | } |
| 588 | - ?> |
|
| 588 | + ?> |
|
| 589 | 589 | <?php |
| 590 | 590 | if (isset($globalAPRS) && $globalAPRS) { |
| 591 | - ?> |
|
| 591 | + ?> |
|
| 592 | 592 | <li><?php echo _("Display APRS sources name:"); ?> |
| 593 | 593 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 594 | 594 | <?php |
@@ -612,18 +612,18 @@ discard block |
||
| 612 | 612 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | - ?> |
|
| 615 | + ?> |
|
| 616 | 616 | </select> |
| 617 | 617 | </li> |
| 618 | 618 | <?php |
| 619 | 619 | } |
| 620 | - ?> |
|
| 620 | + ?> |
|
| 621 | 621 | <?php |
| 622 | 622 | if (!isset($globalAircraft) && $globalAircraft) { |
| 623 | - ?> |
|
| 623 | + ?> |
|
| 624 | 624 | <?php |
| 625 | 625 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 626 | - ?> |
|
| 626 | + ?> |
|
| 627 | 627 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 628 | 628 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 629 | 629 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -634,14 +634,14 @@ discard block |
||
| 634 | 634 | </li> |
| 635 | 635 | <?php |
| 636 | 636 | } |
| 637 | - ?> |
|
| 637 | + ?> |
|
| 638 | 638 | <li> |
| 639 | 639 | <?php echo _("Display flight with ident:"); ?> |
| 640 | 640 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
| 641 | 641 | </li> |
| 642 | 642 | <?php |
| 643 | 643 | } |
| 644 | - ?> |
|
| 644 | + ?> |
|
| 645 | 645 | </ul> |
| 646 | 646 | </form> |
| 647 | 647 | <form method="post"> |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | </form> |
| 651 | 651 | </div> |
| 652 | 652 | <?php |
| 653 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 653 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 654 | 654 | ?> |
| 655 | 655 | <div class="sidebar-pane" id="satellites"> |
| 656 | 656 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -690,14 +690,14 @@ discard block |
||
| 690 | 690 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 691 | 691 | } |
| 692 | 692 | } |
| 693 | - ?> |
|
| 693 | + ?> |
|
| 694 | 694 | </select> |
| 695 | 695 | </li> |
| 696 | 696 | </ul> |
| 697 | 697 | </form> |
| 698 | 698 | </div> |
| 699 | 699 | <?php |
| 700 | - } |
|
| 700 | + } |
|
| 701 | 701 | ?> |
| 702 | 702 | </div> |
| 703 | 703 | </div> |
@@ -163,11 +163,26 @@ discard block |
||
| 163 | 163 | <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li> |
| 164 | 164 | <li><?php echo _("NOTAM scope:"); ?> |
| 165 | 165 | <select class="selectpicker" onchange="notamscope(this);"> |
| 166 | - <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option> |
|
| 167 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option> |
|
| 168 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option> |
|
| 169 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option> |
|
| 170 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option> |
|
| 166 | + <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') { |
|
| 167 | + print ' selected'; |
|
| 168 | +} |
|
| 169 | +?>>All</option> |
|
| 170 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') { |
|
| 171 | + print ' selected'; |
|
| 172 | +} |
|
| 173 | +?>>Airport/Enroute warning</option> |
|
| 174 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') { |
|
| 175 | + print ' selected'; |
|
| 176 | +} |
|
| 177 | +?>>Airport warning</option> |
|
| 178 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') { |
|
| 179 | + print ' selected'; |
|
| 180 | +} |
|
| 181 | +?>>Navigation warning</option> |
|
| 182 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') { |
|
| 183 | + print ' selected'; |
|
| 184 | +} |
|
| 185 | +?>>Enroute warning</option> |
|
| 171 | 186 | </select |
| 172 | 187 | </li> |
| 173 | 188 | </ul> |
@@ -195,7 +210,12 @@ discard block |
||
| 195 | 210 | <div class="form-group"> |
| 196 | 211 | <label>From (UTC):</label> |
| 197 | 212 | <div class='input-group date' id='datetimepicker1'> |
| 198 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required /> |
|
| 213 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) { |
|
| 214 | + print $_POST['start_date']; |
|
| 215 | +} elseif (isset($_COOKIE['archive_begin'])) { |
|
| 216 | + print date("m/d/Y h:i a",$_COOKIE['archive_begin']); |
|
| 217 | +} |
|
| 218 | +?>" required /> |
|
| 199 | 219 | <span class="input-group-addon"> |
| 200 | 220 | <span class="glyphicon glyphicon-calendar"></span> |
| 201 | 221 | </span> |
@@ -204,7 +224,12 @@ discard block |
||
| 204 | 224 | <div class="form-group"> |
| 205 | 225 | <label>To (UTC):</label> |
| 206 | 226 | <div class='input-group date' id='datetimepicker2'> |
| 207 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" /> |
|
| 227 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) { |
|
| 228 | + print $_POST['end_date']; |
|
| 229 | +} elseif (isset($_COOKIE['archive_end'])) { |
|
| 230 | + print date("m/d/Y h:i a",$_COOKIE['archive_end']); |
|
| 231 | +} |
|
| 232 | +?>" /> |
|
| 208 | 233 | <span class="input-group-addon"> |
| 209 | 234 | <span class="glyphicon glyphicon-calendar"></span> |
| 210 | 235 | </span> |
@@ -229,8 +254,20 @@ discard block |
||
| 229 | 254 | </script> |
| 230 | 255 | <li><?php echo _("Playback speed:"); ?> |
| 231 | 256 | <div class="range"> |
| 232 | - <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>"> |
|
| 233 | - <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output> |
|
| 257 | + <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) { |
|
| 258 | + print $_POST['archivespeed']; |
|
| 259 | +} elseif (isset($_COOKIE['archive_speed'])) { |
|
| 260 | + print $_COOKIE['archive_speed']; |
|
| 261 | +} else { |
|
| 262 | + print '1'; |
|
| 263 | +} |
|
| 264 | +?>"> |
|
| 265 | + <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) { |
|
| 266 | + print $_COOKIE['archive_speed']; |
|
| 267 | +} else { |
|
| 268 | + print '1'; |
|
| 269 | +} |
|
| 270 | +?></output> |
|
| 234 | 271 | </div> |
| 235 | 272 | </li> |
| 236 | 273 | <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li> |
@@ -252,15 +289,27 @@ discard block |
||
| 252 | 289 | <li><?php echo _("Type of Map:"); ?> |
| 253 | 290 | <select class="selectpicker" onchange="mapType(this);"> |
| 254 | 291 | <?php |
| 255 | - if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
|
| 256 | - else $MapType = $_COOKIE['MapType']; |
|
| 292 | + if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') { |
|
| 293 | + $MapType = $globalMapProvider; |
|
| 294 | + } else { |
|
| 295 | + $MapType = $_COOKIE['MapType']; |
|
| 296 | + } |
|
| 257 | 297 | ?> |
| 258 | 298 | <?php |
| 259 | 299 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 260 | 300 | ?> |
| 261 | - <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
|
| 262 | - <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
|
| 263 | - <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
|
| 301 | + <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') { |
|
| 302 | + print ' selected'; |
|
| 303 | +} |
|
| 304 | +?>>Bing-Aerial</option> |
|
| 305 | + <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') { |
|
| 306 | + print ' selected'; |
|
| 307 | +} |
|
| 308 | +?>>Bing-Hybrid</option> |
|
| 309 | + <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') { |
|
| 310 | + print ' selected'; |
|
| 311 | +} |
|
| 312 | +?>>Bing-Road</option> |
|
| 264 | 313 | <?php |
| 265 | 314 | } |
| 266 | 315 | ?> |
@@ -270,56 +319,131 @@ discard block |
||
| 270 | 319 | <?php |
| 271 | 320 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
| 272 | 321 | ?> |
| 273 | - <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
|
| 274 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
|
| 275 | - <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
|
| 322 | + <option value="Here-Aerial"<?php if ($MapType == 'Here') { |
|
| 323 | + print ' selected'; |
|
| 324 | +} |
|
| 325 | +?>>Here-Aerial</option> |
|
| 326 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here') { |
|
| 327 | + print ' selected'; |
|
| 328 | +} |
|
| 329 | +?>>Here-Hybrid</option> |
|
| 330 | + <option value="Here-Road"<?php if ($MapType == 'Here') { |
|
| 331 | + print ' selected'; |
|
| 332 | +} |
|
| 333 | +?>>Here-Road</option> |
|
| 276 | 334 | <?php |
| 277 | 335 | } |
| 278 | 336 | ?> |
| 279 | 337 | <?php |
| 280 | 338 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
| 281 | 339 | ?> |
| 282 | - <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
|
| 283 | - <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
|
| 284 | - <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
|
| 285 | - <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
|
| 340 | + <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') { |
|
| 341 | + print ' selected'; |
|
| 342 | +} |
|
| 343 | +?>>Google Roadmap</option> |
|
| 344 | + <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') { |
|
| 345 | + print ' selected'; |
|
| 346 | +} |
|
| 347 | +?>>Google Satellite</option> |
|
| 348 | + <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') { |
|
| 349 | + print ' selected'; |
|
| 350 | +} |
|
| 351 | +?>>Google Hybrid</option> |
|
| 352 | + <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') { |
|
| 353 | + print ' selected'; |
|
| 354 | +} |
|
| 355 | +?>>Google Terrain</option> |
|
| 286 | 356 | <?php |
| 287 | 357 | } |
| 288 | 358 | ?> |
| 289 | 359 | <?php |
| 290 | 360 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
| 291 | 361 | ?> |
| 292 | - <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
|
| 293 | - <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
|
| 294 | - <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
|
| 362 | + <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') { |
|
| 363 | + print ' selected'; |
|
| 364 | +} |
|
| 365 | +?>>MapQuest-OSM</option> |
|
| 366 | + <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') { |
|
| 367 | + print ' selected'; |
|
| 368 | +} |
|
| 369 | +?>>MapQuest-Aerial</option> |
|
| 370 | + <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') { |
|
| 371 | + print ' selected'; |
|
| 372 | +} |
|
| 373 | +?>>MapQuest-Hybrid</option> |
|
| 295 | 374 | <?php |
| 296 | 375 | } |
| 297 | 376 | ?> |
| 298 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
| 377 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
| 378 | + print ' selected'; |
|
| 379 | +} |
|
| 380 | +?>>Yandex</option> |
|
| 299 | 381 | <?php |
| 300 | 382 | } |
| 301 | 383 | ?> |
| 302 | 384 | <?php |
| 303 | 385 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
| 304 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
| 305 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 386 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
| 387 | + $MapBoxId = 'default'; |
|
| 388 | + } else { |
|
| 389 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 390 | + } |
|
| 306 | 391 | ?> |
| 307 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
| 308 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
| 309 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
| 310 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
| 311 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
| 312 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
| 313 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
| 314 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
| 315 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
| 316 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
| 317 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
| 318 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
| 392 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
| 393 | + print ' selected'; |
|
| 394 | +} |
|
| 395 | +?>>Mapbox default</option> |
|
| 396 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
| 397 | + print ' selected'; |
|
| 398 | +} |
|
| 399 | +?>>Mapbox streets</option> |
|
| 400 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
| 401 | + print ' selected'; |
|
| 402 | +} |
|
| 403 | +?>>Mapbox light</option> |
|
| 404 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
| 405 | + print ' selected'; |
|
| 406 | +} |
|
| 407 | +?>>Mapbox dark</option> |
|
| 408 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
| 409 | + print ' selected'; |
|
| 410 | +} |
|
| 411 | +?>>Mapbox satellite</option> |
|
| 412 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
| 413 | + print ' selected'; |
|
| 414 | +} |
|
| 415 | +?>>Mapbox streets-satellite</option> |
|
| 416 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
| 417 | + print ' selected'; |
|
| 418 | +} |
|
| 419 | +?>>Mapbox streets-basic</option> |
|
| 420 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
| 421 | + print ' selected'; |
|
| 422 | +} |
|
| 423 | +?>>Mapbox comic</option> |
|
| 424 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
| 425 | + print ' selected'; |
|
| 426 | +} |
|
| 427 | +?>>Mapbox outdoors</option> |
|
| 428 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
| 429 | + print ' selected'; |
|
| 430 | +} |
|
| 431 | +?>>Mapbox pencil</option> |
|
| 432 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
| 433 | + print ' selected'; |
|
| 434 | +} |
|
| 435 | +?>>Mapbox pirates</option> |
|
| 436 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
| 437 | + print ' selected'; |
|
| 438 | +} |
|
| 439 | +?>>Mapbox emerald</option> |
|
| 319 | 440 | <?php |
| 320 | 441 | } |
| 321 | 442 | ?> |
| 322 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
| 443 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
| 444 | + print ' selected'; |
|
| 445 | +} |
|
| 446 | +?>>OpenStreetMap</option> |
|
| 323 | 447 | </select> |
| 324 | 448 | </li> |
| 325 | 449 | <?php |
@@ -327,10 +451,22 @@ discard block |
||
| 327 | 451 | ?> |
| 328 | 452 | <li><?php echo _("Type of Terrain:"); ?> |
| 329 | 453 | <select class="selectpicker" onchange="terrainType(this);"> |
| 330 | - <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
| 331 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
| 332 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
| 333 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
| 454 | + <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') { |
|
| 455 | + print ' selected'; |
|
| 456 | +} |
|
| 457 | +?>>stk terrain</option> |
|
| 458 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
| 459 | + print ' selected'; |
|
| 460 | +} |
|
| 461 | +?>>ellipsoid</option> |
|
| 462 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
| 463 | + print ' selected'; |
|
| 464 | +} |
|
| 465 | +?>>vr terrain</option> |
|
| 466 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
| 467 | + print ' selected'; |
|
| 468 | +} |
|
| 469 | +?>>ArticDEM</option> |
|
| 334 | 470 | </select> |
| 335 | 471 | </li> |
| 336 | 472 | <?php |
@@ -342,33 +478,69 @@ discard block |
||
| 342 | 478 | <?php |
| 343 | 479 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 344 | 480 | ?> |
| 345 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
|
| 346 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
| 347 | - <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
| 348 | - <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
| 349 | - <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
| 481 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
| 482 | + print 'checked'; |
|
| 483 | +} |
|
| 484 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
|
| 485 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
| 486 | + print 'checked'; |
|
| 487 | +} |
|
| 488 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
| 489 | + <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) { |
|
| 490 | + print 'checked'; |
|
| 491 | +} |
|
| 492 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
| 493 | + <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) { |
|
| 494 | + print 'checked'; |
|
| 495 | +} |
|
| 496 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
| 497 | + <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) { |
|
| 498 | + print 'checked'; |
|
| 499 | +} |
|
| 500 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
| 350 | 501 | <?php |
| 351 | 502 | } |
| 352 | 503 | if (isset($globalSatellite) && $globalSatellite === TRUE) { |
| 353 | 504 | ?> |
| 354 | - <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
| 505 | + <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) { |
|
| 506 | + print 'checked'; |
|
| 507 | +} |
|
| 508 | +?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
| 355 | 509 | <?php |
| 356 | 510 | } |
| 357 | 511 | } |
| 358 | 512 | ?> |
| 359 | - <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 360 | - <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 361 | - <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
| 362 | - <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
| 513 | + <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) { |
|
| 514 | + print 'checked'; |
|
| 515 | +} |
|
| 516 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 517 | + <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 518 | + print 'checked'; |
|
| 519 | +} |
|
| 520 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 521 | + <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 522 | + print 'checked'; |
|
| 523 | +} |
|
| 524 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
| 525 | + <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 526 | + print 'checked'; |
|
| 527 | +} |
|
| 528 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
| 363 | 529 | <?php |
| 364 | 530 | if (isset($globalFires)) { |
| 365 | 531 | ?> |
| 366 | - <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
| 532 | + <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 533 | + print 'checked'; |
|
| 534 | +} |
|
| 535 | +?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
| 367 | 536 | <?php |
| 368 | 537 | } |
| 369 | 538 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
| 370 | 539 | ?> |
| 371 | - <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 540 | + <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) { |
|
| 541 | + print 'checked'; |
|
| 542 | +} |
|
| 543 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 372 | 544 | <?php |
| 373 | 545 | } |
| 374 | 546 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -381,17 +553,25 @@ discard block |
||
| 381 | 553 | if (function_exists('array_column')) { |
| 382 | 554 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
| 383 | 555 | ?> |
| 384 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 556 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 557 | + print 'checked'; |
|
| 558 | +} |
|
| 559 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 385 | 560 | <?php |
| 386 | 561 | } |
| 387 | 562 | } elseif (isset($globalSources)) { |
| 388 | 563 | $dispolar = false; |
| 389 | 564 | foreach ($globalSources as $testsource) { |
| 390 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 565 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
| 566 | + $dispolar = true; |
|
| 567 | + } |
|
| 391 | 568 | } |
| 392 | 569 | if ($dispolar) { |
| 393 | 570 | ?> |
| 394 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 571 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 572 | + print 'checked'; |
|
| 573 | +} |
|
| 574 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 395 | 575 | <?php |
| 396 | 576 | } |
| 397 | 577 | } |
@@ -404,12 +584,22 @@ discard block |
||
| 404 | 584 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 405 | 585 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 406 | 586 | ?> |
| 407 | - <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 587 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
| 588 | + print 'checked'; |
|
| 589 | +} |
|
| 590 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 408 | 591 | <?php |
| 409 | 592 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 410 | 593 | ?> |
| 411 | 594 | <li><?php echo _("Aircraft icon color:"); ?> |
| 412 | - <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
|
| 595 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 596 | + print $_COOKIE['IconColor']; |
|
| 597 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 598 | + print $globalAircraftIconColor; |
|
| 599 | +} else { |
|
| 600 | + print '1a3151'; |
|
| 601 | +} |
|
| 602 | +?>"> |
|
| 413 | 603 | </li> |
| 414 | 604 | <?php |
| 415 | 605 | } |
@@ -421,7 +611,14 @@ discard block |
||
| 421 | 611 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 422 | 612 | ?> |
| 423 | 613 | <li><?php echo _("Marine icon color:"); ?> |
| 424 | - <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
|
| 614 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 615 | + print $_COOKIE['MarineIconColor']; |
|
| 616 | +} elseif (isset($globalMarineIconColor)) { |
|
| 617 | + print $globalMarineIconColor; |
|
| 618 | +} else { |
|
| 619 | + print '1a3151'; |
|
| 620 | +} |
|
| 621 | +?>"> |
|
| 425 | 622 | </li> |
| 426 | 623 | <?php |
| 427 | 624 | } |
@@ -432,7 +629,14 @@ discard block |
||
| 432 | 629 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 433 | 630 | ?> |
| 434 | 631 | <li><?php echo _("Tracker icon color:"); ?> |
| 435 | - <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
|
| 632 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 633 | + print $_COOKIE['TrackerIconColor']; |
|
| 634 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 635 | + print $globalTrackerIconColor; |
|
| 636 | +} else { |
|
| 637 | + print '1a3151'; |
|
| 638 | +} |
|
| 639 | +?>"> |
|
| 436 | 640 | </li> |
| 437 | 641 | <?php |
| 438 | 642 | } |
@@ -443,8 +647,22 @@ discard block |
||
| 443 | 647 | ?> |
| 444 | 648 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 445 | 649 | <div class="range"> |
| 446 | - <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
|
| 447 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
| 650 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 651 | + print $_COOKIE['AirportZoom']; |
|
| 652 | +} elseif (isset($globalAirportZoom)) { |
|
| 653 | + print $globalAirportZoom; |
|
| 654 | +} else { |
|
| 655 | + print '7'; |
|
| 656 | +} |
|
| 657 | +?>"> |
|
| 658 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 659 | + print $_COOKIE['AirportZoom']; |
|
| 660 | +} elseif (isset($globalAirportZoom)) { |
|
| 661 | + print $globalAirportZoom; |
|
| 662 | +} else { |
|
| 663 | + print '7'; |
|
| 664 | +} |
|
| 665 | +?></output> |
|
| 448 | 666 | </div> |
| 449 | 667 | </li> |
| 450 | 668 | <?php |
@@ -456,10 +674,23 @@ discard block |
||
| 456 | 674 | <?php |
| 457 | 675 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 458 | 676 | ?> |
| 459 | - <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') print 'checked'; ?> ><?php echo _("Use airlines liveries"); ?></li> |
|
| 460 | - <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li> |
|
| 677 | + <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') { |
|
| 678 | + print 'checked'; |
|
| 679 | +} |
|
| 680 | +?> ><?php echo _("Use airlines liveries"); ?></li> |
|
| 681 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
| 682 | + print 'checked'; |
|
| 683 | +} |
|
| 684 | +?> ><?php echo _("Force Aircraft color"); ?></li> |
|
| 461 | 685 | <li><?php echo _("Aircraft icon color:"); ?> |
| 462 | - <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>"> |
|
| 686 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 687 | + print $_COOKIE['IconColor']; |
|
| 688 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 689 | + print $globalAircraftIconColor; |
|
| 690 | +} else { |
|
| 691 | + print 'ff0000'; |
|
| 692 | +} |
|
| 693 | +?>"> |
|
| 463 | 694 | </li> |
| 464 | 695 | <?php |
| 465 | 696 | } |
@@ -467,9 +698,19 @@ discard block |
||
| 467 | 698 | <?php |
| 468 | 699 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 469 | 700 | ?> |
| 470 | - <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?></li> |
|
| 701 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
| 702 | + print 'checked'; |
|
| 703 | +} |
|
| 704 | +?> ><?php echo _("Force Marine color"); ?></li> |
|
| 471 | 705 | <li><?php echo _("Marine icon color:"); ?> |
| 472 | - <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print 'ff0000'; ?>"> |
|
| 706 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 707 | + print $_COOKIE['MarineIconColor']; |
|
| 708 | +} elseif (isset($globalMarineIconColor)) { |
|
| 709 | + print $globalMarineIconColor; |
|
| 710 | +} else { |
|
| 711 | + print 'ff0000'; |
|
| 712 | +} |
|
| 713 | +?>"> |
|
| 473 | 714 | </li> |
| 474 | 715 | <?php |
| 475 | 716 | } |
@@ -477,9 +718,19 @@ discard block |
||
| 477 | 718 | <?php |
| 478 | 719 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 479 | 720 | ?> |
| 480 | - <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?></li> |
|
| 721 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
| 722 | + print 'checked'; |
|
| 723 | +} |
|
| 724 | +?> ><?php echo _("Force Tracker color"); ?></li> |
|
| 481 | 725 | <li><?php echo _("Tracker icon color:"); ?> |
| 482 | - <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print 'ff0000'; ?>"> |
|
| 726 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 727 | + print $_COOKIE['TrackerIconColor']; |
|
| 728 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 729 | + print $globalTrackerIconColor; |
|
| 730 | +} else { |
|
| 731 | + print 'ff0000'; |
|
| 732 | +} |
|
| 733 | +?>"> |
|
| 483 | 734 | </li> |
| 484 | 735 | <?php |
| 485 | 736 | } |
@@ -487,22 +738,46 @@ discard block |
||
| 487 | 738 | ?> |
| 488 | 739 | <li><?php echo _("Distance unit:"); ?> |
| 489 | 740 | <select class="selectpicker" onchange="unitdistance(this);"> |
| 490 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
| 491 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
| 492 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
| 741 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
| 742 | + echo ' selected'; |
|
| 743 | +} |
|
| 744 | +?>>km</option> |
|
| 745 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
| 746 | + echo ' selected'; |
|
| 747 | +} |
|
| 748 | +?>>nm</option> |
|
| 749 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
| 750 | + echo ' selected'; |
|
| 751 | +} |
|
| 752 | +?>>mi</option> |
|
| 493 | 753 | </select> |
| 494 | 754 | </li> |
| 495 | 755 | <li><?php echo _("Altitude unit:"); ?> |
| 496 | 756 | <select class="selectpicker" onchange="unitaltitude(this);"> |
| 497 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
| 498 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
| 757 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
| 758 | + echo ' selected'; |
|
| 759 | +} |
|
| 760 | +?>>m</option> |
|
| 761 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
| 762 | + echo ' selected'; |
|
| 763 | +} |
|
| 764 | +?>>feet</option> |
|
| 499 | 765 | </select> |
| 500 | 766 | </li> |
| 501 | 767 | <li><?php echo _("Speed unit:"); ?> |
| 502 | 768 | <select class="selectpicker" onchange="unitspeed(this);"> |
| 503 | - <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option> |
|
| 504 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
| 505 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
| 769 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
| 770 | + echo ' selected'; |
|
| 771 | +} |
|
| 772 | +?>>km/h</option> |
|
| 773 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
| 774 | + echo ' selected'; |
|
| 775 | +} |
|
| 776 | +?>>mph</option> |
|
| 777 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
| 778 | + echo ' selected'; |
|
| 779 | +} |
|
| 780 | +?>>knots</option> |
|
| 506 | 781 | </select> |
| 507 | 782 | </li> |
| 508 | 783 | |
@@ -520,9 +795,18 @@ discard block |
||
| 520 | 795 | <?php |
| 521 | 796 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 522 | 797 | ?> |
| 523 | - <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 524 | - <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 525 | - <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
| 798 | + <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) { |
|
| 799 | + print 'checked'; |
|
| 800 | +} |
|
| 801 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 802 | + <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) { |
|
| 803 | + print 'checked'; |
|
| 804 | +} |
|
| 805 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 806 | + <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) { |
|
| 807 | + print 'checked'; |
|
| 808 | +} |
|
| 809 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
| 526 | 810 | <?php |
| 527 | 811 | } |
| 528 | 812 | ?> |
@@ -530,10 +814,16 @@ discard block |
||
| 530 | 814 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 531 | 815 | ?> |
| 532 | 816 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 533 | - <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 817 | + <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) { |
|
| 818 | + print 'checked'; |
|
| 819 | +} |
|
| 820 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 534 | 821 | <?php } ?> |
| 535 | 822 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
| 536 | - <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
| 823 | + <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) { |
|
| 824 | + print 'checked'; |
|
| 825 | +} |
|
| 826 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
| 537 | 827 | <?php } ?> |
| 538 | 828 | <?php |
| 539 | 829 | } |
@@ -550,7 +840,9 @@ discard block |
||
| 550 | 840 | } |
| 551 | 841 | foreach($allairlinenames as $airline) { |
| 552 | 842 | $airline_name = $airline['airline_name']; |
| 553 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
| 843 | + if (strlen($airline_name) > 30) { |
|
| 844 | + $airline_name = substr($airline_name,0,30).'...'; |
|
| 845 | + } |
|
| 554 | 846 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
| 555 | 847 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
| 556 | 848 | } else { |
@@ -568,7 +860,10 @@ discard block |
||
| 568 | 860 | <li><?php echo _("Display alliance:"); ?> |
| 569 | 861 | <br/> |
| 570 | 862 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
| 571 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 863 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
| 864 | + echo ' selected'; |
|
| 865 | +} |
|
| 866 | +?>><?php echo _("All"); ?></option> |
|
| 572 | 867 | <?php |
| 573 | 868 | foreach($allalliancenames as $alliance) { |
| 574 | 869 | $alliance_name = $alliance['alliance']; |
@@ -627,10 +922,22 @@ discard block |
||
| 627 | 922 | ?> |
| 628 | 923 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 629 | 924 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 630 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 631 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
| 632 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
| 633 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
| 925 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
| 926 | + echo ' selected'; |
|
| 927 | +} |
|
| 928 | +?>><?php echo _("All"); ?></option> |
|
| 929 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
| 930 | + echo ' selected'; |
|
| 931 | +} |
|
| 932 | +?>><?php echo _("Passenger"); ?></option> |
|
| 933 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
| 934 | + echo ' selected'; |
|
| 935 | +} |
|
| 936 | +?>><?php echo _("Cargo"); ?></option> |
|
| 937 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
| 938 | + echo ' selected'; |
|
| 939 | +} |
|
| 940 | +?>><?php echo _("Military"); ?></option> |
|
| 634 | 941 | </select> |
| 635 | 942 | </li> |
| 636 | 943 | <?php |
@@ -638,7 +945,10 @@ discard block |
||
| 638 | 945 | ?> |
| 639 | 946 | <li> |
| 640 | 947 | <?php echo _("Display flight with ident:"); ?> |
| 641 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
| 948 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
| 949 | + print $_COOKIE['filter_ident']; |
|
| 950 | +} |
|
| 951 | +?>" /> |
|
| 642 | 952 | </li> |
| 643 | 953 | <?php |
| 644 | 954 | } |
@@ -657,7 +967,10 @@ discard block |
||
| 657 | 967 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
| 658 | 968 | <form> |
| 659 | 969 | <ul> |
| 660 | - <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 970 | + <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) { |
|
| 971 | + print 'checked'; |
|
| 972 | +} |
|
| 973 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 661 | 974 | <li><?php echo _("Type:"); ?> |
| 662 | 975 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
| 663 | 976 | <?php |
@@ -665,25 +978,45 @@ discard block |
||
| 665 | 978 | $types = $Satellite->get_tle_types(); |
| 666 | 979 | foreach ($types as $type) { |
| 667 | 980 | $type_name = $type['tle_type']; |
| 668 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
| 669 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
| 670 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
| 671 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
| 672 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
| 673 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
| 674 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 675 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
| 676 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
| 677 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
| 678 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
| 679 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
| 680 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
| 681 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
| 682 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
| 683 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
| 684 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
| 685 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
| 686 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
| 981 | + if ($type_name == 'musson') { |
|
| 982 | + $type_name = 'Russian LEO Navigation'; |
|
| 983 | + } else if ($type_name == 'nnss') { |
|
| 984 | + $type_name = 'Navi Navigation Satellite System'; |
|
| 985 | + } else if ($type_name == 'sbas') { |
|
| 986 | + $type_name = 'Satellite-Based Augmentation System'; |
|
| 987 | + } else if ($type_name == 'glo-ops') { |
|
| 988 | + $type_name = 'Glonass Operational'; |
|
| 989 | + } else if ($type_name == 'gps-ops') { |
|
| 990 | + $type_name = 'GPS Operational'; |
|
| 991 | + } else if ($type_name == 'argos') { |
|
| 992 | + $type_name = 'ARGOS Data Collection System'; |
|
| 993 | + } else if ($type_name == 'tdrss') { |
|
| 994 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 995 | + } else if ($type_name == 'sarsat') { |
|
| 996 | + $type_name = 'Search & Rescue'; |
|
| 997 | + } else if ($type_name == 'dmc') { |
|
| 998 | + $type_name = 'Disaster Monitoring'; |
|
| 999 | + } else if ($type_name == 'resource') { |
|
| 1000 | + $type_name = 'Earth Resources'; |
|
| 1001 | + } else if ($type_name == 'stations') { |
|
| 1002 | + $type_name = 'Space Stations'; |
|
| 1003 | + } else if ($type_name == 'geo') { |
|
| 1004 | + $type_name = 'Geostationary'; |
|
| 1005 | + } else if ($type_name == 'amateur') { |
|
| 1006 | + $type_name = 'Amateur Radio'; |
|
| 1007 | + } else if ($type_name == 'x-comm') { |
|
| 1008 | + $type_name = 'Experimental'; |
|
| 1009 | + } else if ($type_name == 'other-comm') { |
|
| 1010 | + $type_name = 'Other Comm'; |
|
| 1011 | + } else if ($type_name == 'science') { |
|
| 1012 | + $type_name = 'Space & Earth Science'; |
|
| 1013 | + } else if ($type_name == 'military') { |
|
| 1014 | + $type_name = 'Miscellaneous Military'; |
|
| 1015 | + } else if ($type_name == 'radar') { |
|
| 1016 | + $type_name = 'Radar Calibration'; |
|
| 1017 | + } else if ($type_name == 'tle-new') { |
|
| 1018 | + $type_name = 'Last 30 days launches'; |
|
| 1019 | + } |
|
| 687 | 1020 | |
| 688 | 1021 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
| 689 | 1022 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $Source = new Source(); |
| 6 | 6 | |
| 7 | 7 | if (isset($_GET['sourceid'])) { |
| 8 | - $sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT); |
|
| 8 | + $sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT); |
|
| 9 | 9 | $source_data = $Source->getLocationInfoById($sourceid); |
| 10 | 10 | if (isset($source_data[0])) { |
| 11 | 11 | ?> |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | print '</div>'; |
| 38 | 38 | |
| 39 | 39 | if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
| 40 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 41 | -print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>'; |
|
| 40 | +if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 41 | +print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 4).', '.round($spotter_item['longitude'], 4).'</div>'; |
|
| 42 | 42 | /* |
| 43 | 43 | if ($spotter_item['atc_range'] > 0) { |
| 44 | 44 | print '<div><span>'._("Range").'</span>'; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | */ |
| 49 | 49 | if ($spotter_item['type'] == 'wx') { |
| 50 | - $weather = json_decode($spotter_item['description'],true); |
|
| 50 | + $weather = json_decode($spotter_item['description'], true); |
|
| 51 | 51 | //print_r($weather); |
| 52 | 52 | if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
| 53 | 53 | if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
@@ -17,12 +17,19 @@ discard block |
||
| 17 | 17 | date_default_timezone_set('UTC'); |
| 18 | 18 | |
| 19 | 19 | print '<div class="top">'; |
| 20 | -if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>'; |
|
| 21 | -elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>'; |
|
| 22 | -elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>'; |
|
| 23 | -elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>'; |
|
| 24 | -elseif ($spotter_item['type'] == 'fires') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>'; |
|
| 25 | -else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>'; |
|
| 20 | +if ($spotter_item['name'] != '') { |
|
| 21 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>'; |
|
| 22 | +} elseif ($spotter_item['location_id'] != 0) { |
|
| 23 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>'; |
|
| 24 | +} elseif ($spotter_item['type'] == 'lightning') { |
|
| 25 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>'; |
|
| 26 | +} elseif ($spotter_item['type'] == 'wx') { |
|
| 27 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>'; |
|
| 28 | +} elseif ($spotter_item['type'] == 'fires') { |
|
| 29 | + print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>'; |
|
| 30 | +} else { |
|
| 31 | + print '<div class="right"><div class="callsign-details"><div class="callsign"></div>'; |
|
| 32 | +} |
|
| 26 | 33 | print '</div>'; |
| 27 | 34 | |
| 28 | 35 | print '</div></div>'; |
@@ -40,8 +47,12 @@ discard block |
||
| 40 | 47 | print $spotter_item['last_seen'].' UTC'; |
| 41 | 48 | print '</div>'; |
| 42 | 49 | |
| 43 | -if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
|
| 44 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 50 | +if ($spotter_item['city'] != '') { |
|
| 51 | + print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
|
| 52 | +} |
|
| 53 | +if ($spotter_item['country'] !='') { |
|
| 54 | + print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 55 | +} |
|
| 45 | 56 | print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>'; |
| 46 | 57 | /* |
| 47 | 58 | if ($spotter_item['atc_range'] > 0) { |
@@ -53,13 +64,27 @@ discard block |
||
| 53 | 64 | if ($spotter_item['type'] == 'wx') { |
| 54 | 65 | $weather = json_decode($spotter_item['description'],true); |
| 55 | 66 | //print_r($weather); |
| 56 | - if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
|
| 57 | - if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
|
| 58 | - if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>'; |
|
| 59 | - if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>'; |
|
| 60 | - if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>'; |
|
| 61 | - if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>'; |
|
| 62 | - if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>'; |
|
| 67 | + if (isset($weather['temp'])) { |
|
| 68 | + print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>'; |
|
| 69 | + } |
|
| 70 | + if (isset($weather['pressure'])) { |
|
| 71 | + print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>'; |
|
| 72 | + } |
|
| 73 | + if (isset($weather['wind_gust'])) { |
|
| 74 | + print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>'; |
|
| 75 | + } |
|
| 76 | + if (isset($weather['humidity'])) { |
|
| 77 | + print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>'; |
|
| 78 | + } |
|
| 79 | + if (isset($weather['rain'])) { |
|
| 80 | + print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>'; |
|
| 81 | + } |
|
| 82 | + if (isset($weather['precipitation'])) { |
|
| 83 | + print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>'; |
|
| 84 | + } |
|
| 85 | + if (isset($weather['precipitation24h'])) { |
|
| 86 | + print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>'; |
|
| 87 | + } |
|
| 63 | 88 | $spotter_item['description'] = $weather['comment']; |
| 64 | 89 | } elseif ($spotter_item['type'] == 'fires') { |
| 65 | 90 | //print_r(json_decode($spotter_item['description'],true)); |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * Get SQL query part for filter used |
| 16 | 16 | * @param Array $filter the filter |
| 17 | - * @return Array the SQL part |
|
| 17 | + * @return string the SQL part |
|
| 18 | 18 | */ |
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -10,10 +10,10 @@ discard block |
||
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | - * Get SQL query part for filter used |
|
| 14 | - * @param Array $filter the filter |
|
| 15 | - * @return Array the SQL part |
|
| 16 | - */ |
|
| 13 | + * Get SQL query part for filter used |
|
| 14 | + * @param Array $filter the filter |
|
| 15 | + * @return Array the SQL part |
|
| 16 | + */ |
|
| 17 | 17 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
@@ -151,44 +151,44 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Gets all the spotter information based on a particular callsign |
|
| 156 | - * |
|
| 157 | - * @return Array the spotter information |
|
| 158 | - * |
|
| 159 | - */ |
|
| 160 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | - { |
|
| 154 | + /** |
|
| 155 | + * Gets all the spotter information based on a particular callsign |
|
| 156 | + * |
|
| 157 | + * @return Array the spotter information |
|
| 158 | + * |
|
| 159 | + */ |
|
| 160 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | + { |
|
| 162 | 162 | $Spotter = new Spotter($this->db); |
| 163 | - date_default_timezone_set('UTC'); |
|
| 163 | + date_default_timezone_set('UTC'); |
|
| 164 | 164 | |
| 165 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 165 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 169 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | 170 | |
| 171 | - return $spotter_array; |
|
| 172 | - } |
|
| 171 | + return $spotter_array; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * Gets last the spotter information based on a particular id |
|
| 177 | - * |
|
| 178 | - * @return Array the spotter information |
|
| 179 | - * |
|
| 180 | - */ |
|
| 181 | - public function getLastArchiveSpotterDataById($id) |
|
| 182 | - { |
|
| 183 | - $Spotter = new Spotter($this->db); |
|
| 184 | - date_default_timezone_set('UTC'); |
|
| 185 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 175 | + /** |
|
| 176 | + * Gets last the spotter information based on a particular id |
|
| 177 | + * |
|
| 178 | + * @return Array the spotter information |
|
| 179 | + * |
|
| 180 | + */ |
|
| 181 | + public function getLastArchiveSpotterDataById($id) |
|
| 182 | + { |
|
| 183 | + $Spotter = new Spotter($this->db); |
|
| 184 | + date_default_timezone_set('UTC'); |
|
| 185 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | 189 | |
| 190 | 190 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 191 | - /* |
|
| 191 | + /* |
|
| 192 | 192 | try { |
| 193 | 193 | $Connection = new Connection(); |
| 194 | 194 | $sth = Connection->$db->prepare($query); |
@@ -198,122 +198,122 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 200 | 200 | */ |
| 201 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | - |
|
| 203 | - return $spotter_array; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - /** |
|
| 207 | - * Gets all the spotter information based on a particular id |
|
| 208 | - * |
|
| 209 | - * @return Array the spotter information |
|
| 210 | - * |
|
| 211 | - */ |
|
| 212 | - public function getAllArchiveSpotterDataById($id) |
|
| 201 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + |
|
| 203 | + return $spotter_array; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + /** |
|
| 207 | + * Gets all the spotter information based on a particular id |
|
| 208 | + * |
|
| 209 | + * @return Array the spotter information |
|
| 210 | + * |
|
| 211 | + */ |
|
| 212 | + public function getAllArchiveSpotterDataById($id) |
|
| 213 | 213 | { |
| 214 | - date_default_timezone_set('UTC'); |
|
| 215 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 214 | + date_default_timezone_set('UTC'); |
|
| 215 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 217 | 217 | |
| 218 | 218 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 219 | 219 | |
| 220 | - try { |
|
| 221 | - $sth = $this->db->prepare($query); |
|
| 222 | - $sth->execute(array(':id' => $id)); |
|
| 223 | - } catch(PDOException $e) { |
|
| 224 | - echo $e->getMessage(); |
|
| 225 | - die; |
|
| 226 | - } |
|
| 227 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | - |
|
| 229 | - return $spotter_array; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * Gets coordinate & time spotter information based on a particular id |
|
| 234 | - * |
|
| 235 | - * @return Array the spotter information |
|
| 236 | - * |
|
| 237 | - */ |
|
| 238 | - public function getCoordArchiveSpotterDataById($id) |
|
| 239 | - { |
|
| 240 | - date_default_timezone_set('UTC'); |
|
| 241 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 220 | + try { |
|
| 221 | + $sth = $this->db->prepare($query); |
|
| 222 | + $sth->execute(array(':id' => $id)); |
|
| 223 | + } catch(PDOException $e) { |
|
| 224 | + echo $e->getMessage(); |
|
| 225 | + die; |
|
| 226 | + } |
|
| 227 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | + |
|
| 229 | + return $spotter_array; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * Gets coordinate & time spotter information based on a particular id |
|
| 234 | + * |
|
| 235 | + * @return Array the spotter information |
|
| 236 | + * |
|
| 237 | + */ |
|
| 238 | + public function getCoordArchiveSpotterDataById($id) |
|
| 239 | + { |
|
| 240 | + date_default_timezone_set('UTC'); |
|
| 241 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | 243 | |
| 244 | 244 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 245 | 245 | |
| 246 | - try { |
|
| 247 | - $sth = $this->db->prepare($query); |
|
| 248 | - $sth->execute(array(':id' => $id)); |
|
| 249 | - } catch(PDOException $e) { |
|
| 250 | - echo $e->getMessage(); |
|
| 251 | - die; |
|
| 252 | - } |
|
| 253 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 246 | + try { |
|
| 247 | + $sth = $this->db->prepare($query); |
|
| 248 | + $sth->execute(array(':id' => $id)); |
|
| 249 | + } catch(PDOException $e) { |
|
| 250 | + echo $e->getMessage(); |
|
| 251 | + die; |
|
| 252 | + } |
|
| 253 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 254 | 254 | |
| 255 | - return $spotter_array; |
|
| 256 | - } |
|
| 255 | + return $spotter_array; |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Gets altitude information based on a particular callsign |
|
| 261 | - * |
|
| 262 | - * @return Array the spotter information |
|
| 263 | - * |
|
| 264 | - */ |
|
| 265 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | - { |
|
| 259 | + /** |
|
| 260 | + * Gets altitude information based on a particular callsign |
|
| 261 | + * |
|
| 262 | + * @return Array the spotter information |
|
| 263 | + * |
|
| 264 | + */ |
|
| 265 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | + { |
|
| 267 | 267 | |
| 268 | - date_default_timezone_set('UTC'); |
|
| 268 | + date_default_timezone_set('UTC'); |
|
| 269 | 269 | |
| 270 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 270 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | 272 | |
| 273 | - try { |
|
| 274 | - $sth = $this->db->prepare($query); |
|
| 275 | - $sth->execute(array(':ident' => $ident)); |
|
| 276 | - } catch(PDOException $e) { |
|
| 277 | - echo $e->getMessage(); |
|
| 278 | - die; |
|
| 279 | - } |
|
| 280 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + try { |
|
| 274 | + $sth = $this->db->prepare($query); |
|
| 275 | + $sth->execute(array(':ident' => $ident)); |
|
| 276 | + } catch(PDOException $e) { |
|
| 277 | + echo $e->getMessage(); |
|
| 278 | + die; |
|
| 279 | + } |
|
| 280 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 281 | 281 | |
| 282 | - return $spotter_array; |
|
| 283 | - } |
|
| 282 | + return $spotter_array; |
|
| 283 | + } |
|
| 284 | 284 | |
| 285 | - /** |
|
| 286 | - * Gets altitude information based on a particular id |
|
| 287 | - * |
|
| 288 | - * @return Array the spotter information |
|
| 289 | - * |
|
| 290 | - */ |
|
| 291 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | - { |
|
| 285 | + /** |
|
| 286 | + * Gets altitude information based on a particular id |
|
| 287 | + * |
|
| 288 | + * @return Array the spotter information |
|
| 289 | + * |
|
| 290 | + */ |
|
| 291 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | + { |
|
| 293 | 293 | |
| 294 | - date_default_timezone_set('UTC'); |
|
| 294 | + date_default_timezone_set('UTC'); |
|
| 295 | 295 | |
| 296 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 296 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | 298 | |
| 299 | - try { |
|
| 300 | - $sth = $this->db->prepare($query); |
|
| 301 | - $sth->execute(array(':id' => $id)); |
|
| 302 | - } catch(PDOException $e) { |
|
| 303 | - echo $e->getMessage(); |
|
| 304 | - die; |
|
| 305 | - } |
|
| 306 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 299 | + try { |
|
| 300 | + $sth = $this->db->prepare($query); |
|
| 301 | + $sth->execute(array(':id' => $id)); |
|
| 302 | + } catch(PDOException $e) { |
|
| 303 | + echo $e->getMessage(); |
|
| 304 | + die; |
|
| 305 | + } |
|
| 306 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 307 | 307 | |
| 308 | - return $spotter_array; |
|
| 309 | - } |
|
| 308 | + return $spotter_array; |
|
| 309 | + } |
|
| 310 | 310 | |
| 311 | - /** |
|
| 312 | - * Gets altitude & speed information based on a particular id |
|
| 313 | - * |
|
| 314 | - * @return Array the spotter information |
|
| 315 | - * |
|
| 316 | - */ |
|
| 311 | + /** |
|
| 312 | + * Gets altitude & speed information based on a particular id |
|
| 313 | + * |
|
| 314 | + * @return Array the spotter information |
|
| 315 | + * |
|
| 316 | + */ |
|
| 317 | 317 | public function getAltitudeSpeedArchiveSpotterDataById($id) |
| 318 | 318 | { |
| 319 | 319 | date_default_timezone_set('UTC'); |
@@ -330,12 +330,12 @@ discard block |
||
| 330 | 330 | return $spotter_array; |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | - /** |
|
| 334 | - * Gets altitude information based on a particular callsign |
|
| 335 | - * |
|
| 336 | - * @return Array the spotter information |
|
| 337 | - * |
|
| 338 | - */ |
|
| 333 | + /** |
|
| 334 | + * Gets altitude information based on a particular callsign |
|
| 335 | + * |
|
| 336 | + * @return Array the spotter information |
|
| 337 | + * |
|
| 338 | + */ |
|
| 339 | 339 | public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
| 340 | 340 | { |
| 341 | 341 | date_default_timezone_set('UTC'); |
@@ -355,12 +355,12 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | |
| 357 | 357 | |
| 358 | - /** |
|
| 359 | - * Gets all the archive spotter information |
|
| 360 | - * |
|
| 361 | - * @return Array the spotter information |
|
| 362 | - * |
|
| 363 | - */ |
|
| 358 | + /** |
|
| 359 | + * Gets all the archive spotter information |
|
| 360 | + * |
|
| 361 | + * @return Array the spotter information |
|
| 362 | + * |
|
| 363 | + */ |
|
| 364 | 364 | public function getSpotterArchiveData($ident,$flightaware_id,$date) |
| 365 | 365 | { |
| 366 | 366 | $Spotter = new Spotter($this->db); |
@@ -388,34 +388,34 @@ discard block |
||
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | /** |
| 391 | - * Gets Minimal Live Spotter data |
|
| 392 | - * |
|
| 393 | - * @return Array the spotter information |
|
| 394 | - * |
|
| 395 | - */ |
|
| 396 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 397 | - { |
|
| 398 | - global $globalDBdriver, $globalLiveInterval; |
|
| 399 | - date_default_timezone_set('UTC'); |
|
| 400 | - |
|
| 401 | - $filter_query = ''; |
|
| 402 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 403 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 404 | - } |
|
| 405 | - // Use spotter_output also ? |
|
| 406 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 407 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 408 | - } |
|
| 409 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 410 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | - } |
|
| 412 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 413 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 414 | - } |
|
| 391 | + * Gets Minimal Live Spotter data |
|
| 392 | + * |
|
| 393 | + * @return Array the spotter information |
|
| 394 | + * |
|
| 395 | + */ |
|
| 396 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 397 | + { |
|
| 398 | + global $globalDBdriver, $globalLiveInterval; |
|
| 399 | + date_default_timezone_set('UTC'); |
|
| 400 | + |
|
| 401 | + $filter_query = ''; |
|
| 402 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 403 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 404 | + } |
|
| 405 | + // Use spotter_output also ? |
|
| 406 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 407 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 408 | + } |
|
| 409 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 410 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | + } |
|
| 412 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 413 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 414 | + } |
|
| 415 | 415 | |
| 416 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 417 | - if ($globalDBdriver == 'mysql') { |
|
| 418 | - /* |
|
| 416 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 417 | + if ($globalDBdriver == 'mysql') { |
|
| 418 | + /* |
|
| 419 | 419 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 420 | 420 | FROM spotter_archive |
| 421 | 421 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -434,56 +434,56 @@ discard block |
||
| 434 | 434 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 435 | 435 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 436 | 436 | '.$filter_query.' ORDER BY flightaware_id'; |
| 437 | - } else { |
|
| 438 | - //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 439 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 437 | + } else { |
|
| 438 | + //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 439 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 440 | 440 | FROM spotter_archive |
| 441 | 441 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 442 | 442 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 443 | 443 | '.$filter_query.' ORDER BY flightaware_id'; |
| 444 | - } |
|
| 445 | - //echo $query; |
|
| 446 | - try { |
|
| 447 | - $sth = $this->db->prepare($query); |
|
| 448 | - $sth->execute(); |
|
| 449 | - } catch(PDOException $e) { |
|
| 450 | - echo $e->getMessage(); |
|
| 451 | - die; |
|
| 452 | - } |
|
| 453 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 444 | + } |
|
| 445 | + //echo $query; |
|
| 446 | + try { |
|
| 447 | + $sth = $this->db->prepare($query); |
|
| 448 | + $sth->execute(); |
|
| 449 | + } catch(PDOException $e) { |
|
| 450 | + echo $e->getMessage(); |
|
| 451 | + die; |
|
| 452 | + } |
|
| 453 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 454 | 454 | |
| 455 | - return $spotter_array; |
|
| 456 | - } |
|
| 455 | + return $spotter_array; |
|
| 456 | + } |
|
| 457 | 457 | |
| 458 | 458 | /** |
| 459 | - * Gets Minimal Live Spotter data |
|
| 460 | - * |
|
| 461 | - * @return Array the spotter information |
|
| 462 | - * |
|
| 463 | - */ |
|
| 464 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 465 | - { |
|
| 466 | - global $globalDBdriver, $globalLiveInterval; |
|
| 467 | - date_default_timezone_set('UTC'); |
|
| 468 | - |
|
| 469 | - $filter_query = ''; |
|
| 470 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 471 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 472 | - } |
|
| 473 | - // Should use spotter_output also ? |
|
| 474 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 475 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 476 | - } |
|
| 477 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 478 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | - } |
|
| 480 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 481 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 482 | - } |
|
| 459 | + * Gets Minimal Live Spotter data |
|
| 460 | + * |
|
| 461 | + * @return Array the spotter information |
|
| 462 | + * |
|
| 463 | + */ |
|
| 464 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 465 | + { |
|
| 466 | + global $globalDBdriver, $globalLiveInterval; |
|
| 467 | + date_default_timezone_set('UTC'); |
|
| 468 | + |
|
| 469 | + $filter_query = ''; |
|
| 470 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 471 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 472 | + } |
|
| 473 | + // Should use spotter_output also ? |
|
| 474 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 475 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 476 | + } |
|
| 477 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 478 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | + } |
|
| 480 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 481 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 482 | + } |
|
| 483 | 483 | |
| 484 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 485 | - if ($globalDBdriver == 'mysql') { |
|
| 486 | - /* |
|
| 484 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 485 | + if ($globalDBdriver == 'mysql') { |
|
| 486 | + /* |
|
| 487 | 487 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 488 | 488 | FROM spotter_archive |
| 489 | 489 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -494,95 +494,95 @@ discard block |
||
| 494 | 494 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 495 | 495 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 496 | 496 | |
| 497 | - } else { |
|
| 498 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 499 | - /* |
|
| 497 | + } else { |
|
| 498 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 499 | + /* |
|
| 500 | 500 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 501 | 501 | FROM spotter_archive_output |
| 502 | 502 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 503 | 503 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 504 | 504 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 505 | 505 | */ |
| 506 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 506 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 507 | 507 | FROM spotter_archive_output |
| 508 | 508 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 509 | 509 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 510 | 510 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 511 | 511 | // .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
| 512 | 512 | |
| 513 | - } |
|
| 514 | - //echo $query; |
|
| 515 | - try { |
|
| 516 | - $sth = $this->db->prepare($query); |
|
| 517 | - $sth->execute(); |
|
| 518 | - } catch(PDOException $e) { |
|
| 519 | - echo $e->getMessage(); |
|
| 520 | - die; |
|
| 521 | - } |
|
| 522 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 513 | + } |
|
| 514 | + //echo $query; |
|
| 515 | + try { |
|
| 516 | + $sth = $this->db->prepare($query); |
|
| 517 | + $sth->execute(); |
|
| 518 | + } catch(PDOException $e) { |
|
| 519 | + echo $e->getMessage(); |
|
| 520 | + die; |
|
| 521 | + } |
|
| 522 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 523 | 523 | |
| 524 | - return $spotter_array; |
|
| 525 | - } |
|
| 524 | + return $spotter_array; |
|
| 525 | + } |
|
| 526 | 526 | |
| 527 | 527 | /** |
| 528 | - * Gets count Live Spotter data |
|
| 529 | - * |
|
| 530 | - * @return Array the spotter information |
|
| 531 | - * |
|
| 532 | - */ |
|
| 533 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 534 | - { |
|
| 535 | - global $globalDBdriver, $globalLiveInterval; |
|
| 536 | - date_default_timezone_set('UTC'); |
|
| 537 | - |
|
| 538 | - $filter_query = ''; |
|
| 539 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 540 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 541 | - } |
|
| 542 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 543 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 544 | - } |
|
| 545 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 546 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | - } |
|
| 548 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 549 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 550 | - } |
|
| 528 | + * Gets count Live Spotter data |
|
| 529 | + * |
|
| 530 | + * @return Array the spotter information |
|
| 531 | + * |
|
| 532 | + */ |
|
| 533 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 534 | + { |
|
| 535 | + global $globalDBdriver, $globalLiveInterval; |
|
| 536 | + date_default_timezone_set('UTC'); |
|
| 551 | 537 | |
| 552 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 553 | - if ($globalDBdriver == 'mysql') { |
|
| 538 | + $filter_query = ''; |
|
| 539 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 540 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 541 | + } |
|
| 542 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 543 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 544 | + } |
|
| 545 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 546 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | + } |
|
| 548 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 549 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 550 | + } |
|
| 551 | + |
|
| 552 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 553 | + if ($globalDBdriver == 'mysql') { |
|
| 554 | 554 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 555 | 555 | FROM spotter_archive l |
| 556 | 556 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 557 | - } else { |
|
| 557 | + } else { |
|
| 558 | 558 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 559 | - } |
|
| 560 | - //echo $query; |
|
| 561 | - try { |
|
| 562 | - $sth = $this->db->prepare($query); |
|
| 563 | - $sth->execute(); |
|
| 564 | - } catch(PDOException $e) { |
|
| 565 | - echo $e->getMessage(); |
|
| 566 | - die; |
|
| 567 | - } |
|
| 559 | + } |
|
| 560 | + //echo $query; |
|
| 561 | + try { |
|
| 562 | + $sth = $this->db->prepare($query); |
|
| 563 | + $sth->execute(); |
|
| 564 | + } catch(PDOException $e) { |
|
| 565 | + echo $e->getMessage(); |
|
| 566 | + die; |
|
| 567 | + } |
|
| 568 | 568 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 569 | 569 | $sth->closeCursor(); |
| 570 | - return $result['nb']; |
|
| 570 | + return $result['nb']; |
|
| 571 | 571 | |
| 572 | - } |
|
| 572 | + } |
|
| 573 | 573 | |
| 574 | 574 | |
| 575 | 575 | |
| 576 | 576 | // Spotter_Archive_output |
| 577 | 577 | |
| 578 | - /** |
|
| 579 | - * Gets all the spotter information |
|
| 580 | - * |
|
| 581 | - * @return Array the spotter information |
|
| 582 | - * |
|
| 583 | - */ |
|
| 584 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 585 | - { |
|
| 578 | + /** |
|
| 579 | + * Gets all the spotter information |
|
| 580 | + * |
|
| 581 | + * @return Array the spotter information |
|
| 582 | + * |
|
| 583 | + */ |
|
| 584 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 585 | + { |
|
| 586 | 586 | global $globalTimezone, $globalDBdriver; |
| 587 | 587 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 588 | 588 | $Translation = new Translation($this->db); |
@@ -596,159 +596,159 @@ discard block |
||
| 596 | 596 | $filter_query = $this->getFilter($filters); |
| 597 | 597 | if ($q != "") |
| 598 | 598 | { |
| 599 | - if (!is_string($q)) |
|
| 600 | - { |
|
| 599 | + if (!is_string($q)) |
|
| 600 | + { |
|
| 601 | 601 | return false; |
| 602 | - } else { |
|
| 602 | + } else { |
|
| 603 | 603 | |
| 604 | 604 | $q_array = explode(" ", $q); |
| 605 | 605 | |
| 606 | 606 | foreach ($q_array as $q_item){ |
| 607 | - $additional_query .= " AND ("; |
|
| 608 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 609 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 610 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 611 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 612 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 613 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 614 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 615 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 616 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 617 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 618 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 619 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 620 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 621 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 628 | - $translate = $Translation->ident2icao($q_item); |
|
| 629 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 631 | - $additional_query .= ")"; |
|
| 607 | + $additional_query .= " AND ("; |
|
| 608 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 609 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 610 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 611 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 612 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 613 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 614 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 615 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 616 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 617 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 618 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 619 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 620 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 621 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 628 | + $translate = $Translation->ident2icao($q_item); |
|
| 629 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 631 | + $additional_query .= ")"; |
|
| 632 | + } |
|
| 632 | 633 | } |
| 633 | - } |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | if ($registration != "") |
| 637 | 637 | { |
| 638 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 639 | - if (!is_string($registration)) |
|
| 640 | - { |
|
| 638 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 639 | + if (!is_string($registration)) |
|
| 640 | + { |
|
| 641 | 641 | return false; |
| 642 | - } else { |
|
| 642 | + } else { |
|
| 643 | 643 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 644 | - } |
|
| 644 | + } |
|
| 645 | 645 | } |
| 646 | 646 | |
| 647 | 647 | if ($aircraft_icao != "") |
| 648 | 648 | { |
| 649 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 650 | - if (!is_string($aircraft_icao)) |
|
| 651 | - { |
|
| 649 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 650 | + if (!is_string($aircraft_icao)) |
|
| 651 | + { |
|
| 652 | 652 | return false; |
| 653 | - } else { |
|
| 653 | + } else { |
|
| 654 | 654 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 655 | - } |
|
| 655 | + } |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | if ($aircraft_manufacturer != "") |
| 659 | 659 | { |
| 660 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 661 | - if (!is_string($aircraft_manufacturer)) |
|
| 662 | - { |
|
| 660 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 661 | + if (!is_string($aircraft_manufacturer)) |
|
| 662 | + { |
|
| 663 | 663 | return false; |
| 664 | - } else { |
|
| 664 | + } else { |
|
| 665 | 665 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 666 | - } |
|
| 666 | + } |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if ($highlights == "true") |
| 670 | 670 | { |
| 671 | - if (!is_string($highlights)) |
|
| 672 | - { |
|
| 671 | + if (!is_string($highlights)) |
|
| 672 | + { |
|
| 673 | 673 | return false; |
| 674 | - } else { |
|
| 674 | + } else { |
|
| 675 | 675 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 676 | - } |
|
| 676 | + } |
|
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | if ($airline_icao != "") |
| 680 | 680 | { |
| 681 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 682 | - if (!is_string($airline_icao)) |
|
| 683 | - { |
|
| 681 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 682 | + if (!is_string($airline_icao)) |
|
| 683 | + { |
|
| 684 | 684 | return false; |
| 685 | - } else { |
|
| 685 | + } else { |
|
| 686 | 686 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 687 | - } |
|
| 687 | + } |
|
| 688 | 688 | } |
| 689 | 689 | |
| 690 | 690 | if ($airline_country != "") |
| 691 | 691 | { |
| 692 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 693 | - if (!is_string($airline_country)) |
|
| 694 | - { |
|
| 692 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 693 | + if (!is_string($airline_country)) |
|
| 694 | + { |
|
| 695 | 695 | return false; |
| 696 | - } else { |
|
| 696 | + } else { |
|
| 697 | 697 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 698 | - } |
|
| 698 | + } |
|
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | if ($airline_type != "") |
| 702 | 702 | { |
| 703 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 704 | - if (!is_string($airline_type)) |
|
| 705 | - { |
|
| 703 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 704 | + if (!is_string($airline_type)) |
|
| 705 | + { |
|
| 706 | 706 | return false; |
| 707 | - } else { |
|
| 707 | + } else { |
|
| 708 | 708 | if ($airline_type == "passenger") |
| 709 | 709 | { |
| 710 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 710 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 711 | 711 | } |
| 712 | 712 | if ($airline_type == "cargo") |
| 713 | 713 | { |
| 714 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 714 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 715 | 715 | } |
| 716 | 716 | if ($airline_type == "military") |
| 717 | 717 | { |
| 718 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 718 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 719 | + } |
|
| 719 | 720 | } |
| 720 | - } |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | if ($airport != "") |
| 724 | 724 | { |
| 725 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 726 | - if (!is_string($airport)) |
|
| 727 | - { |
|
| 725 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 726 | + if (!is_string($airport)) |
|
| 727 | + { |
|
| 728 | 728 | return false; |
| 729 | - } else { |
|
| 729 | + } else { |
|
| 730 | 730 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 731 | - } |
|
| 731 | + } |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | if ($airport_country != "") |
| 735 | 735 | { |
| 736 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 737 | - if (!is_string($airport_country)) |
|
| 738 | - { |
|
| 736 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 737 | + if (!is_string($airport_country)) |
|
| 738 | + { |
|
| 739 | 739 | return false; |
| 740 | - } else { |
|
| 740 | + } else { |
|
| 741 | 741 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 742 | - } |
|
| 742 | + } |
|
| 743 | 743 | } |
| 744 | 744 | |
| 745 | 745 | if ($callsign != "") |
| 746 | 746 | { |
| 747 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 748 | - if (!is_string($callsign)) |
|
| 749 | - { |
|
| 747 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 748 | + if (!is_string($callsign)) |
|
| 749 | + { |
|
| 750 | 750 | return false; |
| 751 | - } else { |
|
| 751 | + } else { |
|
| 752 | 752 | $translate = $Translation->ident2icao($callsign); |
| 753 | 753 | if ($translate != $callsign) { |
| 754 | 754 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -756,81 +756,81 @@ discard block |
||
| 756 | 756 | } else { |
| 757 | 757 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 758 | 758 | } |
| 759 | - } |
|
| 759 | + } |
|
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | if ($owner != "") |
| 763 | 763 | { |
| 764 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 765 | - if (!is_string($owner)) |
|
| 766 | - { |
|
| 764 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 765 | + if (!is_string($owner)) |
|
| 766 | + { |
|
| 767 | 767 | return false; |
| 768 | - } else { |
|
| 768 | + } else { |
|
| 769 | 769 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 770 | - } |
|
| 770 | + } |
|
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | if ($pilot_name != "") |
| 774 | 774 | { |
| 775 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 776 | - if (!is_string($pilot_name)) |
|
| 777 | - { |
|
| 775 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 776 | + if (!is_string($pilot_name)) |
|
| 777 | + { |
|
| 778 | 778 | return false; |
| 779 | - } else { |
|
| 779 | + } else { |
|
| 780 | 780 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 781 | - } |
|
| 781 | + } |
|
| 782 | 782 | } |
| 783 | 783 | |
| 784 | 784 | if ($pilot_id != "") |
| 785 | 785 | { |
| 786 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 787 | - if (!is_string($pilot_id)) |
|
| 788 | - { |
|
| 786 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 787 | + if (!is_string($pilot_id)) |
|
| 788 | + { |
|
| 789 | 789 | return false; |
| 790 | - } else { |
|
| 790 | + } else { |
|
| 791 | 791 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 792 | - } |
|
| 792 | + } |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | 795 | if ($departure_airport_route != "") |
| 796 | 796 | { |
| 797 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 798 | - if (!is_string($departure_airport_route)) |
|
| 799 | - { |
|
| 797 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 798 | + if (!is_string($departure_airport_route)) |
|
| 799 | + { |
|
| 800 | 800 | return false; |
| 801 | - } else { |
|
| 801 | + } else { |
|
| 802 | 802 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 803 | - } |
|
| 803 | + } |
|
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | if ($arrival_airport_route != "") |
| 807 | 807 | { |
| 808 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | - if (!is_string($arrival_airport_route)) |
|
| 810 | - { |
|
| 808 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | + if (!is_string($arrival_airport_route)) |
|
| 810 | + { |
|
| 811 | 811 | return false; |
| 812 | - } else { |
|
| 812 | + } else { |
|
| 813 | 813 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 814 | - } |
|
| 814 | + } |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | if ($altitude != "") |
| 818 | 818 | { |
| 819 | - $altitude_array = explode(",", $altitude); |
|
| 819 | + $altitude_array = explode(",", $altitude); |
|
| 820 | 820 | |
| 821 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 822 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 821 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 822 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 823 | 823 | |
| 824 | 824 | |
| 825 | - if ($altitude_array[1] != "") |
|
| 826 | - { |
|
| 825 | + if ($altitude_array[1] != "") |
|
| 826 | + { |
|
| 827 | 827 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 828 | 828 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 829 | 829 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 830 | - } else { |
|
| 830 | + } else { |
|
| 831 | 831 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 832 | 832 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 833 | - } |
|
| 833 | + } |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | if ($date_posted != "") |
@@ -915,14 +915,14 @@ discard block |
||
| 915 | 915 | } |
| 916 | 916 | } |
| 917 | 917 | |
| 918 | - /** |
|
| 919 | - * Gets all the spotter information based on the callsign |
|
| 920 | - * |
|
| 921 | - * @return Array the spotter information |
|
| 922 | - * |
|
| 923 | - */ |
|
| 924 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 925 | - { |
|
| 918 | + /** |
|
| 919 | + * Gets all the spotter information based on the callsign |
|
| 920 | + * |
|
| 921 | + * @return Array the spotter information |
|
| 922 | + * |
|
| 923 | + */ |
|
| 924 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 925 | + { |
|
| 926 | 926 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 927 | 927 | |
| 928 | 928 | date_default_timezone_set('UTC'); |
@@ -934,35 +934,35 @@ discard block |
||
| 934 | 934 | |
| 935 | 935 | if ($ident != "") |
| 936 | 936 | { |
| 937 | - if (!is_string($ident)) |
|
| 938 | - { |
|
| 937 | + if (!is_string($ident)) |
|
| 938 | + { |
|
| 939 | 939 | return false; |
| 940 | - } else { |
|
| 940 | + } else { |
|
| 941 | 941 | $additional_query = " AND spotter_archive_output.ident = :ident"; |
| 942 | 942 | $query_values = array(':ident' => $ident); |
| 943 | - } |
|
| 943 | + } |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | if ($limit != "") |
| 947 | 947 | { |
| 948 | - $limit_array = explode(",", $limit); |
|
| 948 | + $limit_array = explode(",", $limit); |
|
| 949 | 949 | |
| 950 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 951 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 950 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 951 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 952 | 952 | |
| 953 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 954 | - { |
|
| 953 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 954 | + { |
|
| 955 | 955 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 956 | 956 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 957 | - } |
|
| 957 | + } |
|
| 958 | 958 | } |
| 959 | 959 | |
| 960 | 960 | if ($sort != "") |
| 961 | 961 | { |
| 962 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 963 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 962 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 963 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 964 | 964 | } else { |
| 965 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 965 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 966 | 966 | } |
| 967 | 967 | |
| 968 | 968 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -970,17 +970,17 @@ discard block |
||
| 970 | 970 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 971 | 971 | |
| 972 | 972 | return $spotter_array; |
| 973 | - } |
|
| 973 | + } |
|
| 974 | 974 | |
| 975 | 975 | |
| 976 | - /** |
|
| 977 | - * Gets all the spotter information based on the owner |
|
| 978 | - * |
|
| 979 | - * @return Array the spotter information |
|
| 980 | - * |
|
| 981 | - */ |
|
| 982 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 983 | - { |
|
| 976 | + /** |
|
| 977 | + * Gets all the spotter information based on the owner |
|
| 978 | + * |
|
| 979 | + * @return Array the spotter information |
|
| 980 | + * |
|
| 981 | + */ |
|
| 982 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 983 | + { |
|
| 984 | 984 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 985 | 985 | |
| 986 | 986 | date_default_timezone_set('UTC'); |
@@ -993,35 +993,35 @@ discard block |
||
| 993 | 993 | |
| 994 | 994 | if ($owner != "") |
| 995 | 995 | { |
| 996 | - if (!is_string($owner)) |
|
| 997 | - { |
|
| 996 | + if (!is_string($owner)) |
|
| 997 | + { |
|
| 998 | 998 | return false; |
| 999 | - } else { |
|
| 999 | + } else { |
|
| 1000 | 1000 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1001 | 1001 | $query_values = array(':owner' => $owner); |
| 1002 | - } |
|
| 1002 | + } |
|
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | 1005 | if ($limit != "") |
| 1006 | 1006 | { |
| 1007 | - $limit_array = explode(",", $limit); |
|
| 1007 | + $limit_array = explode(",", $limit); |
|
| 1008 | 1008 | |
| 1009 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1010 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1009 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1010 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1011 | 1011 | |
| 1012 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1013 | - { |
|
| 1012 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1013 | + { |
|
| 1014 | 1014 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1015 | 1015 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1016 | - } |
|
| 1016 | + } |
|
| 1017 | 1017 | } |
| 1018 | 1018 | |
| 1019 | 1019 | if ($sort != "") |
| 1020 | 1020 | { |
| 1021 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1022 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1021 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1022 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1023 | 1023 | } else { |
| 1024 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1024 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1029,16 +1029,16 @@ discard block |
||
| 1029 | 1029 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1030 | 1030 | |
| 1031 | 1031 | return $spotter_array; |
| 1032 | - } |
|
| 1033 | - |
|
| 1034 | - /** |
|
| 1035 | - * Gets all the spotter information based on the pilot |
|
| 1036 | - * |
|
| 1037 | - * @return Array the spotter information |
|
| 1038 | - * |
|
| 1039 | - */ |
|
| 1040 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1041 | - { |
|
| 1032 | + } |
|
| 1033 | + |
|
| 1034 | + /** |
|
| 1035 | + * Gets all the spotter information based on the pilot |
|
| 1036 | + * |
|
| 1037 | + * @return Array the spotter information |
|
| 1038 | + * |
|
| 1039 | + */ |
|
| 1040 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1041 | + { |
|
| 1042 | 1042 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1043 | 1043 | |
| 1044 | 1044 | date_default_timezone_set('UTC'); |
@@ -1057,24 +1057,24 @@ discard block |
||
| 1057 | 1057 | |
| 1058 | 1058 | if ($limit != "") |
| 1059 | 1059 | { |
| 1060 | - $limit_array = explode(",", $limit); |
|
| 1060 | + $limit_array = explode(",", $limit); |
|
| 1061 | 1061 | |
| 1062 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1062 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1064 | 1064 | |
| 1065 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | - { |
|
| 1065 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | + { |
|
| 1067 | 1067 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1068 | 1068 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1069 | - } |
|
| 1069 | + } |
|
| 1070 | 1070 | } |
| 1071 | 1071 | |
| 1072 | 1072 | if ($sort != "") |
| 1073 | 1073 | { |
| 1074 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1075 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1074 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1075 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1076 | 1076 | } else { |
| 1077 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1077 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1078 | 1078 | } |
| 1079 | 1079 | |
| 1080 | 1080 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1082,16 +1082,16 @@ discard block |
||
| 1082 | 1082 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1083 | 1083 | |
| 1084 | 1084 | return $spotter_array; |
| 1085 | - } |
|
| 1086 | - |
|
| 1087 | - /** |
|
| 1088 | - * Gets all number of flight over countries |
|
| 1089 | - * |
|
| 1090 | - * @return Array the airline country list |
|
| 1091 | - * |
|
| 1092 | - */ |
|
| 1093 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1094 | - { |
|
| 1085 | + } |
|
| 1086 | + |
|
| 1087 | + /** |
|
| 1088 | + * Gets all number of flight over countries |
|
| 1089 | + * |
|
| 1090 | + * @return Array the airline country list |
|
| 1091 | + * |
|
| 1092 | + */ |
|
| 1093 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1094 | + { |
|
| 1095 | 1095 | global $globalDBdriver; |
| 1096 | 1096 | /* |
| 1097 | 1097 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1101,14 +1101,14 @@ discard block |
||
| 1101 | 1101 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1102 | 1102 | FROM countries c, spotter_archive s |
| 1103 | 1103 | WHERE c.iso2 = s.over_country "; |
| 1104 | - if ($olderthanmonths > 0) { |
|
| 1105 | - if ($globalDBdriver == 'mysql') { |
|
| 1104 | + if ($olderthanmonths > 0) { |
|
| 1105 | + if ($globalDBdriver == 'mysql') { |
|
| 1106 | 1106 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1107 | 1107 | } else { |
| 1108 | 1108 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1109 | 1109 | } |
| 1110 | 1110 | } |
| 1111 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1111 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1112 | 1112 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1113 | 1113 | if ($limit) $query .= " LIMIT 0,10"; |
| 1114 | 1114 | |
@@ -1121,23 +1121,23 @@ discard block |
||
| 1121 | 1121 | |
| 1122 | 1122 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1123 | 1123 | { |
| 1124 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1125 | - $temp_array['flight_country'] = $row['name']; |
|
| 1126 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1127 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1128 | - $flight_array[] = $temp_array; |
|
| 1124 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1125 | + $temp_array['flight_country'] = $row['name']; |
|
| 1126 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1127 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1128 | + $flight_array[] = $temp_array; |
|
| 1129 | 1129 | } |
| 1130 | 1130 | return $flight_array; |
| 1131 | - } |
|
| 1132 | - |
|
| 1133 | - /** |
|
| 1134 | - * Gets all number of flight over countries |
|
| 1135 | - * |
|
| 1136 | - * @return Array the airline country list |
|
| 1137 | - * |
|
| 1138 | - */ |
|
| 1139 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | - { |
|
| 1131 | + } |
|
| 1132 | + |
|
| 1133 | + /** |
|
| 1134 | + * Gets all number of flight over countries |
|
| 1135 | + * |
|
| 1136 | + * @return Array the airline country list |
|
| 1137 | + * |
|
| 1138 | + */ |
|
| 1139 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | + { |
|
| 1141 | 1141 | global $globalDBdriver; |
| 1142 | 1142 | /* |
| 1143 | 1143 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1147,14 +1147,14 @@ discard block |
||
| 1147 | 1147 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1148 | 1148 | FROM countries c, spotter_archive s, spotter_output o |
| 1149 | 1149 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1150 | - if ($olderthanmonths > 0) { |
|
| 1151 | - if ($globalDBdriver == 'mysql') { |
|
| 1150 | + if ($olderthanmonths > 0) { |
|
| 1151 | + if ($globalDBdriver == 'mysql') { |
|
| 1152 | 1152 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1153 | 1153 | } else { |
| 1154 | 1154 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1155 | 1155 | } |
| 1156 | 1156 | } |
| 1157 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1157 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1158 | 1158 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1159 | 1159 | if ($limit) $query .= " LIMIT 0,10"; |
| 1160 | 1160 | |
@@ -1167,24 +1167,24 @@ discard block |
||
| 1167 | 1167 | |
| 1168 | 1168 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1169 | 1169 | { |
| 1170 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1171 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1172 | - $temp_array['flight_country'] = $row['name']; |
|
| 1173 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1174 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1175 | - $flight_array[] = $temp_array; |
|
| 1170 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1171 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1172 | + $temp_array['flight_country'] = $row['name']; |
|
| 1173 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1174 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1175 | + $flight_array[] = $temp_array; |
|
| 1176 | 1176 | } |
| 1177 | 1177 | return $flight_array; |
| 1178 | - } |
|
| 1179 | - |
|
| 1180 | - /** |
|
| 1181 | - * Gets last spotter information based on a particular callsign |
|
| 1182 | - * |
|
| 1183 | - * @return Array the spotter information |
|
| 1184 | - * |
|
| 1185 | - */ |
|
| 1186 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1187 | - { |
|
| 1178 | + } |
|
| 1179 | + |
|
| 1180 | + /** |
|
| 1181 | + * Gets last spotter information based on a particular callsign |
|
| 1182 | + * |
|
| 1183 | + * @return Array the spotter information |
|
| 1184 | + * |
|
| 1185 | + */ |
|
| 1186 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1187 | + { |
|
| 1188 | 1188 | $Spotter = new Spotter($this->db); |
| 1189 | 1189 | date_default_timezone_set('UTC'); |
| 1190 | 1190 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1192,16 +1192,16 @@ discard block |
||
| 1192 | 1192 | $date = date('c',$date); |
| 1193 | 1193 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1194 | 1194 | return $spotter_array; |
| 1195 | - } |
|
| 1196 | - |
|
| 1197 | - /** |
|
| 1198 | - * Gets all the spotter information based on a particular callsign |
|
| 1199 | - * |
|
| 1200 | - * @return Array the spotter information |
|
| 1201 | - * |
|
| 1202 | - */ |
|
| 1203 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1204 | - { |
|
| 1195 | + } |
|
| 1196 | + |
|
| 1197 | + /** |
|
| 1198 | + * Gets all the spotter information based on a particular callsign |
|
| 1199 | + * |
|
| 1200 | + * @return Array the spotter information |
|
| 1201 | + * |
|
| 1202 | + */ |
|
| 1203 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1204 | + { |
|
| 1205 | 1205 | $Spotter = new Spotter($this->db); |
| 1206 | 1206 | date_default_timezone_set('UTC'); |
| 1207 | 1207 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1209,16 +1209,16 @@ discard block |
||
| 1209 | 1209 | $date = date('c',$date); |
| 1210 | 1210 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1211 | 1211 | return $spotter_array; |
| 1212 | - } |
|
| 1213 | - |
|
| 1214 | - /** |
|
| 1215 | - * Gets all the spotter information based on the airport |
|
| 1216 | - * |
|
| 1217 | - * @return Array the spotter information |
|
| 1218 | - * |
|
| 1219 | - */ |
|
| 1220 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1221 | - { |
|
| 1212 | + } |
|
| 1213 | + |
|
| 1214 | + /** |
|
| 1215 | + * Gets all the spotter information based on the airport |
|
| 1216 | + * |
|
| 1217 | + * @return Array the spotter information |
|
| 1218 | + * |
|
| 1219 | + */ |
|
| 1220 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1221 | + { |
|
| 1222 | 1222 | global $global_query; |
| 1223 | 1223 | $Spotter = new Spotter($this->db); |
| 1224 | 1224 | date_default_timezone_set('UTC'); |
@@ -1229,35 +1229,35 @@ discard block |
||
| 1229 | 1229 | |
| 1230 | 1230 | if ($airport != "") |
| 1231 | 1231 | { |
| 1232 | - if (!is_string($airport)) |
|
| 1233 | - { |
|
| 1232 | + if (!is_string($airport)) |
|
| 1233 | + { |
|
| 1234 | 1234 | return false; |
| 1235 | - } else { |
|
| 1235 | + } else { |
|
| 1236 | 1236 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1237 | 1237 | $query_values = array(':airport' => $airport); |
| 1238 | - } |
|
| 1238 | + } |
|
| 1239 | 1239 | } |
| 1240 | 1240 | |
| 1241 | 1241 | if ($limit != "") |
| 1242 | 1242 | { |
| 1243 | - $limit_array = explode(",", $limit); |
|
| 1243 | + $limit_array = explode(",", $limit); |
|
| 1244 | 1244 | |
| 1245 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1246 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1245 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1246 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1247 | 1247 | |
| 1248 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1249 | - { |
|
| 1248 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1249 | + { |
|
| 1250 | 1250 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1251 | 1251 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1252 | - } |
|
| 1252 | + } |
|
| 1253 | 1253 | } |
| 1254 | 1254 | |
| 1255 | 1255 | if ($sort != "") |
| 1256 | 1256 | { |
| 1257 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1258 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1257 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1258 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1259 | 1259 | } else { |
| 1260 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1260 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1261 | 1261 | } |
| 1262 | 1262 | |
| 1263 | 1263 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1265,6 +1265,6 @@ discard block |
||
| 1265 | 1265 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1266 | 1266 | |
| 1267 | 1267 | return $spotter_array; |
| 1268 | - } |
|
| 1268 | + } |
|
| 1269 | 1269 | } |
| 1270 | 1270 | ?> |
| 1271 | 1271 | \ No newline at end of file |
@@ -14,82 +14,82 @@ discard block |
||
| 14 | 14 | * @param Array $filter the filter |
| 15 | 15 | * @return Array the SQL part |
| 16 | 16 | */ |
| 17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 19 | 19 | $filters = array(); |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | 22 | $filters = $globalStatsFilters[$globalFilterName]; |
| 23 | 23 | } else { |
| 24 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 24 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | if (isset($filter[0]['source'])) { |
| 28 | - $filters = array_merge($filters,$filter); |
|
| 28 | + $filters = array_merge($filters, $filter); |
|
| 29 | 29 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 30 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 31 | 31 | $filter_query_join = ''; |
| 32 | 32 | $filter_query_where = ''; |
| 33 | - foreach($filters as $flt) { |
|
| 33 | + foreach ($filters as $flt) { |
|
| 34 | 34 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 35 | 35 | if ($flt['airlines'][0] != '') { |
| 36 | 36 | if (isset($flt['source'])) { |
| 37 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | 38 | } else { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 44 | 44 | if (isset($flt['source'])) { |
| 45 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | 46 | } else { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 51 | 51 | if (isset($flt['source'])) { |
| 52 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | 53 | } else { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 58 | 58 | if (isset($flt['source'])) { |
| 59 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | 60 | } else { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 65 | 65 | if (isset($flt['source'])) { |
| 66 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 71 | 71 | if ($filter['airlines'][0] != '') { |
| 72 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | 82 | if (count($filter['source']) == 1) { |
| 83 | 83 | $filter_query_where .= " AND format_source = '".$filter['source'][0]."'"; |
| 84 | 84 | } else { |
| 85 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 85 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 89 | 89 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 90 | 90 | } |
| 91 | 91 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 92 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 92 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 93 | 93 | } |
| 94 | 94 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 95 | 95 | $filter_query_date = ''; |
@@ -114,41 +114,41 @@ discard block |
||
| 114 | 114 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 117 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 118 | 118 | } |
| 119 | 119 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 120 | 120 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 121 | 121 | if ($filter_query_where != '') { |
| 122 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 122 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 123 | 123 | } |
| 124 | 124 | $filter_query = $filter_query_join.$filter_query_where; |
| 125 | 125 | return $filter_query; |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | // Spotter_archive |
| 129 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 129 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 130 | 130 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 131 | 131 | if ($over_country == '') { |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 133 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 134 | 134 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 135 | 135 | else $country = ''; |
| 136 | 136 | } else $country = $over_country; |
| 137 | - if ($airline_type === NULL) $airline_type =''; |
|
| 137 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 138 | 138 | |
| 139 | 139 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 140 | 140 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 141 | 141 | |
| 142 | 142 | // Route is not added in spotter_archive |
| 143 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 143 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 144 | 144 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 145 | 145 | |
| 146 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 146 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 147 | 147 | try { |
| 148 | 148 | $sth = $this->db->prepare($query); |
| 149 | 149 | $sth->execute($query_values); |
| 150 | 150 | $sth->closeCursor(); |
| 151 | - } catch(PDOException $e) { |
|
| 151 | + } catch (PDOException $e) { |
|
| 152 | 152 | return "error : ".$e->getMessage(); |
| 153 | 153 | } |
| 154 | 154 | return "success"; |
@@ -168,9 +168,9 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 170 | 170 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 171 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 171 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 172 | 172 | |
| 173 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 173 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 174 | 174 | |
| 175 | 175 | return $spotter_array; |
| 176 | 176 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 190 | 190 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 191 | 191 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 192 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 192 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 193 | 193 | |
| 194 | 194 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 195 | 195 | /* |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 204 | 204 | */ |
| 205 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 205 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 206 | 206 | |
| 207 | 207 | return $spotter_array; |
| 208 | 208 | } |
@@ -217,14 +217,14 @@ discard block |
||
| 217 | 217 | { |
| 218 | 218 | date_default_timezone_set('UTC'); |
| 219 | 219 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 220 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 220 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 221 | 221 | |
| 222 | 222 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 223 | 223 | |
| 224 | 224 | try { |
| 225 | 225 | $sth = $this->db->prepare($query); |
| 226 | 226 | $sth->execute(array(':id' => $id)); |
| 227 | - } catch(PDOException $e) { |
|
| 227 | + } catch (PDOException $e) { |
|
| 228 | 228 | echo $e->getMessage(); |
| 229 | 229 | die; |
| 230 | 230 | } |
@@ -243,14 +243,14 @@ discard block |
||
| 243 | 243 | { |
| 244 | 244 | date_default_timezone_set('UTC'); |
| 245 | 245 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 246 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 246 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 247 | 247 | |
| 248 | 248 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 249 | 249 | |
| 250 | 250 | try { |
| 251 | 251 | $sth = $this->db->prepare($query); |
| 252 | 252 | $sth->execute(array(':id' => $id)); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | echo $e->getMessage(); |
| 255 | 255 | die; |
| 256 | 256 | } |
@@ -272,12 +272,12 @@ discard block |
||
| 272 | 272 | date_default_timezone_set('UTC'); |
| 273 | 273 | |
| 274 | 274 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 275 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 275 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 276 | 276 | |
| 277 | 277 | try { |
| 278 | 278 | $sth = $this->db->prepare($query); |
| 279 | 279 | $sth->execute(array(':ident' => $ident)); |
| 280 | - } catch(PDOException $e) { |
|
| 280 | + } catch (PDOException $e) { |
|
| 281 | 281 | echo $e->getMessage(); |
| 282 | 282 | die; |
| 283 | 283 | } |
@@ -298,12 +298,12 @@ discard block |
||
| 298 | 298 | date_default_timezone_set('UTC'); |
| 299 | 299 | |
| 300 | 300 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 301 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 301 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 302 | 302 | |
| 303 | 303 | try { |
| 304 | 304 | $sth = $this->db->prepare($query); |
| 305 | 305 | $sth->execute(array(':id' => $id)); |
| 306 | - } catch(PDOException $e) { |
|
| 306 | + } catch (PDOException $e) { |
|
| 307 | 307 | echo $e->getMessage(); |
| 308 | 308 | die; |
| 309 | 309 | } |
@@ -322,11 +322,11 @@ discard block |
||
| 322 | 322 | { |
| 323 | 323 | date_default_timezone_set('UTC'); |
| 324 | 324 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 325 | - $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | + $query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | 328 | $sth->execute(array(':id' => $id)); |
| 329 | - } catch(PDOException $e) { |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo $e->getMessage(); |
| 331 | 331 | die; |
| 332 | 332 | } |
@@ -344,12 +344,12 @@ discard block |
||
| 344 | 344 | { |
| 345 | 345 | date_default_timezone_set('UTC'); |
| 346 | 346 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 347 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 347 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 348 | 348 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 349 | 349 | try { |
| 350 | 350 | $sth = $this->db->prepare($query); |
| 351 | 351 | $sth->execute(array(':ident' => $ident)); |
| 352 | - } catch(PDOException $e) { |
|
| 352 | + } catch (PDOException $e) { |
|
| 353 | 353 | echo $e->getMessage(); |
| 354 | 354 | die; |
| 355 | 355 | } |
@@ -365,12 +365,12 @@ discard block |
||
| 365 | 365 | * @return Array the spotter information |
| 366 | 366 | * |
| 367 | 367 | */ |
| 368 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 368 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 369 | 369 | { |
| 370 | 370 | $Spotter = new Spotter($this->db); |
| 371 | 371 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 372 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 373 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 372 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 373 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 374 | 374 | return $spotter_array; |
| 375 | 375 | } |
| 376 | 376 | |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | try { |
| 386 | 386 | $sth = $this->db->prepare($query); |
| 387 | 387 | $sth->execute(); |
| 388 | - } catch(PDOException $e) { |
|
| 388 | + } catch (PDOException $e) { |
|
| 389 | 389 | echo $e->getMessage(); |
| 390 | 390 | die; |
| 391 | 391 | } |
@@ -397,24 +397,24 @@ discard block |
||
| 397 | 397 | * @return Array the spotter information |
| 398 | 398 | * |
| 399 | 399 | */ |
| 400 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 400 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 401 | 401 | { |
| 402 | 402 | global $globalDBdriver, $globalLiveInterval; |
| 403 | 403 | date_default_timezone_set('UTC'); |
| 404 | 404 | |
| 405 | 405 | $filter_query = ''; |
| 406 | 406 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 407 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 407 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 408 | 408 | } |
| 409 | 409 | // Use spotter_output also ? |
| 410 | 410 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 411 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 411 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 412 | 412 | } |
| 413 | 413 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 414 | 414 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 415 | 415 | } |
| 416 | 416 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 417 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 417 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -433,14 +433,14 @@ discard block |
||
| 433 | 433 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 434 | 434 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 435 | 435 | */ |
| 436 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 436 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 437 | 437 | FROM spotter_archive |
| 438 | 438 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 439 | 439 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 440 | 440 | '.$filter_query.' ORDER BY flightaware_id'; |
| 441 | 441 | } else { |
| 442 | 442 | //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
| 443 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 443 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 444 | 444 | FROM spotter_archive |
| 445 | 445 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 446 | 446 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | try { |
| 451 | 451 | $sth = $this->db->prepare($query); |
| 452 | 452 | $sth->execute(); |
| 453 | - } catch(PDOException $e) { |
|
| 453 | + } catch (PDOException $e) { |
|
| 454 | 454 | echo $e->getMessage(); |
| 455 | 455 | die; |
| 456 | 456 | } |
@@ -465,24 +465,24 @@ discard block |
||
| 465 | 465 | * @return Array the spotter information |
| 466 | 466 | * |
| 467 | 467 | */ |
| 468 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 468 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 469 | 469 | { |
| 470 | 470 | global $globalDBdriver, $globalLiveInterval; |
| 471 | 471 | date_default_timezone_set('UTC'); |
| 472 | 472 | |
| 473 | 473 | $filter_query = ''; |
| 474 | 474 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 475 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 475 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 476 | 476 | } |
| 477 | 477 | // Should use spotter_output also ? |
| 478 | 478 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 479 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 479 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 480 | 480 | } |
| 481 | 481 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 482 | 482 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 483 | 483 | } |
| 484 | 484 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 485 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 485 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 486 | 486 | } |
| 487 | 487 | |
| 488 | 488 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -492,7 +492,7 @@ discard block |
||
| 492 | 492 | FROM spotter_archive |
| 493 | 493 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 494 | 494 | */ |
| 495 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 495 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 496 | 496 | FROM spotter_archive_output |
| 497 | 497 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 498 | 498 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 508 | 508 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 509 | 509 | */ |
| 510 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 510 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 511 | 511 | FROM spotter_archive_output |
| 512 | 512 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 513 | 513 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | try { |
| 520 | 520 | $sth = $this->db->prepare($query); |
| 521 | 521 | $sth->execute(); |
| 522 | - } catch(PDOException $e) { |
|
| 522 | + } catch (PDOException $e) { |
|
| 523 | 523 | echo $e->getMessage(); |
| 524 | 524 | die; |
| 525 | 525 | } |
@@ -534,23 +534,23 @@ discard block |
||
| 534 | 534 | * @return Array the spotter information |
| 535 | 535 | * |
| 536 | 536 | */ |
| 537 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 537 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 538 | 538 | { |
| 539 | 539 | global $globalDBdriver, $globalLiveInterval; |
| 540 | 540 | date_default_timezone_set('UTC'); |
| 541 | 541 | |
| 542 | 542 | $filter_query = ''; |
| 543 | 543 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 544 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 544 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 545 | 545 | } |
| 546 | 546 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 547 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 547 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 548 | 548 | } |
| 549 | 549 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 550 | 550 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 551 | 551 | } |
| 552 | 552 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 553 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 553 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 554 | 554 | } |
| 555 | 555 | |
| 556 | 556 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | try { |
| 566 | 566 | $sth = $this->db->prepare($query); |
| 567 | 567 | $sth->execute(); |
| 568 | - } catch(PDOException $e) { |
|
| 568 | + } catch (PDOException $e) { |
|
| 569 | 569 | echo $e->getMessage(); |
| 570 | 570 | die; |
| 571 | 571 | } |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | * @return Array the spotter information |
| 586 | 586 | * |
| 587 | 587 | */ |
| 588 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 588 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 589 | 589 | { |
| 590 | 590 | global $globalTimezone, $globalDBdriver; |
| 591 | 591 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | |
| 608 | 608 | $q_array = explode(" ", $q); |
| 609 | 609 | |
| 610 | - foreach ($q_array as $q_item){ |
|
| 610 | + foreach ($q_array as $q_item) { |
|
| 611 | 611 | $additional_query .= " AND ("; |
| 612 | 612 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 613 | 613 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | |
| 640 | 640 | if ($registration != "") |
| 641 | 641 | { |
| 642 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 642 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 643 | 643 | if (!is_string($registration)) |
| 644 | 644 | { |
| 645 | 645 | return false; |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | |
| 651 | 651 | if ($aircraft_icao != "") |
| 652 | 652 | { |
| 653 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 653 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 654 | 654 | if (!is_string($aircraft_icao)) |
| 655 | 655 | { |
| 656 | 656 | return false; |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | |
| 662 | 662 | if ($aircraft_manufacturer != "") |
| 663 | 663 | { |
| 664 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 664 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 665 | 665 | if (!is_string($aircraft_manufacturer)) |
| 666 | 666 | { |
| 667 | 667 | return false; |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | if ($airline_icao != "") |
| 684 | 684 | { |
| 685 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 685 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 686 | 686 | if (!is_string($airline_icao)) |
| 687 | 687 | { |
| 688 | 688 | return false; |
@@ -693,7 +693,7 @@ discard block |
||
| 693 | 693 | |
| 694 | 694 | if ($airline_country != "") |
| 695 | 695 | { |
| 696 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 696 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 697 | 697 | if (!is_string($airline_country)) |
| 698 | 698 | { |
| 699 | 699 | return false; |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | |
| 705 | 705 | if ($airline_type != "") |
| 706 | 706 | { |
| 707 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 707 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 708 | 708 | if (!is_string($airline_type)) |
| 709 | 709 | { |
| 710 | 710 | return false; |
@@ -726,7 +726,7 @@ discard block |
||
| 726 | 726 | |
| 727 | 727 | if ($airport != "") |
| 728 | 728 | { |
| 729 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 729 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 730 | 730 | if (!is_string($airport)) |
| 731 | 731 | { |
| 732 | 732 | return false; |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | |
| 738 | 738 | if ($airport_country != "") |
| 739 | 739 | { |
| 740 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 740 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 741 | 741 | if (!is_string($airport_country)) |
| 742 | 742 | { |
| 743 | 743 | return false; |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | if ($callsign != "") |
| 750 | 750 | { |
| 751 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 751 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 752 | 752 | if (!is_string($callsign)) |
| 753 | 753 | { |
| 754 | 754 | return false; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | $translate = $Translation->ident2icao($callsign); |
| 757 | 757 | if ($translate != $callsign) { |
| 758 | 758 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 759 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 759 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 760 | 760 | } else { |
| 761 | 761 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 762 | 762 | } |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | |
| 766 | 766 | if ($owner != "") |
| 767 | 767 | { |
| 768 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 768 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 769 | 769 | if (!is_string($owner)) |
| 770 | 770 | { |
| 771 | 771 | return false; |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | |
| 777 | 777 | if ($pilot_name != "") |
| 778 | 778 | { |
| 779 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 779 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 780 | 780 | if (!is_string($pilot_name)) |
| 781 | 781 | { |
| 782 | 782 | return false; |
@@ -787,7 +787,7 @@ discard block |
||
| 787 | 787 | |
| 788 | 788 | if ($pilot_id != "") |
| 789 | 789 | { |
| 790 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 790 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 791 | 791 | if (!is_string($pilot_id)) |
| 792 | 792 | { |
| 793 | 793 | return false; |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | |
| 799 | 799 | if ($departure_airport_route != "") |
| 800 | 800 | { |
| 801 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 801 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 802 | 802 | if (!is_string($departure_airport_route)) |
| 803 | 803 | { |
| 804 | 804 | return false; |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | |
| 810 | 810 | if ($arrival_airport_route != "") |
| 811 | 811 | { |
| 812 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 812 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 813 | 813 | if (!is_string($arrival_airport_route)) |
| 814 | 814 | { |
| 815 | 815 | return false; |
@@ -822,8 +822,8 @@ discard block |
||
| 822 | 822 | { |
| 823 | 823 | $altitude_array = explode(",", $altitude); |
| 824 | 824 | |
| 825 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 825 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 826 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 827 | 827 | |
| 828 | 828 | |
| 829 | 829 | if ($altitude_array[1] != "") |
@@ -840,8 +840,8 @@ discard block |
||
| 840 | 840 | if ($date_posted != "") |
| 841 | 841 | { |
| 842 | 842 | $date_array = explode(",", $date_posted); |
| 843 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 844 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 843 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 844 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 845 | 845 | if ($globalTimezone != '') { |
| 846 | 846 | date_default_timezone_set($globalTimezone); |
| 847 | 847 | $datetime = new DateTime(); |
@@ -868,8 +868,8 @@ discard block |
||
| 868 | 868 | if ($limit != "") |
| 869 | 869 | { |
| 870 | 870 | $limit_array = explode(",", $limit); |
| 871 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 872 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 871 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 872 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 873 | 873 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 874 | 874 | { |
| 875 | 875 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -877,8 +877,8 @@ discard block |
||
| 877 | 877 | } |
| 878 | 878 | } |
| 879 | 879 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 880 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 881 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 880 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 881 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 882 | 882 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 883 | 883 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 884 | 884 | } else { |
@@ -894,12 +894,12 @@ discard block |
||
| 894 | 894 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 895 | 895 | } |
| 896 | 896 | |
| 897 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 897 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 898 | 898 | WHERE spotter_archive_output.ident <> '' |
| 899 | 899 | ".$additional_query." |
| 900 | 900 | ".$filter_query.$orderby_query; |
| 901 | 901 | } |
| 902 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 902 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 903 | 903 | return $spotter_array; |
| 904 | 904 | } |
| 905 | 905 | |
@@ -914,7 +914,7 @@ discard block |
||
| 914 | 914 | try { |
| 915 | 915 | $sth = $this->db->prepare($query); |
| 916 | 916 | $sth->execute(); |
| 917 | - } catch(PDOException $e) { |
|
| 917 | + } catch (PDOException $e) { |
|
| 918 | 918 | return "error"; |
| 919 | 919 | } |
| 920 | 920 | } |
@@ -951,8 +951,8 @@ discard block |
||
| 951 | 951 | { |
| 952 | 952 | $limit_array = explode(",", $limit); |
| 953 | 953 | |
| 954 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 955 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 954 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 955 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 956 | 956 | |
| 957 | 957 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 958 | 958 | { |
@@ -993,7 +993,7 @@ discard block |
||
| 993 | 993 | $query_values = array(); |
| 994 | 994 | $limit_query = ''; |
| 995 | 995 | $additional_query = ''; |
| 996 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 996 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 997 | 997 | |
| 998 | 998 | if ($owner != "") |
| 999 | 999 | { |
@@ -1010,8 +1010,8 @@ discard block |
||
| 1010 | 1010 | { |
| 1011 | 1011 | $limit_array = explode(",", $limit); |
| 1012 | 1012 | |
| 1013 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1013 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1015 | 1015 | |
| 1016 | 1016 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1017 | 1017 | { |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | $query_values = array(); |
| 1052 | 1052 | $limit_query = ''; |
| 1053 | 1053 | $additional_query = ''; |
| 1054 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1054 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1055 | 1055 | |
| 1056 | 1056 | if ($pilot != "") |
| 1057 | 1057 | { |
@@ -1063,8 +1063,8 @@ discard block |
||
| 1063 | 1063 | { |
| 1064 | 1064 | $limit_array = explode(",", $limit); |
| 1065 | 1065 | |
| 1066 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1066 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1067 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1068 | 1068 | |
| 1069 | 1069 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1070 | 1070 | { |
@@ -1094,7 +1094,7 @@ discard block |
||
| 1094 | 1094 | * @return Array the airline country list |
| 1095 | 1095 | * |
| 1096 | 1096 | */ |
| 1097 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1097 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1098 | 1098 | { |
| 1099 | 1099 | global $globalDBdriver; |
| 1100 | 1100 | /* |
@@ -1123,7 +1123,7 @@ discard block |
||
| 1123 | 1123 | $flight_array = array(); |
| 1124 | 1124 | $temp_array = array(); |
| 1125 | 1125 | |
| 1126 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1126 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1127 | 1127 | { |
| 1128 | 1128 | $temp_array['flight_count'] = $row['nb']; |
| 1129 | 1129 | $temp_array['flight_country'] = $row['name']; |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | * @return Array the airline country list |
| 1141 | 1141 | * |
| 1142 | 1142 | */ |
| 1143 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1143 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1144 | 1144 | { |
| 1145 | 1145 | global $globalDBdriver; |
| 1146 | 1146 | /* |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $flight_array = array(); |
| 1170 | 1170 | $temp_array = array(); |
| 1171 | 1171 | |
| 1172 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1172 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1173 | 1173 | { |
| 1174 | 1174 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1175 | 1175 | $temp_array['flight_count'] = $row['nb']; |
@@ -1187,14 +1187,14 @@ discard block |
||
| 1187 | 1187 | * @return Array the spotter information |
| 1188 | 1188 | * |
| 1189 | 1189 | */ |
| 1190 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1190 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1191 | 1191 | { |
| 1192 | 1192 | $Spotter = new Spotter($this->db); |
| 1193 | 1193 | date_default_timezone_set('UTC'); |
| 1194 | 1194 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1195 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1196 | - $date = date('c',$date); |
|
| 1197 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1195 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1196 | + $date = date('c', $date); |
|
| 1197 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1198 | 1198 | return $spotter_array; |
| 1199 | 1199 | } |
| 1200 | 1200 | |
@@ -1204,14 +1204,14 @@ discard block |
||
| 1204 | 1204 | * @return Array the spotter information |
| 1205 | 1205 | * |
| 1206 | 1206 | */ |
| 1207 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1207 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1208 | 1208 | { |
| 1209 | 1209 | $Spotter = new Spotter($this->db); |
| 1210 | 1210 | date_default_timezone_set('UTC'); |
| 1211 | 1211 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1212 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | - $date = date('c',$date); |
|
| 1214 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1212 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | + $date = date('c', $date); |
|
| 1214 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1215 | 1215 | return $spotter_array; |
| 1216 | 1216 | } |
| 1217 | 1217 | |
@@ -1221,7 +1221,7 @@ discard block |
||
| 1221 | 1221 | * @return Array the spotter information |
| 1222 | 1222 | * |
| 1223 | 1223 | */ |
| 1224 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1224 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1225 | 1225 | { |
| 1226 | 1226 | global $global_query; |
| 1227 | 1227 | $Spotter = new Spotter($this->db); |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | $query_values = array(); |
| 1230 | 1230 | $limit_query = ''; |
| 1231 | 1231 | $additional_query = ''; |
| 1232 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1232 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1233 | 1233 | |
| 1234 | 1234 | if ($airport != "") |
| 1235 | 1235 | { |
@@ -1246,8 +1246,8 @@ discard block |
||
| 1246 | 1246 | { |
| 1247 | 1247 | $limit_array = explode(",", $limit); |
| 1248 | 1248 | |
| 1249 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1250 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1249 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1250 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1251 | 1251 | |
| 1252 | 1252 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1253 | 1253 | { |
@@ -6,7 +6,9 @@ discard block |
||
| 6 | 6 | public function __construct($dbc = null) { |
| 7 | 7 | $Connection = new Connection($dbc); |
| 8 | 8 | $this->db = $Connection->db; |
| 9 | - if ($this->db === null) die('Error: No DB connection. (SpotterArchive)'); |
|
| 9 | + if ($this->db === null) { |
|
| 10 | + die('Error: No DB connection. (SpotterArchive)'); |
|
| 11 | + } |
|
| 10 | 12 | } |
| 11 | 13 | |
| 12 | 14 | /** |
@@ -27,7 +29,9 @@ discard block |
||
| 27 | 29 | if (isset($filter[0]['source'])) { |
| 28 | 30 | $filters = array_merge($filters,$filter); |
| 29 | 31 | } |
| 30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 31 | 35 | $filter_query_join = ''; |
| 32 | 36 | $filter_query_where = ''; |
| 33 | 37 | foreach($filters as $flt) { |
@@ -116,8 +120,11 @@ discard block |
||
| 116 | 120 | } |
| 117 | 121 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
| 118 | 122 | } |
| 119 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 120 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 123 | + if ($filter_query_where == '' && $where) { |
|
| 124 | + $filter_query_where = ' WHERE'; |
|
| 125 | + } elseif ($filter_query_where != '' && $and) { |
|
| 126 | + $filter_query_where .= ' AND'; |
|
| 127 | + } |
|
| 121 | 128 | if ($filter_query_where != '') { |
| 122 | 129 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 123 | 130 | } |
@@ -131,10 +138,17 @@ discard block |
||
| 131 | 138 | if ($over_country == '') { |
| 132 | 139 | $Spotter = new Spotter($this->db); |
| 133 | 140 | $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
| 134 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
| 135 | - else $country = ''; |
|
| 136 | - } else $country = $over_country; |
|
| 137 | - if ($airline_type === NULL) $airline_type =''; |
|
| 141 | + if (!empty($data_country)) { |
|
| 142 | + $country = $data_country['iso2']; |
|
| 143 | + } else { |
|
| 144 | + $country = ''; |
|
| 145 | + } |
|
| 146 | + } else { |
|
| 147 | + $country = $over_country; |
|
| 148 | + } |
|
| 149 | + if ($airline_type === NULL) { |
|
| 150 | + $airline_type =''; |
|
| 151 | + } |
|
| 138 | 152 | |
| 139 | 153 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 140 | 154 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
@@ -630,7 +644,9 @@ discard block |
||
| 630 | 644 | $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
| 631 | 645 | $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
| 632 | 646 | $translate = $Translation->ident2icao($q_item); |
| 633 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 647 | + if ($translate != $q_item) { |
|
| 648 | + $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 649 | + } |
|
| 634 | 650 | $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
| 635 | 651 | $additional_query .= ")"; |
| 636 | 652 | } |
@@ -846,7 +862,9 @@ discard block |
||
| 846 | 862 | date_default_timezone_set($globalTimezone); |
| 847 | 863 | $datetime = new DateTime(); |
| 848 | 864 | $offset = $datetime->format('P'); |
| 849 | - } else $offset = '+00:00'; |
|
| 865 | + } else { |
|
| 866 | + $offset = '+00:00'; |
|
| 867 | + } |
|
| 850 | 868 | if ($date_array[1] != "") |
| 851 | 869 | { |
| 852 | 870 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
@@ -1112,9 +1130,13 @@ discard block |
||
| 1112 | 1130 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1113 | 1131 | } |
| 1114 | 1132 | } |
| 1115 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1133 | + if ($sincedate != '') { |
|
| 1134 | + $query .= "AND date > '".$sincedate."' "; |
|
| 1135 | + } |
|
| 1116 | 1136 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1117 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1137 | + if ($limit) { |
|
| 1138 | + $query .= " LIMIT 0,10"; |
|
| 1139 | + } |
|
| 1118 | 1140 | |
| 1119 | 1141 | |
| 1120 | 1142 | $sth = $this->db->prepare($query); |
@@ -1158,9 +1180,13 @@ discard block |
||
| 1158 | 1180 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1159 | 1181 | } |
| 1160 | 1182 | } |
| 1161 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1183 | + if ($sincedate != '') { |
|
| 1184 | + $query .= "AND s.date > '".$sincedate."' "; |
|
| 1185 | + } |
|
| 1162 | 1186 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1163 | - if ($limit) $query .= " LIMIT 0,10"; |
|
| 1187 | + if ($limit) { |
|
| 1188 | + $query .= " LIMIT 0,10"; |
|
| 1189 | + } |
|
| 1164 | 1190 | |
| 1165 | 1191 | |
| 1166 | 1192 | $sth = $this->db->prepare($query); |
