Ysurac /
FlightAirMap
@@ -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) { |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | </li> |
| 484 | 484 | <?php |
| 485 | 485 | } |
| 486 | - } |
|
| 486 | + } |
|
| 487 | 487 | ?> |
| 488 | 488 | <li><?php echo _("Distance unit:"); ?> |
| 489 | 489 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -516,19 +516,19 @@ discard block |
||
| 516 | 516 | <ul> |
| 517 | 517 | <?php |
| 518 | 518 | if (!isset($globalAircraft) || $globalAircraft) { |
| 519 | - ?> |
|
| 519 | + ?> |
|
| 520 | 520 | <?php |
| 521 | 521 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 522 | - ?> |
|
| 522 | + ?> |
|
| 523 | 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 | 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 | 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 } ?> |
| 526 | 526 | <?php |
| 527 | 527 | } |
| 528 | - ?> |
|
| 528 | + ?> |
|
| 529 | 529 | <?php |
| 530 | 530 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 531 | - ?> |
|
| 531 | + ?> |
|
| 532 | 532 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 533 | 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> |
| 534 | 534 | <?php } ?> |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | <?php } ?> |
| 538 | 538 | <?php |
| 539 | 539 | } |
| 540 | - ?> |
|
| 540 | + ?> |
|
| 541 | 541 | <li><?php echo _("Display airlines:"); ?> |
| 542 | 542 | <br/> |
| 543 | 543 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -557,14 +557,14 @@ discard block |
||
| 557 | 557 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | - ?> |
|
| 560 | + ?> |
|
| 561 | 561 | </select> |
| 562 | 562 | </li> |
| 563 | 563 | <?php |
| 564 | 564 | $Spotter = new Spotter(); |
| 565 | 565 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 566 | 566 | if (!empty($allalliancenames)) { |
| 567 | - ?> |
|
| 567 | + ?> |
|
| 568 | 568 | <li><?php echo _("Display alliance:"); ?> |
| 569 | 569 | <br/> |
| 570 | 570 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -578,18 +578,18 @@ discard block |
||
| 578 | 578 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 579 | 579 | } |
| 580 | 580 | } |
| 581 | - ?> |
|
| 581 | + ?> |
|
| 582 | 582 | </select> |
| 583 | 583 | </li> |
| 584 | 584 | <?php |
| 585 | 585 | } |
| 586 | - ?> |
|
| 586 | + ?> |
|
| 587 | 587 | <?php |
| 588 | 588 | } |
| 589 | - ?> |
|
| 589 | + ?> |
|
| 590 | 590 | <?php |
| 591 | 591 | if (isset($globalAPRS) && $globalAPRS) { |
| 592 | - ?> |
|
| 592 | + ?> |
|
| 593 | 593 | <li><?php echo _("Display APRS sources name:"); ?> |
| 594 | 594 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 595 | 595 | <?php |
@@ -613,18 +613,18 @@ discard block |
||
| 613 | 613 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
| 614 | 614 | } |
| 615 | 615 | } |
| 616 | - ?> |
|
| 616 | + ?> |
|
| 617 | 617 | </select> |
| 618 | 618 | </li> |
| 619 | 619 | <?php |
| 620 | 620 | } |
| 621 | - ?> |
|
| 621 | + ?> |
|
| 622 | 622 | <?php |
| 623 | 623 | if (!isset($globalAircraft) || $globalAircraft) { |
| 624 | - ?> |
|
| 624 | + ?> |
|
| 625 | 625 | <?php |
| 626 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
| 627 | - ?> |
|
| 626 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
| 627 | + ?> |
|
| 628 | 628 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 629 | 629 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 630 | 630 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -634,21 +634,21 @@ discard block |
||
| 634 | 634 | </select> |
| 635 | 635 | </li> |
| 636 | 636 | <?php |
| 637 | - } |
|
| 638 | - ?> |
|
| 637 | + } |
|
| 638 | + ?> |
|
| 639 | 639 | <?php |
| 640 | 640 | } |
| 641 | - ?> |
|
| 641 | + ?> |
|
| 642 | 642 | <?php |
| 643 | 643 | if (isset($globalMarine) && $globalMarine) { |
| 644 | - ?> |
|
| 644 | + ?> |
|
| 645 | 645 | <li> |
| 646 | 646 | <?php echo _("Display vessels with MMSI:"); ?> |
| 647 | 647 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
| 648 | 648 | </li> |
| 649 | 649 | <?php |
| 650 | 650 | } |
| 651 | - ?> |
|
| 651 | + ?> |
|
| 652 | 652 | <li> |
| 653 | 653 | <?php echo _("Display with ident:"); ?> |
| 654 | 654 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | </form> |
| 662 | 662 | </div> |
| 663 | 663 | <?php |
| 664 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 664 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 665 | 665 | ?> |
| 666 | 666 | <div class="sidebar-pane" id="satellites"> |
| 667 | 667 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -701,14 +701,14 @@ discard block |
||
| 701 | 701 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | - ?> |
|
| 704 | + ?> |
|
| 705 | 705 | </select> |
| 706 | 706 | </li> |
| 707 | 707 | </ul> |
| 708 | 708 | </form> |
| 709 | 709 | </div> |
| 710 | 710 | <?php |
| 711 | - } |
|
| 711 | + } |
|
| 712 | 712 | ?> |
| 713 | 713 | </div> |
| 714 | 714 | </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 |
@@ -644,14 +951,20 @@ discard block |
||
| 644 | 951 | ?> |
| 645 | 952 | <li> |
| 646 | 953 | <?php echo _("Display vessels with MMSI:"); ?> |
| 647 | - <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
|
| 954 | + <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) { |
|
| 955 | + print $_COOKIE['filter_mmsi']; |
|
| 956 | +} |
|
| 957 | +?>" /> |
|
| 648 | 958 | </li> |
| 649 | 959 | <?php |
| 650 | 960 | } |
| 651 | 961 | ?> |
| 652 | 962 | <li> |
| 653 | 963 | <?php echo _("Display with ident:"); ?> |
| 654 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
| 964 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
| 965 | + print $_COOKIE['filter_ident']; |
|
| 966 | +} |
|
| 967 | +?>" /> |
|
| 655 | 968 | </li> |
| 656 | 969 | </ul> |
| 657 | 970 | </form> |
@@ -667,7 +980,10 @@ discard block |
||
| 667 | 980 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
| 668 | 981 | <form> |
| 669 | 982 | <ul> |
| 670 | - <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> |
|
| 983 | + <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'])) { |
|
| 984 | + print 'checked'; |
|
| 985 | +} |
|
| 986 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 671 | 987 | <li><?php echo _("Type:"); ?> |
| 672 | 988 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
| 673 | 989 | <?php |
@@ -675,25 +991,45 @@ discard block |
||
| 675 | 991 | $types = $Satellite->get_tle_types(); |
| 676 | 992 | foreach ($types as $type) { |
| 677 | 993 | $type_name = $type['tle_type']; |
| 678 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
| 679 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
| 680 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
| 681 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
| 682 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
| 683 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
| 684 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 685 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
| 686 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
| 687 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
| 688 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
| 689 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
| 690 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
| 691 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
| 692 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
| 693 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
| 694 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
| 695 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
| 696 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
| 994 | + if ($type_name == 'musson') { |
|
| 995 | + $type_name = 'Russian LEO Navigation'; |
|
| 996 | + } else if ($type_name == 'nnss') { |
|
| 997 | + $type_name = 'Navi Navigation Satellite System'; |
|
| 998 | + } else if ($type_name == 'sbas') { |
|
| 999 | + $type_name = 'Satellite-Based Augmentation System'; |
|
| 1000 | + } else if ($type_name == 'glo-ops') { |
|
| 1001 | + $type_name = 'Glonass Operational'; |
|
| 1002 | + } else if ($type_name == 'gps-ops') { |
|
| 1003 | + $type_name = 'GPS Operational'; |
|
| 1004 | + } else if ($type_name == 'argos') { |
|
| 1005 | + $type_name = 'ARGOS Data Collection System'; |
|
| 1006 | + } else if ($type_name == 'tdrss') { |
|
| 1007 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 1008 | + } else if ($type_name == 'sarsat') { |
|
| 1009 | + $type_name = 'Search & Rescue'; |
|
| 1010 | + } else if ($type_name == 'dmc') { |
|
| 1011 | + $type_name = 'Disaster Monitoring'; |
|
| 1012 | + } else if ($type_name == 'resource') { |
|
| 1013 | + $type_name = 'Earth Resources'; |
|
| 1014 | + } else if ($type_name == 'stations') { |
|
| 1015 | + $type_name = 'Space Stations'; |
|
| 1016 | + } else if ($type_name == 'geo') { |
|
| 1017 | + $type_name = 'Geostationary'; |
|
| 1018 | + } else if ($type_name == 'amateur') { |
|
| 1019 | + $type_name = 'Amateur Radio'; |
|
| 1020 | + } else if ($type_name == 'x-comm') { |
|
| 1021 | + $type_name = 'Experimental'; |
|
| 1022 | + } else if ($type_name == 'other-comm') { |
|
| 1023 | + $type_name = 'Other Comm'; |
|
| 1024 | + } else if ($type_name == 'science') { |
|
| 1025 | + $type_name = 'Space & Earth Science'; |
|
| 1026 | + } else if ($type_name == 'military') { |
|
| 1027 | + $type_name = 'Miscellaneous Military'; |
|
| 1028 | + } else if ($type_name == 'radar') { |
|
| 1029 | + $type_name = 'Radar Calibration'; |
|
| 1030 | + } else if ($type_name == 'tle-new') { |
|
| 1031 | + $type_name = 'Last 30 days launches'; |
|
| 1032 | + } |
|
| 697 | 1033 | |
| 698 | 1034 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
| 699 | 1035 | 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); |
@@ -405,17 +405,17 @@ discard block |
||
| 405 | 405 | } |
| 406 | 406 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 407 | 407 | } else $all = array(); |
| 408 | - if (empty($all)) { |
|
| 409 | - $Spotter = new Spotter($this->db); |
|
| 410 | - $filters = array(); |
|
| 408 | + if (empty($all)) { |
|
| 409 | + $Spotter = new Spotter($this->db); |
|
| 410 | + $filters = array(); |
|
| 411 | 411 | $filters = array('year' => $year,'month' => $month); |
| 412 | - if ($filter_name != '') { |
|
| 413 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 412 | + if ($filter_name != '') { |
|
| 413 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 414 | 414 | } |
| 415 | 415 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 416 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 417 | - } |
|
| 418 | - return $all; |
|
| 416 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 417 | + } |
|
| 418 | + return $all; |
|
| 419 | 419 | } |
| 420 | 420 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 421 | 421 | global $globalStatsFilters; |
@@ -1612,7 +1612,7 @@ discard block |
||
| 1612 | 1612 | return "error : ".$e->getMessage(); |
| 1613 | 1613 | } |
| 1614 | 1614 | } |
| 1615 | - /* |
|
| 1615 | + /* |
|
| 1616 | 1616 | public function getStatsSource($date,$stats_type = '') { |
| 1617 | 1617 | if ($stats_type == '') { |
| 1618 | 1618 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -2574,8 +2574,8 @@ discard block |
||
| 2574 | 2574 | } |
| 2575 | 2575 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2576 | 2576 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2577 | - foreach ($alldata as $number) { |
|
| 2578 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2577 | + foreach ($alldata as $number) { |
|
| 2578 | + $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2579 | 2579 | } |
| 2580 | 2580 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2581 | 2581 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
@@ -21,6 +21,10 @@ discard block |
||
| 21 | 21 | if ($this->db === null) die('Error: No DB connection. (Stats)'); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | + /** |
|
| 25 | + * @param string $type |
|
| 26 | + * @param string $stats_date |
|
| 27 | + */ |
|
| 24 | 28 | public function addLastStatsUpdate($type,$stats_date) { |
| 25 | 29 | $query = "DELETE FROM config WHERE name = :type; |
| 26 | 30 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
@@ -1415,6 +1419,10 @@ discard block |
||
| 1415 | 1419 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1416 | 1420 | return $all; |
| 1417 | 1421 | } |
| 1422 | + |
|
| 1423 | + /** |
|
| 1424 | + * @param string $type |
|
| 1425 | + */ |
|
| 1418 | 1426 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 1419 | 1427 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1420 | 1428 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1426,6 +1434,11 @@ discard block |
||
| 1426 | 1434 | echo "error : ".$e->getMessage(); |
| 1427 | 1435 | } |
| 1428 | 1436 | } |
| 1437 | + |
|
| 1438 | + /** |
|
| 1439 | + * @param string $type |
|
| 1440 | + * @param string $year |
|
| 1441 | + */ |
|
| 1429 | 1442 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 1430 | 1443 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1431 | 1444 | global $globalArchiveMonths, $globalDBdriver; |
@@ -1625,6 +1638,10 @@ discard block |
||
| 1625 | 1638 | else return 0; |
| 1626 | 1639 | } |
| 1627 | 1640 | |
| 1641 | + /** |
|
| 1642 | + * @param string $type |
|
| 1643 | + * @param string $stats_date |
|
| 1644 | + */ |
|
| 1628 | 1645 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1629 | 1646 | global $globalDBdriver; |
| 1630 | 1647 | if ($filter_name == '') $filter_name = $this->filter_name; |
@@ -1678,6 +1695,9 @@ discard block |
||
| 1678 | 1695 | } |
| 1679 | 1696 | */ |
| 1680 | 1697 | |
| 1698 | + /** |
|
| 1699 | + * @param string $stats_type |
|
| 1700 | + */ |
|
| 1681 | 1701 | public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
| 1682 | 1702 | global $globalDBdriver; |
| 1683 | 1703 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
@@ -1721,6 +1741,9 @@ discard block |
||
| 1721 | 1741 | return $all; |
| 1722 | 1742 | } |
| 1723 | 1743 | |
| 1744 | + /** |
|
| 1745 | + * @param string $stats_type |
|
| 1746 | + */ |
|
| 1724 | 1747 | public function addStatSource($data,$source_name,$stats_type,$date) { |
| 1725 | 1748 | global $globalDBdriver; |
| 1726 | 1749 | if ($globalDBdriver == 'mysql') { |
@@ -1736,6 +1759,10 @@ discard block |
||
| 1736 | 1759 | return "error : ".$e->getMessage(); |
| 1737 | 1760 | } |
| 1738 | 1761 | } |
| 1762 | + |
|
| 1763 | + /** |
|
| 1764 | + * @param string $type |
|
| 1765 | + */ |
|
| 1739 | 1766 | public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
| 1740 | 1767 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1741 | 1768 | $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
@@ -1746,6 +1773,10 @@ discard block |
||
| 1746 | 1773 | return "error : ".$e->getMessage(); |
| 1747 | 1774 | } |
| 1748 | 1775 | } |
| 1776 | + |
|
| 1777 | + /** |
|
| 1778 | + * @param string $type |
|
| 1779 | + */ |
|
| 1749 | 1780 | public function addStatMarine($type,$date_name,$cnt,$filter_name = '') { |
| 1750 | 1781 | $query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)"; |
| 1751 | 1782 | $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name); |
@@ -1756,6 +1787,10 @@ discard block |
||
| 1756 | 1787 | return "error : ".$e->getMessage(); |
| 1757 | 1788 | } |
| 1758 | 1789 | } |
| 1790 | + |
|
| 1791 | + /** |
|
| 1792 | + * @param string $type |
|
| 1793 | + */ |
|
| 1759 | 1794 | public function addStatTracker($type,$date_name,$cnt,$filter_name = '') { |
| 1760 | 1795 | $query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)"; |
| 1761 | 1796 | $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name); |
@@ -2068,6 +2103,10 @@ discard block |
||
| 2068 | 2103 | return "error : ".$e->getMessage(); |
| 2069 | 2104 | } |
| 2070 | 2105 | } |
| 2106 | + |
|
| 2107 | + /** |
|
| 2108 | + * @param string $type |
|
| 2109 | + */ |
|
| 2071 | 2110 | public function deleteStatFlight($type) { |
| 2072 | 2111 | $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
| 2073 | 2112 | $query_values = array(':type' => $type); |
@@ -2078,6 +2117,10 @@ discard block |
||
| 2078 | 2117 | return "error : ".$e->getMessage(); |
| 2079 | 2118 | } |
| 2080 | 2119 | } |
| 2120 | + |
|
| 2121 | + /** |
|
| 2122 | + * @param string $type |
|
| 2123 | + */ |
|
| 2081 | 2124 | public function deleteStatMarine($type) { |
| 2082 | 2125 | $query = "DELETE FROM stats_marine WHERE stats_type = :type"; |
| 2083 | 2126 | $query_values = array(':type' => $type); |
@@ -2088,6 +2131,10 @@ discard block |
||
| 2088 | 2131 | return "error : ".$e->getMessage(); |
| 2089 | 2132 | } |
| 2090 | 2133 | } |
| 2134 | + |
|
| 2135 | + /** |
|
| 2136 | + * @param string $type |
|
| 2137 | + */ |
|
| 2091 | 2138 | public function deleteStatTracker($type) { |
| 2092 | 2139 | $query = "DELETE FROM stats_tracker WHERE stats_type = :type"; |
| 2093 | 2140 | $query_values = array(':type' => $type); |
@@ -2098,6 +2145,10 @@ discard block |
||
| 2098 | 2145 | return "error : ".$e->getMessage(); |
| 2099 | 2146 | } |
| 2100 | 2147 | } |
| 2148 | + |
|
| 2149 | + /** |
|
| 2150 | + * @param string $type |
|
| 2151 | + */ |
|
| 2101 | 2152 | public function deleteStatAirport($type) { |
| 2102 | 2153 | $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
| 2103 | 2154 | $query_values = array(':type' => $type); |
@@ -21,14 +21,14 @@ discard block |
||
| 21 | 21 | if ($this->db === null) die('Error: No DB connection. (Stats)'); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 24 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 25 | 25 | $query = "DELETE FROM config WHERE name = :type; |
| 26 | 26 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 27 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 27 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 28 | 28 | try { |
| 29 | 29 | $sth = $this->db->prepare($query); |
| 30 | 30 | $sth->execute($query_values); |
| 31 | - } catch(PDOException $e) { |
|
| 31 | + } catch (PDOException $e) { |
|
| 32 | 32 | return "error : ".$e->getMessage(); |
| 33 | 33 | } |
| 34 | 34 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | try { |
| 39 | 39 | $sth = $this->db->prepare($query); |
| 40 | 40 | $sth->execute(array(':type' => $type)); |
| 41 | - } catch(PDOException $e) { |
|
| 41 | + } catch (PDOException $e) { |
|
| 42 | 42 | echo "error : ".$e->getMessage(); |
| 43 | 43 | } |
| 44 | 44 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | try { |
| 60 | 60 | $sth = $this->db->prepare($query); |
| 61 | 61 | $sth->execute(array(':filter_name' => $filter_name)); |
| 62 | - } catch(PDOException $e) { |
|
| 62 | + } catch (PDOException $e) { |
|
| 63 | 63 | return "error : ".$e->getMessage(); |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -72,14 +72,14 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $sth = $this->db->prepare($query); |
| 74 | 74 | $sth->execute(); |
| 75 | - } catch(PDOException $e) { |
|
| 75 | + } catch (PDOException $e) { |
|
| 76 | 76 | return "error : ".$e->getMessage(); |
| 77 | 77 | } |
| 78 | 78 | $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
| 79 | 79 | try { |
| 80 | 80 | $sth = $this->db->prepare($query); |
| 81 | 81 | $sth->execute(array(':filter_name' => $filter_name)); |
| 82 | - } catch(PDOException $e) { |
|
| 82 | + } catch (PDOException $e) { |
|
| 83 | 83 | return "error : ".$e->getMessage(); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -91,77 +91,77 @@ discard block |
||
| 91 | 91 | try { |
| 92 | 92 | $sth = $this->db->prepare($query); |
| 93 | 93 | $sth->execute(array(':filter_name' => $filter_name)); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | echo "error : ".$e->getMessage(); |
| 96 | 96 | } |
| 97 | 97 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 98 | 98 | if (empty($all)) { |
| 99 | 99 | $filters = array(); |
| 100 | 100 | if ($filter_name != '') { |
| 101 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 101 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 102 | 102 | } |
| 103 | 103 | $Spotter = new Spotter($this->db); |
| 104 | - $all = $Spotter->getAllAirlineNames('',NULL,$filters); |
|
| 104 | + $all = $Spotter->getAllAirlineNames('', NULL, $filters); |
|
| 105 | 105 | } |
| 106 | 106 | return $all; |
| 107 | 107 | } |
| 108 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 108 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 109 | 109 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 110 | 110 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 111 | 111 | try { |
| 112 | 112 | $sth = $this->db->prepare($query); |
| 113 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 114 | - } catch(PDOException $e) { |
|
| 113 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 114 | + } catch (PDOException $e) { |
|
| 115 | 115 | echo "error : ".$e->getMessage(); |
| 116 | 116 | } |
| 117 | 117 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 118 | 118 | return $all; |
| 119 | 119 | } |
| 120 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 120 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 121 | 121 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 122 | 122 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 123 | 123 | try { |
| 124 | 124 | $sth = $this->db->prepare($query); |
| 125 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 126 | - } catch(PDOException $e) { |
|
| 125 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | echo "error : ".$e->getMessage(); |
| 128 | 128 | } |
| 129 | 129 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 130 | 130 | return $all; |
| 131 | 131 | } |
| 132 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 132 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | 134 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 135 | 135 | try { |
| 136 | 136 | $sth = $this->db->prepare($query); |
| 137 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | - } catch(PDOException $e) { |
|
| 137 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 138 | + } catch (PDOException $e) { |
|
| 139 | 139 | echo "error : ".$e->getMessage(); |
| 140 | 140 | } |
| 141 | 141 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 142 | 142 | return $all; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
|
| 145 | + public function getAllOwnerNames($stats_airline = '', $filter_name = '') { |
|
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | 147 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 148 | 148 | try { |
| 149 | 149 | $sth = $this->db->prepare($query); |
| 150 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | - } catch(PDOException $e) { |
|
| 150 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 151 | + } catch (PDOException $e) { |
|
| 152 | 152 | echo "error : ".$e->getMessage(); |
| 153 | 153 | } |
| 154 | 154 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 155 | 155 | return $all; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
|
| 158 | + public function getAllPilotNames($stats_airline = '', $filter_name = '') { |
|
| 159 | 159 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 160 | 160 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 161 | 161 | try { |
| 162 | 162 | $sth = $this->db->prepare($query); |
| 163 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 164 | - } catch(PDOException $e) { |
|
| 163 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 164 | + } catch (PDOException $e) { |
|
| 165 | 165 | echo "error : ".$e->getMessage(); |
| 166 | 166 | } |
| 167 | 167 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -169,23 +169,23 @@ discard block |
||
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | |
| 172 | - public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 172 | + public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 173 | 173 | global $globalStatsFilters; |
| 174 | 174 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 175 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 175 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 176 | 176 | $Spotter = new Spotter($this->db); |
| 177 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 177 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 178 | 178 | $alliance_airlines = array(); |
| 179 | 179 | foreach ($airlines as $airline) { |
| 180 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 180 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 181 | 181 | } |
| 182 | 182 | if ($year == '' && $month == '') { |
| 183 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 183 | + if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | + else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 185 | 185 | try { |
| 186 | 186 | $sth = $this->db->prepare($query); |
| 187 | 187 | $sth->execute(array(':filter_name' => $filter_name)); |
| 188 | - } catch(PDOException $e) { |
|
| 188 | + } catch (PDOException $e) { |
|
| 189 | 189 | echo "error : ".$e->getMessage(); |
| 190 | 190 | } |
| 191 | 191 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -196,29 +196,29 @@ discard block |
||
| 196 | 196 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
| 197 | 197 | try { |
| 198 | 198 | $sth = $this->db->prepare($query); |
| 199 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 200 | - } catch(PDOException $e) { |
|
| 199 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 200 | + } catch (PDOException $e) { |
|
| 201 | 201 | echo "error : ".$e->getMessage(); |
| 202 | 202 | } |
| 203 | 203 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 204 | 204 | } else $all = array(); |
| 205 | 205 | } |
| 206 | 206 | if (empty($all)) { |
| 207 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 208 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 207 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 208 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 209 | 209 | } else { |
| 210 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 210 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 211 | 211 | } |
| 212 | 212 | if ($filter_name != '') { |
| 213 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 213 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 214 | 214 | } |
| 215 | 215 | $Spotter = new Spotter($this->db); |
| 216 | 216 | //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
| 217 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 217 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters); |
|
| 218 | 218 | } |
| 219 | 219 | return $all; |
| 220 | 220 | } |
| 221 | - public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 221 | + public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 222 | 222 | global $globalStatsFilters; |
| 223 | 223 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 224 | 224 | if ($year == '' && $month == '') { |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | try { |
| 228 | 228 | $sth = $this->db->prepare($query); |
| 229 | 229 | $sth->execute(array(':filter_name' => $filter_name)); |
| 230 | - } catch(PDOException $e) { |
|
| 230 | + } catch (PDOException $e) { |
|
| 231 | 231 | echo "error : ".$e->getMessage(); |
| 232 | 232 | } |
| 233 | 233 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -235,32 +235,32 @@ discard block |
||
| 235 | 235 | if (empty($all)) { |
| 236 | 236 | $Spotter = new Spotter($this->db); |
| 237 | 237 | $filters = array(); |
| 238 | - $filters = array('year' => $year,'month' => $month); |
|
| 238 | + $filters = array('year' => $year, 'month' => $month); |
|
| 239 | 239 | if ($filter_name != '') { |
| 240 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 240 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 241 | 241 | } |
| 242 | 242 | //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
| 243 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 243 | + $all = $Spotter->countAllAirlineCountries($limit, $filters); |
|
| 244 | 244 | } |
| 245 | 245 | return $all; |
| 246 | 246 | } |
| 247 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 247 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 248 | 248 | global $globalStatsFilters; |
| 249 | 249 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 250 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 250 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 251 | 251 | $Spotter = new Spotter($this->db); |
| 252 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 252 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 253 | 253 | $alliance_airlines = array(); |
| 254 | 254 | foreach ($airlines as $airline) { |
| 255 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 255 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 256 | 256 | } |
| 257 | 257 | if ($year == '' && $month == '') { |
| 258 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 259 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 258 | + if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 259 | + else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 260 | 260 | try { |
| 261 | 261 | $sth = $this->db->prepare($query); |
| 262 | 262 | $sth->execute(array(':filter_name' => $filter_name)); |
| 263 | - } catch(PDOException $e) { |
|
| 263 | + } catch (PDOException $e) { |
|
| 264 | 264 | echo "error : ".$e->getMessage(); |
| 265 | 265 | } |
| 266 | 266 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -271,21 +271,21 @@ discard block |
||
| 271 | 271 | else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
| 272 | 272 | try { |
| 273 | 273 | $sth = $this->db->prepare($query); |
| 274 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 275 | - } catch(PDOException $e) { |
|
| 274 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 275 | + } catch (PDOException $e) { |
|
| 276 | 276 | echo "error : ".$e->getMessage(); |
| 277 | 277 | } |
| 278 | 278 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 279 | 279 | } else $all = array(); |
| 280 | 280 | } |
| 281 | 281 | if (empty($all)) { |
| 282 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 283 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 282 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 283 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 284 | 284 | } else { |
| 285 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 285 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 286 | 286 | } |
| 287 | 287 | if ($filter_name != '') { |
| 288 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 288 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 289 | 289 | } |
| 290 | 290 | $Spotter = new Spotter($this->db); |
| 291 | 291 | //$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month); |
@@ -294,23 +294,23 @@ discard block |
||
| 294 | 294 | return $all; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | - public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 297 | + public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 298 | 298 | global $globalStatsFilters; |
| 299 | 299 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 300 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 300 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 301 | 301 | $Spotter = new Spotter($this->db); |
| 302 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 302 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 303 | 303 | $alliance_airlines = array(); |
| 304 | 304 | foreach ($airlines as $airline) { |
| 305 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 305 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 306 | 306 | } |
| 307 | 307 | if ($year == '' && $month == '') { |
| 308 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 309 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 308 | + if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 309 | + else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 310 | 310 | try { |
| 311 | 311 | $sth = $this->db->prepare($query); |
| 312 | 312 | $sth->execute(array(':filter_name' => $filter_name)); |
| 313 | - } catch(PDOException $e) { |
|
| 313 | + } catch (PDOException $e) { |
|
| 314 | 314 | echo "error : ".$e->getMessage(); |
| 315 | 315 | } |
| 316 | 316 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -321,61 +321,61 @@ discard block |
||
| 321 | 321 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
| 322 | 322 | try { |
| 323 | 323 | $sth = $this->db->prepare($query); |
| 324 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 325 | - } catch(PDOException $e) { |
|
| 324 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 325 | + } catch (PDOException $e) { |
|
| 326 | 326 | echo "error : ".$e->getMessage(); |
| 327 | 327 | } |
| 328 | 328 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 329 | 329 | } else $all = array(); |
| 330 | 330 | } |
| 331 | 331 | if (empty($all)) { |
| 332 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 333 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 332 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 333 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 334 | 334 | } else { |
| 335 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 335 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 336 | 336 | } |
| 337 | 337 | if ($filter_name != '') { |
| 338 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 338 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 339 | 339 | } |
| 340 | 340 | $Spotter = new Spotter($this->db); |
| 341 | 341 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 342 | - $all = $Spotter->countAllArrivalCountries($limit,$filters); |
|
| 342 | + $all = $Spotter->countAllArrivalCountries($limit, $filters); |
|
| 343 | 343 | } |
| 344 | 344 | return $all; |
| 345 | 345 | } |
| 346 | 346 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 347 | 347 | global $globalStatsFilters; |
| 348 | 348 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 349 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 349 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 350 | 350 | $Spotter = new Spotter($this->db); |
| 351 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 351 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 352 | 352 | $alliance_airlines = array(); |
| 353 | 353 | foreach ($airlines as $airline) { |
| 354 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 354 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 355 | 355 | } |
| 356 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 356 | + if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | + else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 358 | 358 | $query_values = array(':filter_name' => $filter_name); |
| 359 | 359 | } else { |
| 360 | 360 | if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
| 361 | 361 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
| 362 | - $query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 362 | + $query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 363 | 363 | } |
| 364 | 364 | try { |
| 365 | 365 | $sth = $this->db->prepare($query); |
| 366 | 366 | $sth->execute($query_values); |
| 367 | - } catch(PDOException $e) { |
|
| 367 | + } catch (PDOException $e) { |
|
| 368 | 368 | echo "error : ".$e->getMessage(); |
| 369 | 369 | } |
| 370 | 370 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 371 | 371 | if (empty($all)) { |
| 372 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 373 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 372 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 373 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 374 | 374 | } else { |
| 375 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 375 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 376 | 376 | } |
| 377 | 377 | if ($filter_name != '') { |
| 378 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 378 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 379 | 379 | } |
| 380 | 380 | $Spotter = new Spotter($this->db); |
| 381 | 381 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | return $all; |
| 385 | 385 | } |
| 386 | 386 | |
| 387 | - public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 387 | + public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 388 | 388 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 389 | 389 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 390 | 390 | if ($year == '' && $month == '') { |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | if (isset($forsource)) { |
| 394 | 394 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 395 | 395 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
| 396 | - $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
|
| 396 | + $query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource); |
|
| 397 | 397 | } else { |
| 398 | 398 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 399 | 399 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | try { |
| 403 | 403 | $sth = $this->db->prepare($query); |
| 404 | 404 | $sth->execute($query_values); |
| 405 | - } catch(PDOException $e) { |
|
| 405 | + } catch (PDOException $e) { |
|
| 406 | 406 | echo "error : ".$e->getMessage(); |
| 407 | 407 | } |
| 408 | 408 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -410,32 +410,32 @@ discard block |
||
| 410 | 410 | if (empty($all)) { |
| 411 | 411 | $Spotter = new Spotter($this->db); |
| 412 | 412 | $filters = array(); |
| 413 | - $filters = array('year' => $year,'month' => $month); |
|
| 413 | + $filters = array('year' => $year, 'month' => $month); |
|
| 414 | 414 | if ($filter_name != '') { |
| 415 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 415 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 416 | 416 | } |
| 417 | 417 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 418 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 418 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters); |
|
| 419 | 419 | } |
| 420 | 420 | return $all; |
| 421 | 421 | } |
| 422 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 422 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 423 | 423 | global $globalStatsFilters; |
| 424 | 424 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 425 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 425 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 426 | 426 | $Spotter = new Spotter($this->db); |
| 427 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 427 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 428 | 428 | $alliance_airlines = array(); |
| 429 | 429 | foreach ($airlines as $airline) { |
| 430 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 430 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 431 | 431 | } |
| 432 | 432 | if ($year == '' && $month == '') { |
| 433 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 434 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 433 | + if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 434 | + else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 435 | 435 | try { |
| 436 | 436 | $sth = $this->db->prepare($query); |
| 437 | 437 | $sth->execute(array(':filter_name' => $filter_name)); |
| 438 | - } catch(PDOException $e) { |
|
| 438 | + } catch (PDOException $e) { |
|
| 439 | 439 | echo "error : ".$e->getMessage(); |
| 440 | 440 | } |
| 441 | 441 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -446,45 +446,45 @@ discard block |
||
| 446 | 446 | else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
| 447 | 447 | try { |
| 448 | 448 | $sth = $this->db->prepare($query); |
| 449 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 450 | - } catch(PDOException $e) { |
|
| 449 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 450 | + } catch (PDOException $e) { |
|
| 451 | 451 | echo "error : ".$e->getMessage(); |
| 452 | 452 | } |
| 453 | 453 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 454 | 454 | } else $all = array(); |
| 455 | 455 | } |
| 456 | 456 | if (empty($all)) { |
| 457 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 458 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 457 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 458 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 459 | 459 | } else { |
| 460 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 460 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 461 | 461 | } |
| 462 | 462 | if ($filter_name != '') { |
| 463 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 463 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 464 | 464 | } |
| 465 | 465 | $Spotter = new Spotter($this->db); |
| 466 | 466 | //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
| 467 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 467 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters); |
|
| 468 | 468 | } |
| 469 | 469 | return $all; |
| 470 | 470 | } |
| 471 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 471 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 472 | 472 | global $globalStatsFilters; |
| 473 | 473 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 474 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 474 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 475 | 475 | $Spotter = new Spotter($this->db); |
| 476 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 476 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 477 | 477 | $alliance_airlines = array(); |
| 478 | 478 | foreach ($airlines as $airline) { |
| 479 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 479 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 480 | 480 | } |
| 481 | 481 | if ($year == '' && $month == '') { |
| 482 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 483 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 482 | + if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 483 | + else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 484 | 484 | try { |
| 485 | 485 | $sth = $this->db->prepare($query); |
| 486 | 486 | $sth->execute(array(':filter_name' => $filter_name)); |
| 487 | - } catch(PDOException $e) { |
|
| 487 | + } catch (PDOException $e) { |
|
| 488 | 488 | echo "error : ".$e->getMessage(); |
| 489 | 489 | } |
| 490 | 490 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -495,46 +495,46 @@ discard block |
||
| 495 | 495 | else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
| 496 | 496 | try { |
| 497 | 497 | $sth = $this->db->prepare($query); |
| 498 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 499 | - } catch(PDOException $e) { |
|
| 498 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 499 | + } catch (PDOException $e) { |
|
| 500 | 500 | echo "error : ".$e->getMessage(); |
| 501 | 501 | } |
| 502 | 502 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 503 | 503 | } else $all = array(); |
| 504 | 504 | } |
| 505 | 505 | if (empty($all)) { |
| 506 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 507 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 506 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 507 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 508 | 508 | } else { |
| 509 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 509 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 510 | 510 | } |
| 511 | 511 | if ($filter_name != '') { |
| 512 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 512 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 513 | 513 | } |
| 514 | 514 | $Spotter = new Spotter($this->db); |
| 515 | 515 | //$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month); |
| 516 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters); |
|
| 516 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters); |
|
| 517 | 517 | } |
| 518 | 518 | return $all; |
| 519 | 519 | } |
| 520 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 520 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 521 | 521 | $Connection = new Connection($this->db); |
| 522 | 522 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 523 | 523 | if ($Connection->tableExists('countries')) { |
| 524 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 524 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 525 | 525 | $Spotter = new Spotter($this->db); |
| 526 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 526 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 527 | 527 | if ($year == '' && $month == '') { |
| 528 | 528 | $alliance_airlines = array(); |
| 529 | 529 | foreach ($airlines as $airline) { |
| 530 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 530 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 531 | 531 | } |
| 532 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 533 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 532 | + if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 533 | + else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 534 | 534 | try { |
| 535 | 535 | $sth = $this->db->prepare($query); |
| 536 | 536 | $sth->execute(array(':filter_name' => $filter_name)); |
| 537 | - } catch(PDOException $e) { |
|
| 537 | + } catch (PDOException $e) { |
|
| 538 | 538 | echo "error : ".$e->getMessage(); |
| 539 | 539 | } |
| 540 | 540 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -546,8 +546,8 @@ discard block |
||
| 546 | 546 | else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
| 547 | 547 | try { |
| 548 | 548 | $sth = $this->db->prepare($query); |
| 549 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 550 | - } catch(PDOException $e) { |
|
| 549 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 550 | + } catch (PDOException $e) { |
|
| 551 | 551 | echo "error : ".$e->getMessage(); |
| 552 | 552 | } |
| 553 | 553 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | return array(); |
| 565 | 565 | } |
| 566 | 566 | } |
| 567 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
|
| 567 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 568 | 568 | global $globalStatsFilters; |
| 569 | 569 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 570 | 570 | if ($year == '' && $month == '') { |
@@ -572,41 +572,41 @@ discard block |
||
| 572 | 572 | else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
| 573 | 573 | try { |
| 574 | 574 | $sth = $this->db->prepare($query); |
| 575 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 576 | - } catch(PDOException $e) { |
|
| 575 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 576 | + } catch (PDOException $e) { |
|
| 577 | 577 | echo "error : ".$e->getMessage(); |
| 578 | 578 | } |
| 579 | 579 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 580 | 580 | } else $all = array(); |
| 581 | 581 | if (empty($all)) { |
| 582 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 582 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 583 | 583 | if ($filter_name != '') { |
| 584 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 584 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 585 | 585 | } |
| 586 | 586 | $Spotter = new Spotter($this->db); |
| 587 | 587 | //$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month); |
| 588 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 588 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters); |
|
| 589 | 589 | } |
| 590 | 590 | return $all; |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 593 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 594 | 594 | global $globalStatsFilters; |
| 595 | 595 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 596 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 596 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 597 | 597 | $Spotter = new Spotter($this->db); |
| 598 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 598 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 599 | 599 | if ($year == '' && $month == '') { |
| 600 | 600 | $alliance_airlines = array(); |
| 601 | 601 | foreach ($airlines as $airline) { |
| 602 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 602 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 603 | 603 | } |
| 604 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 605 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 604 | + if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 605 | + else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 606 | 606 | try { |
| 607 | 607 | $sth = $this->db->prepare($query); |
| 608 | 608 | $sth->execute(array(':filter_name' => $filter_name)); |
| 609 | - } catch(PDOException $e) { |
|
| 609 | + } catch (PDOException $e) { |
|
| 610 | 610 | echo "error : ".$e->getMessage(); |
| 611 | 611 | } |
| 612 | 612 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -617,45 +617,45 @@ discard block |
||
| 617 | 617 | else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
| 618 | 618 | try { |
| 619 | 619 | $sth = $this->db->prepare($query); |
| 620 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 621 | - } catch(PDOException $e) { |
|
| 620 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 621 | + } catch (PDOException $e) { |
|
| 622 | 622 | echo "error : ".$e->getMessage(); |
| 623 | 623 | } |
| 624 | 624 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 625 | 625 | } else $all = array(); |
| 626 | 626 | } |
| 627 | 627 | if (empty($all)) { |
| 628 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 629 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 628 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 629 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 630 | 630 | } else { |
| 631 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 631 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 632 | 632 | } |
| 633 | 633 | if ($filter_name != '') { |
| 634 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 634 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 635 | 635 | } |
| 636 | 636 | $Spotter = new Spotter($this->db); |
| 637 | 637 | //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
| 638 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 638 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters); |
|
| 639 | 639 | } |
| 640 | 640 | return $all; |
| 641 | 641 | } |
| 642 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 642 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 643 | 643 | global $globalStatsFilters; |
| 644 | 644 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 645 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 645 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 646 | 646 | $Spotter = new Spotter($this->db); |
| 647 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 647 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 648 | 648 | if ($year == '' && $month == '') { |
| 649 | 649 | $alliance_airlines = array(); |
| 650 | 650 | foreach ($airlines as $airline) { |
| 651 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 651 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 652 | 652 | } |
| 653 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 654 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 653 | + if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 654 | + else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 655 | 655 | try { |
| 656 | 656 | $sth = $this->db->prepare($query); |
| 657 | 657 | $sth->execute(array(':filter_name' => $filter_name)); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | echo "error : ".$e->getMessage(); |
| 660 | 660 | } |
| 661 | 661 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -666,27 +666,27 @@ discard block |
||
| 666 | 666 | else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 667 | 667 | try { |
| 668 | 668 | $sth = $this->db->prepare($query); |
| 669 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 670 | - } catch(PDOException $e) { |
|
| 669 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 670 | + } catch (PDOException $e) { |
|
| 671 | 671 | echo "error : ".$e->getMessage(); |
| 672 | 672 | } |
| 673 | 673 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 674 | 674 | } else $all = array(); |
| 675 | 675 | } |
| 676 | 676 | if (empty($all)) { |
| 677 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 678 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 677 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 678 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 679 | 679 | } else { |
| 680 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 680 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 681 | 681 | } |
| 682 | 682 | if ($filter_name != '') { |
| 683 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 683 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 684 | 684 | } |
| 685 | 685 | $Spotter = new Spotter($this->db); |
| 686 | 686 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 687 | 687 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 688 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 689 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 688 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters); |
|
| 689 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters); |
|
| 690 | 690 | $all = array(); |
| 691 | 691 | foreach ($pall as $value) { |
| 692 | 692 | $icao = $value['airport_departure_icao']; |
@@ -702,27 +702,27 @@ discard block |
||
| 702 | 702 | foreach ($all as $key => $row) { |
| 703 | 703 | $count[$key] = $row['airport_departure_icao_count']; |
| 704 | 704 | } |
| 705 | - array_multisort($count,SORT_DESC,$all); |
|
| 705 | + array_multisort($count, SORT_DESC, $all); |
|
| 706 | 706 | } |
| 707 | 707 | return $all; |
| 708 | 708 | } |
| 709 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 709 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 710 | 710 | global $globalStatsFilters; |
| 711 | 711 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 712 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 712 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 713 | 713 | $Spotter = new Spotter($this->db); |
| 714 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 714 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 715 | 715 | if ($year == '' && $month == '') { |
| 716 | 716 | $alliance_airlines = array(); |
| 717 | 717 | foreach ($airlines as $airline) { |
| 718 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 718 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 719 | 719 | } |
| 720 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 721 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 720 | + if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 721 | + else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 722 | 722 | try { |
| 723 | 723 | $sth = $this->db->prepare($query); |
| 724 | 724 | $sth->execute(array(':filter_name' => $filter_name)); |
| 725 | - } catch(PDOException $e) { |
|
| 725 | + } catch (PDOException $e) { |
|
| 726 | 726 | echo "error : ".$e->getMessage(); |
| 727 | 727 | } |
| 728 | 728 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -733,27 +733,27 @@ discard block |
||
| 733 | 733 | else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 734 | 734 | try { |
| 735 | 735 | $sth = $this->db->prepare($query); |
| 736 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 737 | - } catch(PDOException $e) { |
|
| 736 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 737 | + } catch (PDOException $e) { |
|
| 738 | 738 | echo "error : ".$e->getMessage(); |
| 739 | 739 | } |
| 740 | 740 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 741 | 741 | } else $all = array(); |
| 742 | 742 | } |
| 743 | 743 | if (empty($all)) { |
| 744 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 745 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 744 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 745 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 746 | 746 | } else { |
| 747 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 747 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 748 | 748 | } |
| 749 | 749 | if ($filter_name != '') { |
| 750 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 750 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 751 | 751 | } |
| 752 | 752 | $Spotter = new Spotter($this->db); |
| 753 | 753 | // $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 754 | 754 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 755 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
|
| 756 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
|
| 755 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters); |
|
| 756 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters); |
|
| 757 | 757 | $all = array(); |
| 758 | 758 | foreach ($pall as $value) { |
| 759 | 759 | $icao = $value['airport_arrival_icao']; |
@@ -769,26 +769,26 @@ discard block |
||
| 769 | 769 | foreach ($all as $key => $row) { |
| 770 | 770 | $count[$key] = $row['airport_arrival_icao_count']; |
| 771 | 771 | } |
| 772 | - array_multisort($count,SORT_DESC,$all); |
|
| 772 | + array_multisort($count, SORT_DESC, $all); |
|
| 773 | 773 | } |
| 774 | 774 | return $all; |
| 775 | 775 | } |
| 776 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 776 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 777 | 777 | global $globalDBdriver, $globalStatsFilters; |
| 778 | 778 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 779 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 779 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 780 | 780 | $Spotter = new Spotter($this->db); |
| 781 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 781 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 782 | 782 | $alliance_airlines = array(); |
| 783 | 783 | foreach ($airlines as $airline) { |
| 784 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 784 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 785 | 785 | } |
| 786 | 786 | if ($globalDBdriver == 'mysql') { |
| 787 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 787 | + if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | + else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 789 | 789 | } else { |
| 790 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 791 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 790 | + if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 791 | + else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 792 | 792 | } |
| 793 | 793 | $query_data = array(':filter_name' => $filter_name); |
| 794 | 794 | } else { |
@@ -799,23 +799,23 @@ discard block |
||
| 799 | 799 | if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 800 | 800 | else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 801 | 801 | } |
| 802 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 802 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 803 | 803 | } |
| 804 | 804 | try { |
| 805 | 805 | $sth = $this->db->prepare($query); |
| 806 | 806 | $sth->execute($query_data); |
| 807 | - } catch(PDOException $e) { |
|
| 807 | + } catch (PDOException $e) { |
|
| 808 | 808 | echo "error : ".$e->getMessage(); |
| 809 | 809 | } |
| 810 | 810 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 811 | 811 | if (empty($all)) { |
| 812 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 813 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 812 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 813 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 814 | 814 | } else { |
| 815 | 815 | $filters = array('airlines' => array($stats_airline)); |
| 816 | 816 | } |
| 817 | 817 | if ($filter_name != '') { |
| 818 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 818 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 819 | 819 | } |
| 820 | 820 | $Spotter = new Spotter($this->db); |
| 821 | 821 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -823,57 +823,57 @@ discard block |
||
| 823 | 823 | return $all; |
| 824 | 824 | } |
| 825 | 825 | |
| 826 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 826 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 827 | 827 | global $globalStatsFilters; |
| 828 | 828 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 829 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 829 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 830 | 830 | $Spotter = new Spotter($this->db); |
| 831 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 831 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 832 | 832 | $alliance_airlines = array(); |
| 833 | 833 | foreach ($airlines as $airline) { |
| 834 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 834 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 835 | 835 | } |
| 836 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 836 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 837 | 837 | $query_data = array(':filter_name' => $filter_name); |
| 838 | 838 | } else { |
| 839 | 839 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 840 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 840 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 841 | 841 | } |
| 842 | 842 | try { |
| 843 | 843 | $sth = $this->db->prepare($query); |
| 844 | 844 | $sth->execute($query_data); |
| 845 | - } catch(PDOException $e) { |
|
| 845 | + } catch (PDOException $e) { |
|
| 846 | 846 | echo "error : ".$e->getMessage(); |
| 847 | 847 | } |
| 848 | 848 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 849 | 849 | if (empty($all)) { |
| 850 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 851 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 850 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 851 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 852 | 852 | } else { |
| 853 | 853 | $filters = array('airlines' => array($stats_airline)); |
| 854 | 854 | } |
| 855 | 855 | if ($filter_name != '') { |
| 856 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 856 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 857 | 857 | } |
| 858 | 858 | $Spotter = new Spotter($this->db); |
| 859 | 859 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 860 | 860 | } |
| 861 | 861 | return $all; |
| 862 | 862 | } |
| 863 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 863 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 864 | 864 | global $globalDBdriver, $globalStatsFilters; |
| 865 | 865 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 866 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 866 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 867 | 867 | $Spotter = new Spotter($this->db); |
| 868 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 868 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 869 | 869 | $alliance_airlines = array(); |
| 870 | 870 | foreach ($airlines as $airline) { |
| 871 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 871 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 872 | 872 | } |
| 873 | 873 | if ($globalDBdriver == 'mysql') { |
| 874 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 874 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 875 | 875 | } else { |
| 876 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 876 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 877 | 877 | } |
| 878 | 878 | $query_data = array(':filter_name' => $filter_name); |
| 879 | 879 | } else { |
@@ -882,60 +882,60 @@ discard block |
||
| 882 | 882 | } else { |
| 883 | 883 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 884 | 884 | } |
| 885 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 885 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 886 | 886 | } |
| 887 | 887 | try { |
| 888 | 888 | $sth = $this->db->prepare($query); |
| 889 | 889 | $sth->execute($query_data); |
| 890 | - } catch(PDOException $e) { |
|
| 890 | + } catch (PDOException $e) { |
|
| 891 | 891 | echo "error : ".$e->getMessage(); |
| 892 | 892 | } |
| 893 | 893 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 894 | 894 | if (empty($all)) { |
| 895 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 896 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 895 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 896 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 897 | 897 | } else { |
| 898 | 898 | $filters = array('airlines' => array($stats_airline)); |
| 899 | 899 | } |
| 900 | 900 | if ($filter_name != '') { |
| 901 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 901 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 902 | 902 | } |
| 903 | 903 | $Spotter = new Spotter($this->db); |
| 904 | 904 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 905 | 905 | } |
| 906 | 906 | return $all; |
| 907 | 907 | } |
| 908 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 908 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 909 | 909 | global $globalStatsFilters; |
| 910 | 910 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 911 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 911 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 912 | 912 | $Spotter = new Spotter($this->db); |
| 913 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 913 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 914 | 914 | $alliance_airlines = array(); |
| 915 | 915 | foreach ($airlines as $airline) { |
| 916 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 916 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 917 | 917 | } |
| 918 | - $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC"; |
|
| 918 | + $query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC"; |
|
| 919 | 919 | $query_data = array(':filter_name' => $filter_name); |
| 920 | 920 | } else { |
| 921 | 921 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 922 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 922 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 923 | 923 | } |
| 924 | 924 | try { |
| 925 | 925 | $sth = $this->db->prepare($query); |
| 926 | 926 | $sth->execute($query_data); |
| 927 | - } catch(PDOException $e) { |
|
| 927 | + } catch (PDOException $e) { |
|
| 928 | 928 | echo "error : ".$e->getMessage(); |
| 929 | 929 | } |
| 930 | 930 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 931 | 931 | if (empty($all)) { |
| 932 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 933 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 932 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 933 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 934 | 934 | } else { |
| 935 | 935 | $filters = array('airlines' => array($stats_airline)); |
| 936 | 936 | } |
| 937 | 937 | if ($filter_name != '') { |
| 938 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 938 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 939 | 939 | } |
| 940 | 940 | $Spotter = new Spotter($this->db); |
| 941 | 941 | $all = $Spotter->countAllDates($filters); |
@@ -950,7 +950,7 @@ discard block |
||
| 950 | 950 | try { |
| 951 | 951 | $sth = $this->db->prepare($query); |
| 952 | 952 | $sth->execute($query_data); |
| 953 | - } catch(PDOException $e) { |
|
| 953 | + } catch (PDOException $e) { |
|
| 954 | 954 | echo "error : ".$e->getMessage(); |
| 955 | 955 | } |
| 956 | 956 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -972,7 +972,7 @@ discard block |
||
| 972 | 972 | try { |
| 973 | 973 | $sth = $this->db->prepare($query); |
| 974 | 974 | $sth->execute($query_data); |
| 975 | - } catch(PDOException $e) { |
|
| 975 | + } catch (PDOException $e) { |
|
| 976 | 976 | echo "error : ".$e->getMessage(); |
| 977 | 977 | } |
| 978 | 978 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -994,34 +994,34 @@ discard block |
||
| 994 | 994 | try { |
| 995 | 995 | $sth = $this->db->prepare($query); |
| 996 | 996 | $sth->execute($query_data); |
| 997 | - } catch(PDOException $e) { |
|
| 997 | + } catch (PDOException $e) { |
|
| 998 | 998 | echo "error : ".$e->getMessage(); |
| 999 | 999 | } |
| 1000 | 1000 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1001 | 1001 | if (empty($all)) { |
| 1002 | 1002 | $filters = array(); |
| 1003 | 1003 | if ($filter_name != '') { |
| 1004 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1004 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1005 | 1005 | } |
| 1006 | 1006 | $Spotter = new Spotter($this->db); |
| 1007 | 1007 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 1008 | 1008 | } |
| 1009 | 1009 | return $all; |
| 1010 | 1010 | } |
| 1011 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 1011 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 1012 | 1012 | global $globalStatsFilters, $globalDBdriver; |
| 1013 | 1013 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1014 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1014 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1015 | 1015 | $Spotter = new Spotter($this->db); |
| 1016 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1016 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1017 | 1017 | $alliance_airlines = array(); |
| 1018 | 1018 | foreach ($airlines as $airline) { |
| 1019 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1019 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1020 | 1020 | } |
| 1021 | 1021 | if ($globalDBdriver == 'mysql') { |
| 1022 | - $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1022 | + $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1023 | 1023 | } else { |
| 1024 | - $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1024 | + $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | $query_data = array(':filter_name' => $filter_name); |
| 1027 | 1027 | } else { |
@@ -1035,18 +1035,18 @@ discard block |
||
| 1035 | 1035 | try { |
| 1036 | 1036 | $sth = $this->db->prepare($query); |
| 1037 | 1037 | $sth->execute($query_data); |
| 1038 | - } catch(PDOException $e) { |
|
| 1038 | + } catch (PDOException $e) { |
|
| 1039 | 1039 | echo "error : ".$e->getMessage(); |
| 1040 | 1040 | } |
| 1041 | 1041 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1042 | 1042 | if (empty($all)) { |
| 1043 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1044 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1043 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1044 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1045 | 1045 | } else { |
| 1046 | 1046 | $filters = array('airlines' => array($stats_airline)); |
| 1047 | 1047 | } |
| 1048 | 1048 | if ($filter_name != '') { |
| 1049 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1049 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1050 | 1050 | } |
| 1051 | 1051 | $Spotter = new Spotter($this->db); |
| 1052 | 1052 | $all = $Spotter->countAllMonths($filters); |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | try { |
| 1064 | 1064 | $sth = $this->db->prepare($query); |
| 1065 | 1065 | $sth->execute(); |
| 1066 | - } catch(PDOException $e) { |
|
| 1066 | + } catch (PDOException $e) { |
|
| 1067 | 1067 | echo "error : ".$e->getMessage(); |
| 1068 | 1068 | } |
| 1069 | 1069 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1083,7 +1083,7 @@ discard block |
||
| 1083 | 1083 | try { |
| 1084 | 1084 | $sth = $this->db->prepare($query); |
| 1085 | 1085 | $sth->execute(); |
| 1086 | - } catch(PDOException $e) { |
|
| 1086 | + } catch (PDOException $e) { |
|
| 1087 | 1087 | echo "error : ".$e->getMessage(); |
| 1088 | 1088 | } |
| 1089 | 1089 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1100,32 +1100,32 @@ discard block |
||
| 1100 | 1100 | try { |
| 1101 | 1101 | $sth = $this->db->prepare($query); |
| 1102 | 1102 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1103 | - } catch(PDOException $e) { |
|
| 1103 | + } catch (PDOException $e) { |
|
| 1104 | 1104 | echo "error : ".$e->getMessage(); |
| 1105 | 1105 | } |
| 1106 | 1106 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1107 | 1107 | if (empty($all)) { |
| 1108 | 1108 | $filters = array(); |
| 1109 | 1109 | if ($filter_name != '') { |
| 1110 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1110 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1111 | 1111 | } |
| 1112 | 1112 | $Spotter = new Spotter($this->db); |
| 1113 | 1113 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 1114 | 1114 | } |
| 1115 | 1115 | return $all; |
| 1116 | 1116 | } |
| 1117 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 1117 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 1118 | 1118 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 1119 | 1119 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1120 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1120 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1121 | 1121 | $Spotter = new Spotter($this->db); |
| 1122 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1122 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1123 | 1123 | $alliance_airlines = array(); |
| 1124 | 1124 | foreach ($airlines as $airline) { |
| 1125 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1125 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1126 | 1126 | } |
| 1127 | - if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1128 | - else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1127 | + if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1128 | + else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1129 | 1129 | $query_data = array(':filter_name' => $filter_name); |
| 1130 | 1130 | } else { |
| 1131 | 1131 | if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1143,37 +1143,37 @@ discard block |
||
| 1143 | 1143 | try { |
| 1144 | 1144 | $sth = $this->db->prepare($query); |
| 1145 | 1145 | $sth->execute($query_data); |
| 1146 | - } catch(PDOException $e) { |
|
| 1146 | + } catch (PDOException $e) { |
|
| 1147 | 1147 | echo "error : ".$e->getMessage(); |
| 1148 | 1148 | } |
| 1149 | 1149 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1150 | 1150 | if (empty($all)) { |
| 1151 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1152 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1151 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1152 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1153 | 1153 | } else { |
| 1154 | 1154 | $filters = array('airlines' => array($stats_airline)); |
| 1155 | 1155 | } |
| 1156 | 1156 | if ($filter_name != '') { |
| 1157 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1157 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1158 | 1158 | } |
| 1159 | 1159 | $Spotter = new Spotter($this->db); |
| 1160 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 1160 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 1161 | 1161 | } |
| 1162 | 1162 | return $all; |
| 1163 | 1163 | } |
| 1164 | - public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 1164 | + public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1165 | 1165 | global $globalStatsFilters; |
| 1166 | 1166 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1167 | 1167 | if ($year == '') $year = date('Y'); |
| 1168 | - $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1168 | + $all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1169 | 1169 | if (empty($all)) { |
| 1170 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1171 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1170 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1171 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1172 | 1172 | } else { |
| 1173 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1173 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1174 | 1174 | } |
| 1175 | 1175 | if ($filter_name != '') { |
| 1176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1176 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1177 | 1177 | } |
| 1178 | 1178 | $Spotter = new Spotter($this->db); |
| 1179 | 1179 | //$all = $Spotter->countOverallFlights($filters,$year,$month); |
@@ -1181,16 +1181,16 @@ discard block |
||
| 1181 | 1181 | } |
| 1182 | 1182 | return $all; |
| 1183 | 1183 | } |
| 1184 | - public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
|
| 1184 | + public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') { |
|
| 1185 | 1185 | global $globalStatsFilters; |
| 1186 | 1186 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1187 | 1187 | if ($year == '') $year = date('Y'); |
| 1188 | - $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
|
| 1188 | + $all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month); |
|
| 1189 | 1189 | if (empty($all)) { |
| 1190 | 1190 | $filters = array(); |
| 1191 | - $filters = array('year' => $year,'month' => $month); |
|
| 1191 | + $filters = array('year' => $year, 'month' => $month); |
|
| 1192 | 1192 | if ($filter_name != '') { |
| 1193 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1193 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1194 | 1194 | } |
| 1195 | 1195 | $Spotter = new Spotter($this->db); |
| 1196 | 1196 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -1198,19 +1198,19 @@ discard block |
||
| 1198 | 1198 | } |
| 1199 | 1199 | return $all; |
| 1200 | 1200 | } |
| 1201 | - public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
|
| 1201 | + public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1202 | 1202 | global $globalStatsFilters; |
| 1203 | 1203 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1204 | 1204 | if ($year == '') $year = date('Y'); |
| 1205 | - $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1205 | + $all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1206 | 1206 | if (empty($all)) { |
| 1207 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1208 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1207 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1208 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1209 | 1209 | } else { |
| 1210 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1210 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1211 | 1211 | } |
| 1212 | 1212 | if ($filter_name != '') { |
| 1213 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1213 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1214 | 1214 | } |
| 1215 | 1215 | $Spotter = new Spotter($this->db); |
| 1216 | 1216 | //$all = $Spotter->countOverallArrival($filters,$year,$month); |
@@ -1218,48 +1218,48 @@ discard block |
||
| 1218 | 1218 | } |
| 1219 | 1219 | return $all; |
| 1220 | 1220 | } |
| 1221 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 1221 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1222 | 1222 | global $globalStatsFilters; |
| 1223 | 1223 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1224 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1224 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1225 | 1225 | $Spotter = new Spotter($this->db); |
| 1226 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1226 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1227 | 1227 | if ($year == '' && $month == '') { |
| 1228 | 1228 | $alliance_airlines = array(); |
| 1229 | 1229 | foreach ($airlines as $airline) { |
| 1230 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1230 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1231 | 1231 | } |
| 1232 | - $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1232 | + $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $this->db->prepare($query); |
| 1235 | 1235 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1236 | - } catch(PDOException $e) { |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | echo "error : ".$e->getMessage(); |
| 1238 | 1238 | } |
| 1239 | 1239 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1240 | 1240 | $all = $result[0]['nb']; |
| 1241 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1241 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1242 | 1242 | } else { |
| 1243 | 1243 | if ($year == '' && $month == '') { |
| 1244 | 1244 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1245 | 1245 | try { |
| 1246 | 1246 | $sth = $this->db->prepare($query); |
| 1247 | - $sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline)); |
|
| 1248 | - } catch(PDOException $e) { |
|
| 1247 | + $sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline)); |
|
| 1248 | + } catch (PDOException $e) { |
|
| 1249 | 1249 | echo "error : ".$e->getMessage(); |
| 1250 | 1250 | } |
| 1251 | 1251 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1252 | 1252 | $all = $result[0]['nb']; |
| 1253 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1253 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1254 | 1254 | } |
| 1255 | 1255 | if (empty($all)) { |
| 1256 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1257 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1256 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1257 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1258 | 1258 | } else { |
| 1259 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1259 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1260 | 1260 | } |
| 1261 | 1261 | if ($filter_name != '') { |
| 1262 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1262 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1263 | 1263 | } |
| 1264 | 1264 | $Spotter = new Spotter($this->db); |
| 1265 | 1265 | //$all = $Spotter->countOverallAircrafts($filters,$year,$month); |
@@ -1267,7 +1267,7 @@ discard block |
||
| 1267 | 1267 | } |
| 1268 | 1268 | return $all; |
| 1269 | 1269 | } |
| 1270 | - public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
|
| 1270 | + public function countOverallAirlines($filter_name = '', $year = '', $month = '') { |
|
| 1271 | 1271 | global $globalStatsFilters; |
| 1272 | 1272 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1273 | 1273 | if ($year == '' && $month == '') { |
@@ -1275,17 +1275,17 @@ discard block |
||
| 1275 | 1275 | try { |
| 1276 | 1276 | $sth = $this->db->prepare($query); |
| 1277 | 1277 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1278 | - } catch(PDOException $e) { |
|
| 1278 | + } catch (PDOException $e) { |
|
| 1279 | 1279 | echo "error : ".$e->getMessage(); |
| 1280 | 1280 | } |
| 1281 | 1281 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1282 | 1282 | $all = $result[0]['nb_airline']; |
| 1283 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1283 | + } else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month); |
|
| 1284 | 1284 | if (empty($all)) { |
| 1285 | 1285 | $filters = array(); |
| 1286 | - $filters = array('year' => $year,'month' => $month); |
|
| 1286 | + $filters = array('year' => $year, 'month' => $month); |
|
| 1287 | 1287 | if ($filter_name != '') { |
| 1288 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1288 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1289 | 1289 | } |
| 1290 | 1290 | $Spotter = new Spotter($this->db); |
| 1291 | 1291 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -1293,29 +1293,29 @@ discard block |
||
| 1293 | 1293 | } |
| 1294 | 1294 | return $all; |
| 1295 | 1295 | } |
| 1296 | - public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 1296 | + public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1297 | 1297 | global $globalStatsFilters; |
| 1298 | 1298 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1299 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1299 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1300 | 1300 | $Spotter = new Spotter($this->db); |
| 1301 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1301 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1302 | 1302 | if ($year == '' && $month == '') { |
| 1303 | 1303 | $alliance_airlines = array(); |
| 1304 | 1304 | foreach ($airlines as $airline) { |
| 1305 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1305 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1306 | 1306 | } |
| 1307 | - $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1307 | + $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1308 | 1308 | $query_values = array(':filter_name' => $filter_name); |
| 1309 | 1309 | try { |
| 1310 | 1310 | $sth = $this->db->prepare($query); |
| 1311 | 1311 | $sth->execute($query_values); |
| 1312 | - } catch(PDOException $e) { |
|
| 1312 | + } catch (PDOException $e) { |
|
| 1313 | 1313 | echo "error : ".$e->getMessage(); |
| 1314 | 1314 | } |
| 1315 | 1315 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1316 | 1316 | $all = $result[0]['nb']; |
| 1317 | 1317 | } else { |
| 1318 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1318 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1319 | 1319 | } |
| 1320 | 1320 | } else { |
| 1321 | 1321 | if ($year == '' && $month == '') { |
@@ -1324,23 +1324,23 @@ discard block |
||
| 1324 | 1324 | try { |
| 1325 | 1325 | $sth = $this->db->prepare($query); |
| 1326 | 1326 | $sth->execute($query_values); |
| 1327 | - } catch(PDOException $e) { |
|
| 1327 | + } catch (PDOException $e) { |
|
| 1328 | 1328 | echo "error : ".$e->getMessage(); |
| 1329 | 1329 | } |
| 1330 | 1330 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1331 | 1331 | $all = $result[0]['nb']; |
| 1332 | 1332 | } else { |
| 1333 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1333 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1334 | 1334 | } |
| 1335 | 1335 | } |
| 1336 | 1336 | if (empty($all)) { |
| 1337 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1338 | - $filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month); |
|
| 1337 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1338 | + $filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month); |
|
| 1339 | 1339 | } else { |
| 1340 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1340 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1341 | 1341 | } |
| 1342 | 1342 | if ($filter_name != '') { |
| 1343 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1343 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1344 | 1344 | } |
| 1345 | 1345 | $Spotter = new Spotter($this->db); |
| 1346 | 1346 | //$all = $Spotter->countOverallOwners($filters,$year,$month); |
@@ -1348,7 +1348,7 @@ discard block |
||
| 1348 | 1348 | } |
| 1349 | 1349 | return $all; |
| 1350 | 1350 | } |
| 1351 | - public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 1351 | + public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 1352 | 1352 | global $globalStatsFilters; |
| 1353 | 1353 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1354 | 1354 | //if ($year == '') $year = date('Y'); |
@@ -1358,18 +1358,18 @@ discard block |
||
| 1358 | 1358 | try { |
| 1359 | 1359 | $sth = $this->db->prepare($query); |
| 1360 | 1360 | $sth->execute($query_values); |
| 1361 | - } catch(PDOException $e) { |
|
| 1361 | + } catch (PDOException $e) { |
|
| 1362 | 1362 | echo "error : ".$e->getMessage(); |
| 1363 | 1363 | } |
| 1364 | 1364 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1365 | 1365 | $all = $result[0]['nb']; |
| 1366 | 1366 | } else { |
| 1367 | - $all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1367 | + $all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 1368 | 1368 | } |
| 1369 | 1369 | if (empty($all)) { |
| 1370 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 1370 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 1371 | 1371 | if ($filter_name != '') { |
| 1372 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 1372 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 1373 | 1373 | } |
| 1374 | 1374 | $Spotter = new Spotter($this->db); |
| 1375 | 1375 | //$all = $Spotter->countOverallPilots($filters,$year,$month); |
@@ -1378,104 +1378,104 @@ discard block |
||
| 1378 | 1378 | return $all; |
| 1379 | 1379 | } |
| 1380 | 1380 | |
| 1381 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 1381 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 1382 | 1382 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1383 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1383 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1384 | 1384 | $Spotter = new Spotter($this->db); |
| 1385 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1385 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1386 | 1386 | $alliance_airlines = array(); |
| 1387 | 1387 | foreach ($airlines as $airline) { |
| 1388 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1388 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1389 | 1389 | } |
| 1390 | - $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date"; |
|
| 1391 | - $query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name); |
|
| 1390 | + $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date"; |
|
| 1391 | + $query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name); |
|
| 1392 | 1392 | } else { |
| 1393 | 1393 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 1394 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1394 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1395 | 1395 | } |
| 1396 | 1396 | try { |
| 1397 | 1397 | $sth = $this->db->prepare($query); |
| 1398 | 1398 | $sth->execute($query_values); |
| 1399 | - } catch(PDOException $e) { |
|
| 1399 | + } catch (PDOException $e) { |
|
| 1400 | 1400 | echo "error : ".$e->getMessage(); |
| 1401 | 1401 | } |
| 1402 | 1402 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1403 | 1403 | return $all; |
| 1404 | 1404 | } |
| 1405 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 1405 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 1406 | 1406 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1407 | 1407 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 1408 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1408 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1409 | 1409 | try { |
| 1410 | 1410 | $sth = $this->db->prepare($query); |
| 1411 | 1411 | $sth->execute($query_values); |
| 1412 | - } catch(PDOException $e) { |
|
| 1412 | + } catch (PDOException $e) { |
|
| 1413 | 1413 | echo "error : ".$e->getMessage(); |
| 1414 | 1414 | } |
| 1415 | 1415 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1416 | 1416 | return $all; |
| 1417 | 1417 | } |
| 1418 | - public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
|
| 1418 | + public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') { |
|
| 1419 | 1419 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1420 | 1420 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1421 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1421 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1422 | 1422 | try { |
| 1423 | 1423 | $sth = $this->db->prepare($query); |
| 1424 | 1424 | $sth->execute($query_values); |
| 1425 | - } catch(PDOException $e) { |
|
| 1425 | + } catch (PDOException $e) { |
|
| 1426 | 1426 | echo "error : ".$e->getMessage(); |
| 1427 | 1427 | } |
| 1428 | 1428 | } |
| 1429 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
|
| 1429 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') { |
|
| 1430 | 1430 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1431 | 1431 | global $globalArchiveMonths, $globalDBdriver; |
| 1432 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1432 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1433 | 1433 | $Spotter = new Spotter($this->db); |
| 1434 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1434 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1435 | 1435 | $alliance_airlines = array(); |
| 1436 | 1436 | foreach ($airlines as $airline) { |
| 1437 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1437 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1438 | 1438 | } |
| 1439 | 1439 | if ($globalDBdriver == 'mysql') { |
| 1440 | 1440 | if ($month == '') { |
| 1441 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1441 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1442 | 1442 | $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name); |
| 1443 | 1443 | } else { |
| 1444 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1445 | - $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month); |
|
| 1444 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1445 | + $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1446 | 1446 | } |
| 1447 | 1447 | } else { |
| 1448 | 1448 | if ($month == '') { |
| 1449 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1449 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1450 | 1450 | $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name); |
| 1451 | 1451 | } else { |
| 1452 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1453 | - $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month); |
|
| 1452 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1453 | + $query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1454 | 1454 | } |
| 1455 | 1455 | } |
| 1456 | 1456 | } else { |
| 1457 | 1457 | if ($globalDBdriver == 'mysql') { |
| 1458 | 1458 | if ($month == '') { |
| 1459 | 1459 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1460 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1460 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1461 | 1461 | } else { |
| 1462 | 1462 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1463 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 1463 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1464 | 1464 | } |
| 1465 | 1465 | } else { |
| 1466 | 1466 | if ($month == '') { |
| 1467 | 1467 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1468 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1468 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1469 | 1469 | } else { |
| 1470 | 1470 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1471 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 1471 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 1472 | 1472 | } |
| 1473 | 1473 | } |
| 1474 | 1474 | } |
| 1475 | 1475 | try { |
| 1476 | 1476 | $sth = $this->db->prepare($query); |
| 1477 | 1477 | $sth->execute($query_values); |
| 1478 | - } catch(PDOException $e) { |
|
| 1478 | + } catch (PDOException $e) { |
|
| 1479 | 1479 | echo "error : ".$e->getMessage(); |
| 1480 | 1480 | } |
| 1481 | 1481 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1484,17 +1484,17 @@ discard block |
||
| 1484 | 1484 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1485 | 1485 | global $globalArchiveMonths, $globalDBdriver; |
| 1486 | 1486 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1487 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1487 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1488 | 1488 | $Spotter = new Spotter($this->db); |
| 1489 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1489 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1490 | 1490 | $alliance_airlines = array(); |
| 1491 | 1491 | foreach ($airlines as $airline) { |
| 1492 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1492 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1493 | 1493 | } |
| 1494 | 1494 | if ($globalDBdriver == 'mysql') { |
| 1495 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1495 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1496 | 1496 | } else { |
| 1497 | - $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1497 | + $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1498 | 1498 | } |
| 1499 | 1499 | $query_values = array(':type' => $type, ':filter_name' => $filter_name); |
| 1500 | 1500 | } else { |
@@ -1508,7 +1508,7 @@ discard block |
||
| 1508 | 1508 | try { |
| 1509 | 1509 | $sth = $this->db->prepare($query); |
| 1510 | 1510 | $sth->execute($query_values); |
| 1511 | - } catch(PDOException $e) { |
|
| 1511 | + } catch (PDOException $e) { |
|
| 1512 | 1512 | echo "error : ".$e->getMessage(); |
| 1513 | 1513 | } |
| 1514 | 1514 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1517,17 +1517,17 @@ discard block |
||
| 1517 | 1517 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1518 | 1518 | global $globalArchiveMonths, $globalDBdriver; |
| 1519 | 1519 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1520 | - if (strpos($stats_airline,'alliance_') !== FALSE) { |
|
| 1520 | + if (strpos($stats_airline, 'alliance_') !== FALSE) { |
|
| 1521 | 1521 | $Spotter = new Spotter($this->db); |
| 1522 | - $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
|
| 1522 | + $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline))); |
|
| 1523 | 1523 | $alliance_airlines = array(); |
| 1524 | 1524 | foreach ($airlines as $airline) { |
| 1525 | - $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
|
| 1525 | + $alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao'])); |
|
| 1526 | 1526 | } |
| 1527 | 1527 | if ($globalDBdriver == 'mysql') { |
| 1528 | - $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1528 | + $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1529 | 1529 | } else { |
| 1530 | - $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1530 | + $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name"; |
|
| 1531 | 1531 | } |
| 1532 | 1532 | } else { |
| 1533 | 1533 | if ($globalDBdriver == 'mysql') { |
@@ -1539,7 +1539,7 @@ discard block |
||
| 1539 | 1539 | try { |
| 1540 | 1540 | $sth = $this->db->prepare($query); |
| 1541 | 1541 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 1542 | - } catch(PDOException $e) { |
|
| 1542 | + } catch (PDOException $e) { |
|
| 1543 | 1543 | echo "error : ".$e->getMessage(); |
| 1544 | 1544 | } |
| 1545 | 1545 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1556,7 +1556,7 @@ discard block |
||
| 1556 | 1556 | try { |
| 1557 | 1557 | $sth = $this->db->prepare($query); |
| 1558 | 1558 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1559 | - } catch(PDOException $e) { |
|
| 1559 | + } catch (PDOException $e) { |
|
| 1560 | 1560 | echo "error : ".$e->getMessage(); |
| 1561 | 1561 | } |
| 1562 | 1562 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1573,20 +1573,20 @@ discard block |
||
| 1573 | 1573 | try { |
| 1574 | 1574 | $sth = $this->db->prepare($query); |
| 1575 | 1575 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1576 | - } catch(PDOException $e) { |
|
| 1576 | + } catch (PDOException $e) { |
|
| 1577 | 1577 | echo "error : ".$e->getMessage(); |
| 1578 | 1578 | } |
| 1579 | 1579 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1580 | 1580 | return $all[0]['total']; |
| 1581 | 1581 | } |
| 1582 | - public function getStatsOwner($owner_name,$filter_name = '') { |
|
| 1582 | + public function getStatsOwner($owner_name, $filter_name = '') { |
|
| 1583 | 1583 | global $globalArchiveMonths, $globalDBdriver; |
| 1584 | 1584 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1585 | 1585 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1586 | 1586 | try { |
| 1587 | 1587 | $sth = $this->db->prepare($query); |
| 1588 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1589 | - } catch(PDOException $e) { |
|
| 1588 | + $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name)); |
|
| 1589 | + } catch (PDOException $e) { |
|
| 1590 | 1590 | echo "error : ".$e->getMessage(); |
| 1591 | 1591 | } |
| 1592 | 1592 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1604,20 +1604,20 @@ discard block |
||
| 1604 | 1604 | try { |
| 1605 | 1605 | $sth = $this->db->prepare($query); |
| 1606 | 1606 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1607 | - } catch(PDOException $e) { |
|
| 1607 | + } catch (PDOException $e) { |
|
| 1608 | 1608 | echo "error : ".$e->getMessage(); |
| 1609 | 1609 | } |
| 1610 | 1610 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1611 | 1611 | return $all[0]['total']; |
| 1612 | 1612 | } |
| 1613 | - public function getStatsPilot($pilot,$filter_name = '') { |
|
| 1613 | + public function getStatsPilot($pilot, $filter_name = '') { |
|
| 1614 | 1614 | global $globalArchiveMonths, $globalDBdriver; |
| 1615 | 1615 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1616 | 1616 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1617 | 1617 | try { |
| 1618 | 1618 | $sth = $this->db->prepare($query); |
| 1619 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1620 | - } catch(PDOException $e) { |
|
| 1619 | + $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot)); |
|
| 1620 | + } catch (PDOException $e) { |
|
| 1621 | 1621 | echo "error : ".$e->getMessage(); |
| 1622 | 1622 | } |
| 1623 | 1623 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1625,7 +1625,7 @@ discard block |
||
| 1625 | 1625 | else return 0; |
| 1626 | 1626 | } |
| 1627 | 1627 | |
| 1628 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1628 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1629 | 1629 | global $globalDBdriver; |
| 1630 | 1630 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1631 | 1631 | if ($globalDBdriver == 'mysql') { |
@@ -1633,15 +1633,15 @@ discard block |
||
| 1633 | 1633 | } else { |
| 1634 | 1634 | $query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1635 | 1635 | } |
| 1636 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1636 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1637 | 1637 | try { |
| 1638 | 1638 | $sth = $this->db->prepare($query); |
| 1639 | 1639 | $sth->execute($query_values); |
| 1640 | - } catch(PDOException $e) { |
|
| 1640 | + } catch (PDOException $e) { |
|
| 1641 | 1641 | return "error : ".$e->getMessage(); |
| 1642 | 1642 | } |
| 1643 | 1643 | } |
| 1644 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1644 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1645 | 1645 | global $globalDBdriver; |
| 1646 | 1646 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1647 | 1647 | if ($globalDBdriver == 'mysql') { |
@@ -1650,11 +1650,11 @@ discard block |
||
| 1650 | 1650 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1651 | 1651 | $query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1652 | 1652 | } |
| 1653 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1653 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1654 | 1654 | try { |
| 1655 | 1655 | $sth = $this->db->prepare($query); |
| 1656 | 1656 | $sth->execute($query_values); |
| 1657 | - } catch(PDOException $e) { |
|
| 1657 | + } catch (PDOException $e) { |
|
| 1658 | 1658 | return "error : ".$e->getMessage(); |
| 1659 | 1659 | } |
| 1660 | 1660 | } |
@@ -1678,95 +1678,95 @@ discard block |
||
| 1678 | 1678 | } |
| 1679 | 1679 | */ |
| 1680 | 1680 | |
| 1681 | - public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
|
| 1681 | + public function getStatsSource($stats_type, $year = '', $month = '', $day = '') { |
|
| 1682 | 1682 | global $globalDBdriver; |
| 1683 | 1683 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
| 1684 | 1684 | $query_values = array(); |
| 1685 | 1685 | if ($globalDBdriver == 'mysql') { |
| 1686 | 1686 | if ($year != '') { |
| 1687 | 1687 | $query .= ' AND YEAR(stats_date) = :year'; |
| 1688 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1688 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1689 | 1689 | } |
| 1690 | 1690 | if ($month != '') { |
| 1691 | 1691 | $query .= ' AND MONTH(stats_date) = :month'; |
| 1692 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1692 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1693 | 1693 | } |
| 1694 | 1694 | if ($day != '') { |
| 1695 | 1695 | $query .= ' AND DAY(stats_date) = :day'; |
| 1696 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1696 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1697 | 1697 | } |
| 1698 | 1698 | } else { |
| 1699 | 1699 | if ($year != '') { |
| 1700 | 1700 | $query .= ' AND EXTRACT(YEAR FROM stats_date) = :year'; |
| 1701 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1701 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1702 | 1702 | } |
| 1703 | 1703 | if ($month != '') { |
| 1704 | 1704 | $query .= ' AND EXTRACT(MONTH FROM stats_date) = :month'; |
| 1705 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1705 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1706 | 1706 | } |
| 1707 | 1707 | if ($day != '') { |
| 1708 | 1708 | $query .= ' AND EXTRACT(DAY FROM stats_date) = :day'; |
| 1709 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1709 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1710 | 1710 | } |
| 1711 | 1711 | } |
| 1712 | 1712 | $query .= " ORDER BY source_name"; |
| 1713 | - $query_values = array_merge($query_values,array(':stats_type' => $stats_type)); |
|
| 1713 | + $query_values = array_merge($query_values, array(':stats_type' => $stats_type)); |
|
| 1714 | 1714 | try { |
| 1715 | 1715 | $sth = $this->db->prepare($query); |
| 1716 | 1716 | $sth->execute($query_values); |
| 1717 | - } catch(PDOException $e) { |
|
| 1717 | + } catch (PDOException $e) { |
|
| 1718 | 1718 | echo "error : ".$e->getMessage(); |
| 1719 | 1719 | } |
| 1720 | 1720 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1721 | 1721 | return $all; |
| 1722 | 1722 | } |
| 1723 | 1723 | |
| 1724 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 1724 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 1725 | 1725 | global $globalDBdriver; |
| 1726 | 1726 | if ($globalDBdriver == 'mysql') { |
| 1727 | 1727 | $query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data"; |
| 1728 | 1728 | } else { |
| 1729 | 1729 | $query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; |
| 1730 | 1730 | } |
| 1731 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1731 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 1732 | 1732 | try { |
| 1733 | 1733 | $sth = $this->db->prepare($query); |
| 1734 | 1734 | $sth->execute($query_values); |
| 1735 | - } catch(PDOException $e) { |
|
| 1735 | + } catch (PDOException $e) { |
|
| 1736 | 1736 | return "error : ".$e->getMessage(); |
| 1737 | 1737 | } |
| 1738 | 1738 | } |
| 1739 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1739 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 1740 | 1740 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1741 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1741 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1742 | 1742 | try { |
| 1743 | 1743 | $sth = $this->db->prepare($query); |
| 1744 | 1744 | $sth->execute($query_values); |
| 1745 | - } catch(PDOException $e) { |
|
| 1745 | + } catch (PDOException $e) { |
|
| 1746 | 1746 | return "error : ".$e->getMessage(); |
| 1747 | 1747 | } |
| 1748 | 1748 | } |
| 1749 | - public function addStatMarine($type,$date_name,$cnt,$filter_name = '') { |
|
| 1749 | + public function addStatMarine($type, $date_name, $cnt, $filter_name = '') { |
|
| 1750 | 1750 | $query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)"; |
| 1751 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1751 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1752 | 1752 | try { |
| 1753 | 1753 | $sth = $this->db->prepare($query); |
| 1754 | 1754 | $sth->execute($query_values); |
| 1755 | - } catch(PDOException $e) { |
|
| 1755 | + } catch (PDOException $e) { |
|
| 1756 | 1756 | return "error : ".$e->getMessage(); |
| 1757 | 1757 | } |
| 1758 | 1758 | } |
| 1759 | - public function addStatTracker($type,$date_name,$cnt,$filter_name = '') { |
|
| 1759 | + public function addStatTracker($type, $date_name, $cnt, $filter_name = '') { |
|
| 1760 | 1760 | $query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)"; |
| 1761 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1761 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1762 | 1762 | try { |
| 1763 | 1763 | $sth = $this->db->prepare($query); |
| 1764 | 1764 | $sth->execute($query_values); |
| 1765 | - } catch(PDOException $e) { |
|
| 1765 | + } catch (PDOException $e) { |
|
| 1766 | 1766 | return "error : ".$e->getMessage(); |
| 1767 | 1767 | } |
| 1768 | 1768 | } |
| 1769 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1769 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1770 | 1770 | global $globalDBdriver; |
| 1771 | 1771 | if ($globalDBdriver == 'mysql') { |
| 1772 | 1772 | if ($reset) { |
@@ -1781,15 +1781,15 @@ discard block |
||
| 1781 | 1781 | $query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1782 | 1782 | } |
| 1783 | 1783 | } |
| 1784 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1784 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1785 | 1785 | try { |
| 1786 | 1786 | $sth = $this->db->prepare($query); |
| 1787 | 1787 | $sth->execute($query_values); |
| 1788 | - } catch(PDOException $e) { |
|
| 1788 | + } catch (PDOException $e) { |
|
| 1789 | 1789 | return "error : ".$e->getMessage(); |
| 1790 | 1790 | } |
| 1791 | 1791 | } |
| 1792 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1792 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1793 | 1793 | global $globalDBdriver; |
| 1794 | 1794 | if ($globalDBdriver == 'mysql') { |
| 1795 | 1795 | if ($reset) { |
@@ -1804,15 +1804,15 @@ discard block |
||
| 1804 | 1804 | $query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; |
| 1805 | 1805 | } |
| 1806 | 1806 | } |
| 1807 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1807 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1808 | 1808 | try { |
| 1809 | 1809 | $sth = $this->db->prepare($query); |
| 1810 | 1810 | $sth->execute($query_values); |
| 1811 | - } catch(PDOException $e) { |
|
| 1811 | + } catch (PDOException $e) { |
|
| 1812 | 1812 | return "error : ".$e->getMessage(); |
| 1813 | 1813 | } |
| 1814 | 1814 | } |
| 1815 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1815 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1816 | 1816 | global $globalDBdriver; |
| 1817 | 1817 | if ($globalDBdriver == 'mysql') { |
| 1818 | 1818 | if ($reset) { |
@@ -1827,15 +1827,15 @@ discard block |
||
| 1827 | 1827 | $query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; |
| 1828 | 1828 | } |
| 1829 | 1829 | } |
| 1830 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1830 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao); |
|
| 1831 | 1831 | try { |
| 1832 | 1832 | $sth = $this->db->prepare($query); |
| 1833 | 1833 | $sth->execute($query_values); |
| 1834 | - } catch(PDOException $e) { |
|
| 1834 | + } catch (PDOException $e) { |
|
| 1835 | 1835 | return "error : ".$e->getMessage(); |
| 1836 | 1836 | } |
| 1837 | 1837 | } |
| 1838 | - public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) { |
|
| 1838 | + public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) { |
|
| 1839 | 1839 | global $globalDBdriver; |
| 1840 | 1840 | if ($globalDBdriver == 'mysql') { |
| 1841 | 1841 | if ($reset) { |
@@ -1850,15 +1850,15 @@ discard block |
||
| 1850 | 1850 | $query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; |
| 1851 | 1851 | } |
| 1852 | 1852 | } |
| 1853 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1853 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1854 | 1854 | try { |
| 1855 | 1855 | $sth = $this->db->prepare($query); |
| 1856 | 1856 | $sth->execute($query_values); |
| 1857 | - } catch(PDOException $e) { |
|
| 1857 | + } catch (PDOException $e) { |
|
| 1858 | 1858 | return "error : ".$e->getMessage(); |
| 1859 | 1859 | } |
| 1860 | 1860 | } |
| 1861 | - public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) { |
|
| 1861 | + public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) { |
|
| 1862 | 1862 | global $globalDBdriver; |
| 1863 | 1863 | if ($globalDBdriver == 'mysql') { |
| 1864 | 1864 | if ($reset) { |
@@ -1873,15 +1873,15 @@ discard block |
||
| 1873 | 1873 | $query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; |
| 1874 | 1874 | } |
| 1875 | 1875 | } |
| 1876 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1876 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1877 | 1877 | try { |
| 1878 | 1878 | $sth = $this->db->prepare($query); |
| 1879 | 1879 | $sth->execute($query_values); |
| 1880 | - } catch(PDOException $e) { |
|
| 1880 | + } catch (PDOException $e) { |
|
| 1881 | 1881 | return "error : ".$e->getMessage(); |
| 1882 | 1882 | } |
| 1883 | 1883 | } |
| 1884 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1884 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1885 | 1885 | global $globalDBdriver; |
| 1886 | 1886 | if ($globalDBdriver == 'mysql') { |
| 1887 | 1887 | if ($reset) { |
@@ -1896,15 +1896,15 @@ discard block |
||
| 1896 | 1896 | $query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1897 | 1897 | } |
| 1898 | 1898 | } |
| 1899 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1899 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1900 | 1900 | try { |
| 1901 | 1901 | $sth = $this->db->prepare($query); |
| 1902 | 1902 | $sth->execute($query_values); |
| 1903 | - } catch(PDOException $e) { |
|
| 1903 | + } catch (PDOException $e) { |
|
| 1904 | 1904 | return "error : ".$e->getMessage(); |
| 1905 | 1905 | } |
| 1906 | 1906 | } |
| 1907 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1907 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1908 | 1908 | global $globalDBdriver; |
| 1909 | 1909 | if ($globalDBdriver == 'mysql') { |
| 1910 | 1910 | if ($reset) { |
@@ -1919,15 +1919,15 @@ discard block |
||
| 1919 | 1919 | $query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; |
| 1920 | 1920 | } |
| 1921 | 1921 | } |
| 1922 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1922 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1923 | 1923 | try { |
| 1924 | 1924 | $sth = $this->db->prepare($query); |
| 1925 | 1925 | $sth->execute($query_values); |
| 1926 | - } catch(PDOException $e) { |
|
| 1926 | + } catch (PDOException $e) { |
|
| 1927 | 1927 | return "error : ".$e->getMessage(); |
| 1928 | 1928 | } |
| 1929 | 1929 | } |
| 1930 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1930 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1931 | 1931 | global $globalDBdriver; |
| 1932 | 1932 | if ($globalDBdriver == 'mysql') { |
| 1933 | 1933 | if ($reset) { |
@@ -1942,15 +1942,15 @@ discard block |
||
| 1942 | 1942 | $query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1943 | 1943 | } |
| 1944 | 1944 | } |
| 1945 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1945 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1946 | 1946 | try { |
| 1947 | 1947 | $sth = $this->db->prepare($query); |
| 1948 | 1948 | $sth->execute($query_values); |
| 1949 | - } catch(PDOException $e) { |
|
| 1949 | + } catch (PDOException $e) { |
|
| 1950 | 1950 | return "error : ".$e->getMessage(); |
| 1951 | 1951 | } |
| 1952 | 1952 | } |
| 1953 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1953 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1954 | 1954 | global $globalDBdriver; |
| 1955 | 1955 | if ($globalDBdriver == 'mysql') { |
| 1956 | 1956 | if ($reset) { |
@@ -1965,15 +1965,15 @@ discard block |
||
| 1965 | 1965 | $query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; |
| 1966 | 1966 | } |
| 1967 | 1967 | } |
| 1968 | - $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source); |
|
| 1968 | + $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source); |
|
| 1969 | 1969 | try { |
| 1970 | 1970 | $sth = $this->db->prepare($query); |
| 1971 | 1971 | $sth->execute($query_values); |
| 1972 | - } catch(PDOException $e) { |
|
| 1972 | + } catch (PDOException $e) { |
|
| 1973 | 1973 | return "error : ".$e->getMessage(); |
| 1974 | 1974 | } |
| 1975 | 1975 | } |
| 1976 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1976 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1977 | 1977 | global $globalDBdriver; |
| 1978 | 1978 | if ($airport_icao != '') { |
| 1979 | 1979 | if ($globalDBdriver == 'mysql') { |
@@ -1989,16 +1989,16 @@ discard block |
||
| 1989 | 1989 | $query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1990 | 1990 | } |
| 1991 | 1991 | } |
| 1992 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1992 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1993 | 1993 | try { |
| 1994 | 1994 | $sth = $this->db->prepare($query); |
| 1995 | 1995 | $sth->execute($query_values); |
| 1996 | - } catch(PDOException $e) { |
|
| 1996 | + } catch (PDOException $e) { |
|
| 1997 | 1997 | return "error : ".$e->getMessage(); |
| 1998 | 1998 | } |
| 1999 | 1999 | } |
| 2000 | 2000 | } |
| 2001 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 2001 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 2002 | 2002 | global $globalDBdriver; |
| 2003 | 2003 | if ($airport_icao != '') { |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
@@ -2006,16 +2006,16 @@ discard block |
||
| 2006 | 2006 | } else { |
| 2007 | 2007 | $query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 2008 | 2008 | } |
| 2009 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 2009 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 2010 | 2010 | try { |
| 2011 | 2011 | $sth = $this->db->prepare($query); |
| 2012 | 2012 | $sth->execute($query_values); |
| 2013 | - } catch(PDOException $e) { |
|
| 2013 | + } catch (PDOException $e) { |
|
| 2014 | 2014 | return "error : ".$e->getMessage(); |
| 2015 | 2015 | } |
| 2016 | 2016 | } |
| 2017 | 2017 | } |
| 2018 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 2018 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 2019 | 2019 | global $globalDBdriver; |
| 2020 | 2020 | if ($airport_icao != '') { |
| 2021 | 2021 | if ($globalDBdriver == 'mysql') { |
@@ -2031,16 +2031,16 @@ discard block |
||
| 2031 | 2031 | $query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 2032 | 2032 | } |
| 2033 | 2033 | } |
| 2034 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 2034 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 2035 | 2035 | try { |
| 2036 | 2036 | $sth = $this->db->prepare($query); |
| 2037 | 2037 | $sth->execute($query_values); |
| 2038 | - } catch(PDOException $e) { |
|
| 2038 | + } catch (PDOException $e) { |
|
| 2039 | 2039 | return "error : ".$e->getMessage(); |
| 2040 | 2040 | } |
| 2041 | 2041 | } |
| 2042 | 2042 | } |
| 2043 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 2043 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 2044 | 2044 | global $globalDBdriver; |
| 2045 | 2045 | if ($airport_icao != '') { |
| 2046 | 2046 | if ($globalDBdriver == 'mysql') { |
@@ -2048,11 +2048,11 @@ discard block |
||
| 2048 | 2048 | } else { |
| 2049 | 2049 | $query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 2050 | 2050 | } |
| 2051 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 2051 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 2052 | 2052 | try { |
| 2053 | 2053 | $sth = $this->db->prepare($query); |
| 2054 | 2054 | $sth->execute($query_values); |
| 2055 | - } catch(PDOException $e) { |
|
| 2055 | + } catch (PDOException $e) { |
|
| 2056 | 2056 | return "error : ".$e->getMessage(); |
| 2057 | 2057 | } |
| 2058 | 2058 | } |
@@ -2064,7 +2064,7 @@ discard block |
||
| 2064 | 2064 | try { |
| 2065 | 2065 | $sth = $this->db->prepare($query); |
| 2066 | 2066 | $sth->execute($query_values); |
| 2067 | - } catch(PDOException $e) { |
|
| 2067 | + } catch (PDOException $e) { |
|
| 2068 | 2068 | return "error : ".$e->getMessage(); |
| 2069 | 2069 | } |
| 2070 | 2070 | } |
@@ -2074,7 +2074,7 @@ discard block |
||
| 2074 | 2074 | try { |
| 2075 | 2075 | $sth = $this->db->prepare($query); |
| 2076 | 2076 | $sth->execute($query_values); |
| 2077 | - } catch(PDOException $e) { |
|
| 2077 | + } catch (PDOException $e) { |
|
| 2078 | 2078 | return "error : ".$e->getMessage(); |
| 2079 | 2079 | } |
| 2080 | 2080 | } |
@@ -2084,7 +2084,7 @@ discard block |
||
| 2084 | 2084 | try { |
| 2085 | 2085 | $sth = $this->db->prepare($query); |
| 2086 | 2086 | $sth->execute($query_values); |
| 2087 | - } catch(PDOException $e) { |
|
| 2087 | + } catch (PDOException $e) { |
|
| 2088 | 2088 | return "error : ".$e->getMessage(); |
| 2089 | 2089 | } |
| 2090 | 2090 | } |
@@ -2094,7 +2094,7 @@ discard block |
||
| 2094 | 2094 | try { |
| 2095 | 2095 | $sth = $this->db->prepare($query); |
| 2096 | 2096 | $sth->execute($query_values); |
| 2097 | - } catch(PDOException $e) { |
|
| 2097 | + } catch (PDOException $e) { |
|
| 2098 | 2098 | return "error : ".$e->getMessage(); |
| 2099 | 2099 | } |
| 2100 | 2100 | } |
@@ -2104,13 +2104,13 @@ discard block |
||
| 2104 | 2104 | try { |
| 2105 | 2105 | $sth = $this->db->prepare($query); |
| 2106 | 2106 | $sth->execute($query_values); |
| 2107 | - } catch(PDOException $e) { |
|
| 2107 | + } catch (PDOException $e) { |
|
| 2108 | 2108 | return "error : ".$e->getMessage(); |
| 2109 | 2109 | } |
| 2110 | 2110 | } |
| 2111 | 2111 | |
| 2112 | 2112 | public function addOldStats() { |
| 2113 | - global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents; |
|
| 2113 | + global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents; |
|
| 2114 | 2114 | $Common = new Common(); |
| 2115 | 2115 | $Connection = new Connection($this->db); |
| 2116 | 2116 | date_default_timezone_set('UTC'); |
@@ -2125,9 +2125,9 @@ discard block |
||
| 2125 | 2125 | $filtername = 'marine'; |
| 2126 | 2126 | if ($Connection->tableExists('countries')) { |
| 2127 | 2127 | if ($globalDebug) echo 'Count all vessels by countries...'."\n"; |
| 2128 | - $alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day); |
|
| 2128 | + $alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day); |
|
| 2129 | 2129 | foreach ($alldata as $number) { |
| 2130 | - $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset); |
|
| 2130 | + $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset); |
|
| 2131 | 2131 | } |
| 2132 | 2132 | } |
| 2133 | 2133 | if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
@@ -2137,38 +2137,38 @@ discard block |
||
| 2137 | 2137 | $lastyear = false; |
| 2138 | 2138 | foreach ($alldata as $number) { |
| 2139 | 2139 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2140 | - $this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2140 | + $this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2141 | 2141 | } |
| 2142 | 2142 | echo 'Marine data...'."\n"; |
| 2143 | 2143 | $this->deleteStatMarine('month'); |
| 2144 | 2144 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2145 | 2145 | $alldata = $Marine->countAllDatesLastMonth($filter_last_month); |
| 2146 | 2146 | foreach ($alldata as $number) { |
| 2147 | - $this->addStatMarine('month',$number['date_name'],$number['date_count']); |
|
| 2147 | + $this->addStatMarine('month', $number['date_name'], $number['date_count']); |
|
| 2148 | 2148 | } |
| 2149 | 2149 | echo '-> countAllDates...'."\n"; |
| 2150 | 2150 | $previousdata = $this->countAllDatesMarine(); |
| 2151 | 2151 | $this->deleteStatMarine('date'); |
| 2152 | - $alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month)); |
|
| 2152 | + $alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month)); |
|
| 2153 | 2153 | $values = array(); |
| 2154 | 2154 | foreach ($alldata as $cnt) { |
| 2155 | 2155 | $values[] = $cnt['date_count']; |
| 2156 | 2156 | } |
| 2157 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2158 | - array_splice($alldata,11); |
|
| 2157 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2158 | + array_splice($alldata, 11); |
|
| 2159 | 2159 | foreach ($alldata as $number) { |
| 2160 | - $this->addStatMarine('date',$number['date_name'],$number['date_count']); |
|
| 2160 | + $this->addStatMarine('date', $number['date_name'], $number['date_count']); |
|
| 2161 | 2161 | } |
| 2162 | 2162 | |
| 2163 | 2163 | $this->deleteStatMarine('hour'); |
| 2164 | 2164 | echo '-> countAllHours...'."\n"; |
| 2165 | - $alldata = $Marine->countAllHours('hour',$filter_last_month); |
|
| 2165 | + $alldata = $Marine->countAllHours('hour', $filter_last_month); |
|
| 2166 | 2166 | foreach ($alldata as $number) { |
| 2167 | - $this->addStatMarine('hour',$number['hour_name'],$number['hour_count']); |
|
| 2167 | + $this->addStatMarine('hour', $number['hour_name'], $number['hour_count']); |
|
| 2168 | 2168 | } |
| 2169 | 2169 | echo 'Insert last stats update date...'."\n"; |
| 2170 | 2170 | date_default_timezone_set('UTC'); |
| 2171 | - $this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s')); |
|
| 2171 | + $this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s')); |
|
| 2172 | 2172 | } |
| 2173 | 2173 | if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2174 | 2174 | $last_update = $this->getLastStatsUpdate('last_update_stats_tracker'); |
@@ -2180,9 +2180,9 @@ discard block |
||
| 2180 | 2180 | $Tracker = new Tracker($this->db); |
| 2181 | 2181 | if ($Connection->tableExists('countries')) { |
| 2182 | 2182 | if ($globalDebug) echo 'Count all trackers by countries...'."\n"; |
| 2183 | - $alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day); |
|
| 2183 | + $alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day); |
|
| 2184 | 2184 | foreach ($alldata as $number) { |
| 2185 | - $this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset); |
|
| 2185 | + $this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset); |
|
| 2186 | 2186 | } |
| 2187 | 2187 | } |
| 2188 | 2188 | if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
@@ -2192,38 +2192,38 @@ discard block |
||
| 2192 | 2192 | $lastyear = false; |
| 2193 | 2193 | foreach ($alldata as $number) { |
| 2194 | 2194 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2195 | - $this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2195 | + $this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2196 | 2196 | } |
| 2197 | 2197 | echo 'Tracker data...'."\n"; |
| 2198 | 2198 | $this->deleteStatTracker('month'); |
| 2199 | 2199 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2200 | 2200 | $alldata = $Tracker->countAllDatesLastMonth($filter_last_month); |
| 2201 | 2201 | foreach ($alldata as $number) { |
| 2202 | - $this->addStatTracker('month',$number['date_name'],$number['date_count']); |
|
| 2202 | + $this->addStatTracker('month', $number['date_name'], $number['date_count']); |
|
| 2203 | 2203 | } |
| 2204 | 2204 | echo '-> countAllDates...'."\n"; |
| 2205 | 2205 | $previousdata = $this->countAllDatesTracker(); |
| 2206 | 2206 | $this->deleteStatTracker('date'); |
| 2207 | - $alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month)); |
|
| 2207 | + $alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month)); |
|
| 2208 | 2208 | $values = array(); |
| 2209 | 2209 | foreach ($alldata as $cnt) { |
| 2210 | 2210 | $values[] = $cnt['date_count']; |
| 2211 | 2211 | } |
| 2212 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2213 | - array_splice($alldata,11); |
|
| 2212 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2213 | + array_splice($alldata, 11); |
|
| 2214 | 2214 | foreach ($alldata as $number) { |
| 2215 | - $this->addStatTracker('date',$number['date_name'],$number['date_count']); |
|
| 2215 | + $this->addStatTracker('date', $number['date_name'], $number['date_count']); |
|
| 2216 | 2216 | } |
| 2217 | 2217 | |
| 2218 | 2218 | $this->deleteStatTracker('hour'); |
| 2219 | 2219 | echo '-> countAllHours...'."\n"; |
| 2220 | - $alldata = $Tracker->countAllHours('hour',$filter_last_month); |
|
| 2220 | + $alldata = $Tracker->countAllHours('hour', $filter_last_month); |
|
| 2221 | 2221 | foreach ($alldata as $number) { |
| 2222 | - $this->addStatTracker('hour',$number['hour_name'],$number['hour_count']); |
|
| 2222 | + $this->addStatTracker('hour', $number['hour_name'], $number['hour_count']); |
|
| 2223 | 2223 | } |
| 2224 | 2224 | echo 'Insert last stats update date...'."\n"; |
| 2225 | 2225 | date_default_timezone_set('UTC'); |
| 2226 | - $this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s')); |
|
| 2226 | + $this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s')); |
|
| 2227 | 2227 | } |
| 2228 | 2228 | |
| 2229 | 2229 | if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) { |
@@ -2241,41 +2241,41 @@ discard block |
||
| 2241 | 2241 | $Spotter = new Spotter($this->db); |
| 2242 | 2242 | |
| 2243 | 2243 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 2244 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 2244 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 2245 | 2245 | foreach ($alldata as $number) { |
| 2246 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 2246 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 2247 | 2247 | } |
| 2248 | 2248 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 2249 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 2249 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 2250 | 2250 | foreach ($alldata as $number) { |
| 2251 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 2251 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 2252 | 2252 | } |
| 2253 | 2253 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 2254 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 2254 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 2255 | 2255 | foreach ($alldata as $number) { |
| 2256 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 2256 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 2257 | 2257 | } |
| 2258 | 2258 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 2259 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 2259 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 2260 | 2260 | foreach ($alldata as $number) { |
| 2261 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2261 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2262 | 2262 | } |
| 2263 | 2263 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 2264 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 2264 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 2265 | 2265 | foreach ($alldata as $number) { |
| 2266 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 2266 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 2267 | 2267 | } |
| 2268 | 2268 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 2269 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 2269 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 2270 | 2270 | foreach ($alldata as $number) { |
| 2271 | 2271 | if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
| 2272 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 2272 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 2273 | 2273 | } |
| 2274 | 2274 | |
| 2275 | 2275 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 2276 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 2276 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 2277 | 2277 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 2278 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 2278 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 2279 | 2279 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 2280 | 2280 | $alldata = array(); |
| 2281 | 2281 | foreach ($pall as $value) { |
@@ -2292,14 +2292,14 @@ discard block |
||
| 2292 | 2292 | foreach ($alldata as $key => $row) { |
| 2293 | 2293 | $count[$key] = $row['airport_departure_icao_count']; |
| 2294 | 2294 | } |
| 2295 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2295 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2296 | 2296 | foreach ($alldata as $number) { |
| 2297 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset); |
|
| 2297 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset); |
|
| 2298 | 2298 | } |
| 2299 | 2299 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 2300 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 2300 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 2301 | 2301 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 2302 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 2302 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 2303 | 2303 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 2304 | 2304 | $alldata = array(); |
| 2305 | 2305 | foreach ($pall as $value) { |
@@ -2316,18 +2316,18 @@ discard block |
||
| 2316 | 2316 | foreach ($alldata as $key => $row) { |
| 2317 | 2317 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2318 | 2318 | } |
| 2319 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2319 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2320 | 2320 | foreach ($alldata as $number) { |
| 2321 | - echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset); |
|
| 2321 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset); |
|
| 2322 | 2322 | } |
| 2323 | 2323 | if ($Connection->tableExists('countries')) { |
| 2324 | 2324 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 2325 | 2325 | //$SpotterArchive = new SpotterArchive(); |
| 2326 | 2326 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 2327 | 2327 | $Spotter = new Spotter($this->db); |
| 2328 | - $alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 2328 | + $alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 2329 | 2329 | foreach ($alldata as $number) { |
| 2330 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset); |
|
| 2330 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset); |
|
| 2331 | 2331 | } |
| 2332 | 2332 | } |
| 2333 | 2333 | |
@@ -2337,12 +2337,12 @@ discard block |
||
| 2337 | 2337 | $this->deleteStatsByType('fatalities_byyear'); |
| 2338 | 2338 | $alldata = $Accident->countFatalitiesByYear(); |
| 2339 | 2339 | foreach ($alldata as $number) { |
| 2340 | - $this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year']))); |
|
| 2340 | + $this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year']))); |
|
| 2341 | 2341 | } |
| 2342 | 2342 | $this->deleteStatsByType('fatalities_bymonth'); |
| 2343 | 2343 | $alldata = $Accident->countFatalitiesLast12Months(); |
| 2344 | 2344 | foreach ($alldata as $number) { |
| 2345 | - $this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year']))); |
|
| 2345 | + $this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year']))); |
|
| 2346 | 2346 | } |
| 2347 | 2347 | } |
| 2348 | 2348 | |
@@ -2356,37 +2356,37 @@ discard block |
||
| 2356 | 2356 | $lastyear = false; |
| 2357 | 2357 | foreach ($alldata as $number) { |
| 2358 | 2358 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2359 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2359 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2360 | 2360 | } |
| 2361 | 2361 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 2362 | 2362 | $alldata = $Spotter->countAllMilitaryMonths($filter_last_month); |
| 2363 | 2363 | foreach ($alldata as $number) { |
| 2364 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2364 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2365 | 2365 | } |
| 2366 | 2366 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 2367 | 2367 | $alldata = $Spotter->countAllMonthsOwners($filter_last_month); |
| 2368 | 2368 | foreach ($alldata as $number) { |
| 2369 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2369 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2370 | 2370 | } |
| 2371 | 2371 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 2372 | 2372 | $alldata = $Spotter->countAllMonthsPilots($filter_last_month); |
| 2373 | 2373 | foreach ($alldata as $number) { |
| 2374 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2374 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2375 | 2375 | } |
| 2376 | 2376 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 2377 | 2377 | $alldata = $Spotter->countAllMonthsAirlines($filter_last_month); |
| 2378 | 2378 | foreach ($alldata as $number) { |
| 2379 | - $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2379 | + $this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2380 | 2380 | } |
| 2381 | 2381 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2382 | 2382 | $alldata = $Spotter->countAllMonthsAircrafts($filter_last_month); |
| 2383 | 2383 | foreach ($alldata as $number) { |
| 2384 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2384 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2385 | 2385 | } |
| 2386 | 2386 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2387 | 2387 | $alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month); |
| 2388 | 2388 | foreach ($alldata as $number) { |
| 2389 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 2389 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 2390 | 2390 | } |
| 2391 | 2391 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 2392 | 2392 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -2431,7 +2431,7 @@ discard block |
||
| 2431 | 2431 | } |
| 2432 | 2432 | $alldata = $pall; |
| 2433 | 2433 | foreach ($alldata as $number) { |
| 2434 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 2434 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 2435 | 2435 | } |
| 2436 | 2436 | echo '...Arrival'."\n"; |
| 2437 | 2437 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -2472,7 +2472,7 @@ discard block |
||
| 2472 | 2472 | } |
| 2473 | 2473 | $alldata = $pall; |
| 2474 | 2474 | foreach ($alldata as $number) { |
| 2475 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 2475 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 2476 | 2476 | } |
| 2477 | 2477 | |
| 2478 | 2478 | echo 'Flights data...'."\n"; |
@@ -2480,28 +2480,28 @@ discard block |
||
| 2480 | 2480 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2481 | 2481 | $alldata = $Spotter->countAllDatesLastMonth($filter_last_month); |
| 2482 | 2482 | foreach ($alldata as $number) { |
| 2483 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 2483 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 2484 | 2484 | } |
| 2485 | 2485 | echo '-> countAllDates...'."\n"; |
| 2486 | 2486 | $previousdata = $this->countAllDates(); |
| 2487 | 2487 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 2488 | 2488 | $this->deleteStatFlight('date'); |
| 2489 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month)); |
|
| 2489 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month)); |
|
| 2490 | 2490 | $values = array(); |
| 2491 | 2491 | foreach ($alldata as $cnt) { |
| 2492 | 2492 | $values[] = $cnt['date_count']; |
| 2493 | 2493 | } |
| 2494 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2495 | - array_splice($alldata,11); |
|
| 2494 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2495 | + array_splice($alldata, 11); |
|
| 2496 | 2496 | foreach ($alldata as $number) { |
| 2497 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 2497 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 2498 | 2498 | } |
| 2499 | 2499 | |
| 2500 | 2500 | $this->deleteStatFlight('hour'); |
| 2501 | 2501 | echo '-> countAllHours...'."\n"; |
| 2502 | - $alldata = $Spotter->countAllHours('hour',$filter_last_month); |
|
| 2502 | + $alldata = $Spotter->countAllHours('hour', $filter_last_month); |
|
| 2503 | 2503 | foreach ($alldata as $number) { |
| 2504 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 2504 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 2505 | 2505 | } |
| 2506 | 2506 | |
| 2507 | 2507 | // Count by airlines |
@@ -2510,42 +2510,42 @@ discard block |
||
| 2510 | 2510 | if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
| 2511 | 2511 | $SpotterArchive = new SpotterArchive($this->db); |
| 2512 | 2512 | //$Spotter = new Spotter($this->db); |
| 2513 | - $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
|
| 2513 | + $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day); |
|
| 2514 | 2514 | //$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
| 2515 | 2515 | foreach ($alldata as $number) { |
| 2516 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
|
| 2516 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset); |
|
| 2517 | 2517 | } |
| 2518 | 2518 | } |
| 2519 | 2519 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 2520 | 2520 | $Spotter = new Spotter($this->db); |
| 2521 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 2521 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 2522 | 2522 | foreach ($alldata as $number) { |
| 2523 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 2523 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 2524 | 2524 | } |
| 2525 | 2525 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 2526 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 2526 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 2527 | 2527 | foreach ($alldata as $number) { |
| 2528 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 2528 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 2529 | 2529 | } |
| 2530 | 2530 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 2531 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 2531 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 2532 | 2532 | foreach ($alldata as $number) { |
| 2533 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2533 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2534 | 2534 | } |
| 2535 | 2535 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 2536 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 2536 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 2537 | 2537 | foreach ($alldata as $number) { |
| 2538 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 2538 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 2539 | 2539 | } |
| 2540 | 2540 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 2541 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 2541 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 2542 | 2542 | foreach ($alldata as $number) { |
| 2543 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 2543 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 2544 | 2544 | } |
| 2545 | 2545 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 2546 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 2546 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 2547 | 2547 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 2548 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 2548 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 2549 | 2549 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 2550 | 2550 | //$alldata = array(); |
| 2551 | 2551 | foreach ($dall as $value) { |
@@ -2565,12 +2565,12 @@ discard block |
||
| 2565 | 2565 | } |
| 2566 | 2566 | $alldata = $pall; |
| 2567 | 2567 | foreach ($alldata as $number) { |
| 2568 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2568 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2569 | 2569 | } |
| 2570 | 2570 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 2571 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 2571 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 2572 | 2572 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 2573 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 2573 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 2574 | 2574 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 2575 | 2575 | //$alldata = array(); |
| 2576 | 2576 | foreach ($dall as $value) { |
@@ -2590,7 +2590,7 @@ discard block |
||
| 2590 | 2590 | } |
| 2591 | 2591 | $alldata = $pall; |
| 2592 | 2592 | foreach ($alldata as $number) { |
| 2593 | - if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2593 | + if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset); |
|
| 2594 | 2594 | } |
| 2595 | 2595 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 2596 | 2596 | $Spotter = new Spotter($this->db); |
@@ -2598,27 +2598,27 @@ discard block |
||
| 2598 | 2598 | $lastyear = false; |
| 2599 | 2599 | foreach ($alldata as $number) { |
| 2600 | 2600 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2601 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2601 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2602 | 2602 | } |
| 2603 | 2603 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 2604 | 2604 | $alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month); |
| 2605 | 2605 | foreach ($alldata as $number) { |
| 2606 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2606 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2607 | 2607 | } |
| 2608 | 2608 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 2609 | 2609 | $alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month); |
| 2610 | 2610 | foreach ($alldata as $number) { |
| 2611 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2611 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2612 | 2612 | } |
| 2613 | 2613 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 2614 | 2614 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month); |
| 2615 | 2615 | foreach ($alldata as $number) { |
| 2616 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2616 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2617 | 2617 | } |
| 2618 | 2618 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 2619 | 2619 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month); |
| 2620 | 2620 | foreach ($alldata as $number) { |
| 2621 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 2621 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 2622 | 2622 | } |
| 2623 | 2623 | if ($globalDebug) echo '...Departure'."\n"; |
| 2624 | 2624 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -2641,7 +2641,7 @@ discard block |
||
| 2641 | 2641 | } |
| 2642 | 2642 | $alldata = $pall; |
| 2643 | 2643 | foreach ($alldata as $number) { |
| 2644 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']); |
|
| 2644 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']); |
|
| 2645 | 2645 | } |
| 2646 | 2646 | if ($globalDebug) echo '...Arrival'."\n"; |
| 2647 | 2647 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -2664,32 +2664,32 @@ discard block |
||
| 2664 | 2664 | } |
| 2665 | 2665 | $alldata = $pall; |
| 2666 | 2666 | foreach ($alldata as $number) { |
| 2667 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']); |
|
| 2667 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']); |
|
| 2668 | 2668 | } |
| 2669 | 2669 | |
| 2670 | 2670 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 2671 | 2671 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 2672 | 2672 | $alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month); |
| 2673 | 2673 | foreach ($alldata as $number) { |
| 2674 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 2674 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 2675 | 2675 | } |
| 2676 | 2676 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 2677 | 2677 | //$previousdata = $this->countAllDatesByAirlines(); |
| 2678 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month)); |
|
| 2678 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month)); |
|
| 2679 | 2679 | $values = array(); |
| 2680 | 2680 | foreach ($alldata as $cnt) { |
| 2681 | 2681 | $values[] = $cnt['date_count']; |
| 2682 | 2682 | } |
| 2683 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2684 | - array_splice($alldata,11); |
|
| 2683 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2684 | + array_splice($alldata, 11); |
|
| 2685 | 2685 | foreach ($alldata as $number) { |
| 2686 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 2686 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 2687 | 2687 | } |
| 2688 | 2688 | |
| 2689 | 2689 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 2690 | - $alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month); |
|
| 2690 | + $alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month); |
|
| 2691 | 2691 | foreach ($alldata as $number) { |
| 2692 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 2692 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 2693 | 2693 | } |
| 2694 | 2694 | |
| 2695 | 2695 | // Stats by filters |
@@ -2713,7 +2713,7 @@ discard block |
||
| 2713 | 2713 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2714 | 2714 | } |
| 2715 | 2715 | } |
| 2716 | - if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2716 | + if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2717 | 2717 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2718 | 2718 | $reset = true; |
| 2719 | 2719 | } |
@@ -2721,38 +2721,38 @@ discard block |
||
| 2721 | 2721 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 2722 | 2722 | $Spotter = new Spotter($this->db); |
| 2723 | 2723 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 2724 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 2724 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 2725 | 2725 | foreach ($alldata as $number) { |
| 2726 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 2726 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 2727 | 2727 | } |
| 2728 | 2728 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 2729 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 2729 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 2730 | 2730 | foreach ($alldata as $number) { |
| 2731 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 2731 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 2732 | 2732 | } |
| 2733 | 2733 | if ($globalDebug) echo 'Count all aircraft registrations...'."\n"; |
| 2734 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 2734 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 2735 | 2735 | foreach ($alldata as $number) { |
| 2736 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 2736 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 2737 | 2737 | } |
| 2738 | 2738 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 2739 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 2739 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 2740 | 2740 | foreach ($alldata as $number) { |
| 2741 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 2741 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 2742 | 2742 | } |
| 2743 | 2743 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 2744 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 2744 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 2745 | 2745 | foreach ($alldata as $number) { |
| 2746 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 2746 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 2747 | 2747 | } |
| 2748 | 2748 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 2749 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 2749 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 2750 | 2750 | foreach ($alldata as $number) { |
| 2751 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 2751 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 2752 | 2752 | } |
| 2753 | 2753 | if ($globalDebug) echo 'Count departure airports...'."\n"; |
| 2754 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2755 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2754 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2755 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2756 | 2756 | $alldata = array(); |
| 2757 | 2757 | foreach ($pall as $value) { |
| 2758 | 2758 | $icao = $value['airport_departure_icao']; |
@@ -2768,13 +2768,13 @@ discard block |
||
| 2768 | 2768 | foreach ($alldata as $key => $row) { |
| 2769 | 2769 | $count[$key] = $row['airport_departure_icao_count']; |
| 2770 | 2770 | } |
| 2771 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2771 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2772 | 2772 | foreach ($alldata as $number) { |
| 2773 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
|
| 2773 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset); |
|
| 2774 | 2774 | } |
| 2775 | 2775 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 2776 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2777 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2776 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2777 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2778 | 2778 | $alldata = array(); |
| 2779 | 2779 | foreach ($pall as $value) { |
| 2780 | 2780 | $icao = $value['airport_arrival_icao']; |
@@ -2790,9 +2790,9 @@ discard block |
||
| 2790 | 2790 | foreach ($alldata as $key => $row) { |
| 2791 | 2791 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2792 | 2792 | } |
| 2793 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2793 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2794 | 2794 | foreach ($alldata as $number) { |
| 2795 | - echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset); |
|
| 2795 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset); |
|
| 2796 | 2796 | } |
| 2797 | 2797 | if ($globalDebug) echo 'Count all months...'."\n"; |
| 2798 | 2798 | $Spotter = new Spotter($this->db); |
@@ -2800,36 +2800,36 @@ discard block |
||
| 2800 | 2800 | $lastyear = false; |
| 2801 | 2801 | foreach ($alldata as $number) { |
| 2802 | 2802 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2803 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2803 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2804 | 2804 | } |
| 2805 | 2805 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 2806 | 2806 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2807 | 2807 | foreach ($alldata as $number) { |
| 2808 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2808 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2809 | 2809 | } |
| 2810 | 2810 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 2811 | 2811 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2812 | 2812 | foreach ($alldata as $number) { |
| 2813 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2813 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2814 | 2814 | } |
| 2815 | 2815 | if ($globalDebug) echo 'Count all military by months...'."\n"; |
| 2816 | 2816 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2817 | 2817 | foreach ($alldata as $number) { |
| 2818 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2818 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2819 | 2819 | } |
| 2820 | 2820 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 2821 | 2821 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2822 | 2822 | foreach ($alldata as $number) { |
| 2823 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2823 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2824 | 2824 | } |
| 2825 | 2825 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 2826 | 2826 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2827 | 2827 | foreach ($alldata as $number) { |
| 2828 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2828 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2829 | 2829 | } |
| 2830 | 2830 | echo '...Departure'."\n"; |
| 2831 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 2832 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2831 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 2832 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 2833 | 2833 | foreach ($dall as $value) { |
| 2834 | 2834 | $icao = $value['departure_airport_icao']; |
| 2835 | 2835 | $ddate = $value['date']; |
@@ -2847,11 +2847,11 @@ discard block |
||
| 2847 | 2847 | } |
| 2848 | 2848 | $alldata = $pall; |
| 2849 | 2849 | foreach ($alldata as $number) { |
| 2850 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name); |
|
| 2850 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name); |
|
| 2851 | 2851 | } |
| 2852 | 2852 | echo '...Arrival'."\n"; |
| 2853 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 2854 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2853 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 2854 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 2855 | 2855 | foreach ($dall as $value) { |
| 2856 | 2856 | $icao = $value['arrival_airport_icao']; |
| 2857 | 2857 | $ddate = $value['date']; |
@@ -2869,39 +2869,39 @@ discard block |
||
| 2869 | 2869 | } |
| 2870 | 2870 | $alldata = $pall; |
| 2871 | 2871 | foreach ($alldata as $number) { |
| 2872 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name); |
|
| 2872 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name); |
|
| 2873 | 2873 | } |
| 2874 | 2874 | echo 'Flights data...'."\n"; |
| 2875 | 2875 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2876 | 2876 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 2877 | 2877 | foreach ($alldata as $number) { |
| 2878 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 2878 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2879 | 2879 | } |
| 2880 | 2880 | echo '-> countAllDates...'."\n"; |
| 2881 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 2882 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 2881 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 2882 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 2883 | 2883 | $values = array(); |
| 2884 | 2884 | foreach ($alldata as $cnt) { |
| 2885 | 2885 | $values[] = $cnt['date_count']; |
| 2886 | 2886 | } |
| 2887 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2888 | - array_splice($alldata,11); |
|
| 2887 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2888 | + array_splice($alldata, 11); |
|
| 2889 | 2889 | foreach ($alldata as $number) { |
| 2890 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 2890 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2891 | 2891 | } |
| 2892 | 2892 | |
| 2893 | 2893 | echo '-> countAllHours...'."\n"; |
| 2894 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 2894 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 2895 | 2895 | foreach ($alldata as $number) { |
| 2896 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 2896 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 2897 | 2897 | } |
| 2898 | 2898 | echo 'Insert last stats update date...'."\n"; |
| 2899 | 2899 | date_default_timezone_set('UTC'); |
| 2900 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 2900 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 2901 | 2901 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 2902 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2902 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2903 | 2903 | $this->deleteOldStats($filter_name); |
| 2904 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 2904 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 2905 | 2905 | } |
| 2906 | 2906 | } |
| 2907 | 2907 | } |
@@ -2914,16 +2914,16 @@ discard block |
||
| 2914 | 2914 | // SUM all previous month to put as year |
| 2915 | 2915 | $previous_year = date('Y'); |
| 2916 | 2916 | $previous_year--; |
| 2917 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2918 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2919 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2920 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2917 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2918 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2919 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2920 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2921 | 2921 | $allairlines = $this->getAllAirlineNames(); |
| 2922 | 2922 | foreach ($allairlines as $data) { |
| 2923 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2924 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2925 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2926 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2923 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2924 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2925 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2926 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2927 | 2927 | } |
| 2928 | 2928 | |
| 2929 | 2929 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -2932,21 +2932,21 @@ discard block |
||
| 2932 | 2932 | try { |
| 2933 | 2933 | $sth = $this->db->prepare($query); |
| 2934 | 2934 | $sth->execute(); |
| 2935 | - } catch(PDOException $e) { |
|
| 2935 | + } catch (PDOException $e) { |
|
| 2936 | 2936 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2937 | 2937 | } |
| 2938 | 2938 | $query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'"; |
| 2939 | 2939 | try { |
| 2940 | 2940 | $sth = $this->db->prepare($query); |
| 2941 | 2941 | $sth->execute(); |
| 2942 | - } catch(PDOException $e) { |
|
| 2942 | + } catch (PDOException $e) { |
|
| 2943 | 2943 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2944 | 2944 | } |
| 2945 | 2945 | $query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'"; |
| 2946 | 2946 | try { |
| 2947 | 2947 | $sth = $this->db->prepare($query); |
| 2948 | 2948 | $sth->execute(); |
| 2949 | - } catch(PDOException $e) { |
|
| 2949 | + } catch (PDOException $e) { |
|
| 2950 | 2950 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2951 | 2951 | } |
| 2952 | 2952 | } |
@@ -2959,7 +2959,7 @@ discard block |
||
| 2959 | 2959 | try { |
| 2960 | 2960 | $sth = $this->db->prepare($query); |
| 2961 | 2961 | $sth->execute(); |
| 2962 | - } catch(PDOException $e) { |
|
| 2962 | + } catch (PDOException $e) { |
|
| 2963 | 2963 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2964 | 2964 | } |
| 2965 | 2965 | if ($globalDBdriver == 'mysql') { |
@@ -2970,7 +2970,7 @@ discard block |
||
| 2970 | 2970 | try { |
| 2971 | 2971 | $sth = $this->db->prepare($query); |
| 2972 | 2972 | $sth->execute(); |
| 2973 | - } catch(PDOException $e) { |
|
| 2973 | + } catch (PDOException $e) { |
|
| 2974 | 2974 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2975 | 2975 | } |
| 2976 | 2976 | if ($globalDBdriver == 'mysql') { |
@@ -2981,15 +2981,15 @@ discard block |
||
| 2981 | 2981 | try { |
| 2982 | 2982 | $sth = $this->db->prepare($query); |
| 2983 | 2983 | $sth->execute(); |
| 2984 | - } catch(PDOException $e) { |
|
| 2984 | + } catch (PDOException $e) { |
|
| 2985 | 2985 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2986 | 2986 | } |
| 2987 | 2987 | } |
| 2988 | 2988 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 2989 | 2989 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2990 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2990 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2991 | 2991 | $this->deleteOldStats(); |
| 2992 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 2992 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 2993 | 2993 | $lastyearupdate = true; |
| 2994 | 2994 | } |
| 2995 | 2995 | } |
@@ -3011,7 +3011,7 @@ discard block |
||
| 3011 | 3011 | try { |
| 3012 | 3012 | $sth = $this->db->prepare($query); |
| 3013 | 3013 | $sth->execute(); |
| 3014 | - } catch(PDOException $e) { |
|
| 3014 | + } catch (PDOException $e) { |
|
| 3015 | 3015 | return "error : ".$e->getMessage(); |
| 3016 | 3016 | } |
| 3017 | 3017 | echo 'Archive old tracker data...'."\n"; |
@@ -3027,7 +3027,7 @@ discard block |
||
| 3027 | 3027 | try { |
| 3028 | 3028 | $sth = $this->db->prepare($query); |
| 3029 | 3029 | $sth->execute(); |
| 3030 | - } catch(PDOException $e) { |
|
| 3030 | + } catch (PDOException $e) { |
|
| 3031 | 3031 | return "error : ".$e->getMessage(); |
| 3032 | 3032 | } |
| 3033 | 3033 | echo 'Archive old marine data...'."\n"; |
@@ -3043,7 +3043,7 @@ discard block |
||
| 3043 | 3043 | try { |
| 3044 | 3044 | $sth = $this->db->prepare($query); |
| 3045 | 3045 | $sth->execute(); |
| 3046 | - } catch(PDOException $e) { |
|
| 3046 | + } catch (PDOException $e) { |
|
| 3047 | 3047 | return "error : ".$e->getMessage(); |
| 3048 | 3048 | } |
| 3049 | 3049 | } |
@@ -3056,7 +3056,7 @@ discard block |
||
| 3056 | 3056 | try { |
| 3057 | 3057 | $sth = $this->db->prepare($query); |
| 3058 | 3058 | $sth->execute(); |
| 3059 | - } catch(PDOException $e) { |
|
| 3059 | + } catch (PDOException $e) { |
|
| 3060 | 3060 | return "error : ".$e->getMessage(); |
| 3061 | 3061 | } |
| 3062 | 3062 | echo 'Deleting old tracker data...'."\n"; |
@@ -3068,7 +3068,7 @@ discard block |
||
| 3068 | 3068 | try { |
| 3069 | 3069 | $sth = $this->db->prepare($query); |
| 3070 | 3070 | $sth->execute(); |
| 3071 | - } catch(PDOException $e) { |
|
| 3071 | + } catch (PDOException $e) { |
|
| 3072 | 3072 | return "error : ".$e->getMessage(); |
| 3073 | 3073 | } |
| 3074 | 3074 | echo 'Deleting old marine data...'."\n"; |
@@ -3080,14 +3080,14 @@ discard block |
||
| 3080 | 3080 | try { |
| 3081 | 3081 | $sth = $this->db->prepare($query); |
| 3082 | 3082 | $sth->execute(); |
| 3083 | - } catch(PDOException $e) { |
|
| 3083 | + } catch (PDOException $e) { |
|
| 3084 | 3084 | return "error : ".$e->getMessage(); |
| 3085 | 3085 | } |
| 3086 | 3086 | } |
| 3087 | 3087 | if (!isset($lastyearupdate)) { |
| 3088 | 3088 | echo 'Insert last stats update date...'."\n"; |
| 3089 | 3089 | date_default_timezone_set('UTC'); |
| 3090 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 3090 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 3091 | 3091 | } |
| 3092 | 3092 | if ($globalStatsResetYear) { |
| 3093 | 3093 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -15,10 +15,14 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | public function __construct($dbc = null) { |
| 17 | 17 | global $globalFilterName; |
| 18 | - if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
|
| 18 | + if (isset($globalFilterName)) { |
|
| 19 | + $this->filter_name = $globalFilterName; |
|
| 20 | + } |
|
| 19 | 21 | $Connection = new Connection($dbc); |
| 20 | 22 | $this->db = $Connection->db(); |
| 21 | - if ($this->db === null) die('Error: No DB connection. (Stats)'); |
|
| 23 | + if ($this->db === null) { |
|
| 24 | + die('Error: No DB connection. (Stats)'); |
|
| 25 | + } |
|
| 22 | 26 | } |
| 23 | 27 | |
| 24 | 28 | public function addLastStatsUpdate($type,$stats_date) { |
@@ -86,7 +90,9 @@ discard block |
||
| 86 | 90 | |
| 87 | 91 | public function getAllAirlineNames($filter_name = '') { |
| 88 | 92 | global $globalStatsFilters; |
| 89 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 93 | + if ($filter_name == '') { |
|
| 94 | + $filter_name = $this->filter_name; |
|
| 95 | + } |
|
| 90 | 96 | $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
| 91 | 97 | try { |
| 92 | 98 | $sth = $this->db->prepare($query); |
@@ -106,7 +112,9 @@ discard block |
||
| 106 | 112 | return $all; |
| 107 | 113 | } |
| 108 | 114 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 109 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 115 | + if ($filter_name == '') { |
|
| 116 | + $filter_name = $this->filter_name; |
|
| 117 | + } |
|
| 110 | 118 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 111 | 119 | try { |
| 112 | 120 | $sth = $this->db->prepare($query); |
@@ -118,7 +126,9 @@ discard block |
||
| 118 | 126 | return $all; |
| 119 | 127 | } |
| 120 | 128 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 121 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 129 | + if ($filter_name == '') { |
|
| 130 | + $filter_name = $this->filter_name; |
|
| 131 | + } |
|
| 122 | 132 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 123 | 133 | try { |
| 124 | 134 | $sth = $this->db->prepare($query); |
@@ -130,7 +140,9 @@ discard block |
||
| 130 | 140 | return $all; |
| 131 | 141 | } |
| 132 | 142 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 133 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 143 | + if ($filter_name == '') { |
|
| 144 | + $filter_name = $this->filter_name; |
|
| 145 | + } |
|
| 134 | 146 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 135 | 147 | try { |
| 136 | 148 | $sth = $this->db->prepare($query); |
@@ -143,7 +155,9 @@ discard block |
||
| 143 | 155 | } |
| 144 | 156 | |
| 145 | 157 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 146 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 158 | + if ($filter_name == '') { |
|
| 159 | + $filter_name = $this->filter_name; |
|
| 160 | + } |
|
| 147 | 161 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 148 | 162 | try { |
| 149 | 163 | $sth = $this->db->prepare($query); |
@@ -156,7 +170,9 @@ discard block |
||
| 156 | 170 | } |
| 157 | 171 | |
| 158 | 172 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 159 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 173 | + if ($filter_name == '') { |
|
| 174 | + $filter_name = $this->filter_name; |
|
| 175 | + } |
|
| 160 | 176 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 161 | 177 | try { |
| 162 | 178 | $sth = $this->db->prepare($query); |
@@ -171,7 +187,9 @@ discard block |
||
| 171 | 187 | |
| 172 | 188 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 173 | 189 | global $globalStatsFilters; |
| 174 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 190 | + if ($filter_name == '') { |
|
| 191 | + $filter_name = $this->filter_name; |
|
| 192 | + } |
|
| 175 | 193 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 176 | 194 | $Spotter = new Spotter($this->db); |
| 177 | 195 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -180,8 +198,11 @@ discard block |
||
| 180 | 198 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 181 | 199 | } |
| 182 | 200 | if ($year == '' && $month == '') { |
| 183 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 184 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 201 | + if ($limit) { |
|
| 202 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 203 | + } else { |
|
| 204 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 205 | + } |
|
| 185 | 206 | try { |
| 186 | 207 | $sth = $this->db->prepare($query); |
| 187 | 208 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -189,11 +210,16 @@ discard block |
||
| 189 | 210 | echo "error : ".$e->getMessage(); |
| 190 | 211 | } |
| 191 | 212 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 192 | - } else $all = array(); |
|
| 213 | + } else { |
|
| 214 | + $all = array(); |
|
| 215 | + } |
|
| 193 | 216 | } else { |
| 194 | 217 | if ($year == '' && $month == '') { |
| 195 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 196 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 218 | + if ($limit) { |
|
| 219 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 220 | + } else { |
|
| 221 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 222 | + } |
|
| 197 | 223 | try { |
| 198 | 224 | $sth = $this->db->prepare($query); |
| 199 | 225 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -201,7 +227,9 @@ discard block |
||
| 201 | 227 | echo "error : ".$e->getMessage(); |
| 202 | 228 | } |
| 203 | 229 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 204 | - } else $all = array(); |
|
| 230 | + } else { |
|
| 231 | + $all = array(); |
|
| 232 | + } |
|
| 205 | 233 | } |
| 206 | 234 | if (empty($all)) { |
| 207 | 235 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -220,10 +248,15 @@ discard block |
||
| 220 | 248 | } |
| 221 | 249 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 222 | 250 | global $globalStatsFilters; |
| 223 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 251 | + if ($filter_name == '') { |
|
| 252 | + $filter_name = $this->filter_name; |
|
| 253 | + } |
|
| 224 | 254 | if ($year == '' && $month == '') { |
| 225 | - if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 226 | - else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC"; |
|
| 255 | + if ($limit) { |
|
| 256 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 257 | + } else { |
|
| 258 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC"; |
|
| 259 | + } |
|
| 227 | 260 | try { |
| 228 | 261 | $sth = $this->db->prepare($query); |
| 229 | 262 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -231,7 +264,9 @@ discard block |
||
| 231 | 264 | echo "error : ".$e->getMessage(); |
| 232 | 265 | } |
| 233 | 266 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 234 | - } else $all = array(); |
|
| 267 | + } else { |
|
| 268 | + $all = array(); |
|
| 269 | + } |
|
| 235 | 270 | if (empty($all)) { |
| 236 | 271 | $Spotter = new Spotter($this->db); |
| 237 | 272 | $filters = array(); |
@@ -246,7 +281,9 @@ discard block |
||
| 246 | 281 | } |
| 247 | 282 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 248 | 283 | global $globalStatsFilters; |
| 249 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 284 | + if ($filter_name == '') { |
|
| 285 | + $filter_name = $this->filter_name; |
|
| 286 | + } |
|
| 250 | 287 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 251 | 288 | $Spotter = new Spotter($this->db); |
| 252 | 289 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -255,8 +292,11 @@ discard block |
||
| 255 | 292 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 256 | 293 | } |
| 257 | 294 | if ($year == '' && $month == '') { |
| 258 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 259 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 295 | + if ($limit) { |
|
| 296 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 297 | + } else { |
|
| 298 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 299 | + } |
|
| 260 | 300 | try { |
| 261 | 301 | $sth = $this->db->prepare($query); |
| 262 | 302 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -264,11 +304,16 @@ discard block |
||
| 264 | 304 | echo "error : ".$e->getMessage(); |
| 265 | 305 | } |
| 266 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 267 | - } else $all = array(); |
|
| 307 | + } else { |
|
| 308 | + $all = array(); |
|
| 309 | + } |
|
| 268 | 310 | } else { |
| 269 | 311 | if ($year == '' && $month == '') { |
| 270 | - if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 271 | - else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 312 | + if ($limit) { |
|
| 313 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0"; |
|
| 314 | + } else { |
|
| 315 | + $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
|
| 316 | + } |
|
| 272 | 317 | try { |
| 273 | 318 | $sth = $this->db->prepare($query); |
| 274 | 319 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -276,7 +321,9 @@ discard block |
||
| 276 | 321 | echo "error : ".$e->getMessage(); |
| 277 | 322 | } |
| 278 | 323 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 279 | - } else $all = array(); |
|
| 324 | + } else { |
|
| 325 | + $all = array(); |
|
| 326 | + } |
|
| 280 | 327 | } |
| 281 | 328 | if (empty($all)) { |
| 282 | 329 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -296,7 +343,9 @@ discard block |
||
| 296 | 343 | |
| 297 | 344 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 298 | 345 | global $globalStatsFilters; |
| 299 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 346 | + if ($filter_name == '') { |
|
| 347 | + $filter_name = $this->filter_name; |
|
| 348 | + } |
|
| 300 | 349 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 301 | 350 | $Spotter = new Spotter($this->db); |
| 302 | 351 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -305,8 +354,11 @@ discard block |
||
| 305 | 354 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 306 | 355 | } |
| 307 | 356 | if ($year == '' && $month == '') { |
| 308 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 309 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 357 | + if ($limit) { |
|
| 358 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 359 | + } else { |
|
| 360 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 361 | + } |
|
| 310 | 362 | try { |
| 311 | 363 | $sth = $this->db->prepare($query); |
| 312 | 364 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -314,11 +366,16 @@ discard block |
||
| 314 | 366 | echo "error : ".$e->getMessage(); |
| 315 | 367 | } |
| 316 | 368 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 317 | - } else $all = array(); |
|
| 369 | + } else { |
|
| 370 | + $all = array(); |
|
| 371 | + } |
|
| 318 | 372 | } else { |
| 319 | 373 | if ($year == '' && $month == '') { |
| 320 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 321 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 374 | + if ($limit) { |
|
| 375 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 376 | + } else { |
|
| 377 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
|
| 378 | + } |
|
| 322 | 379 | try { |
| 323 | 380 | $sth = $this->db->prepare($query); |
| 324 | 381 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -326,7 +383,9 @@ discard block |
||
| 326 | 383 | echo "error : ".$e->getMessage(); |
| 327 | 384 | } |
| 328 | 385 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 329 | - } else $all = array(); |
|
| 386 | + } else { |
|
| 387 | + $all = array(); |
|
| 388 | + } |
|
| 330 | 389 | } |
| 331 | 390 | if (empty($all)) { |
| 332 | 391 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -345,7 +404,9 @@ discard block |
||
| 345 | 404 | } |
| 346 | 405 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 347 | 406 | global $globalStatsFilters; |
| 348 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 407 | + if ($filter_name == '') { |
|
| 408 | + $filter_name = $this->filter_name; |
|
| 409 | + } |
|
| 349 | 410 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 350 | 411 | $Spotter = new Spotter($this->db); |
| 351 | 412 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -353,12 +414,18 @@ discard block |
||
| 353 | 414 | foreach ($airlines as $airline) { |
| 354 | 415 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 355 | 416 | } |
| 356 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 357 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 417 | + if ($limit) { |
|
| 418 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 419 | + } else { |
|
| 420 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 421 | + } |
|
| 358 | 422 | $query_values = array(':filter_name' => $filter_name); |
| 359 | 423 | } else { |
| 360 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 361 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 424 | + if ($limit) { |
|
| 425 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 426 | + } else { |
|
| 427 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
|
| 428 | + } |
|
| 362 | 429 | $query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 363 | 430 | } |
| 364 | 431 | try { |
@@ -386,17 +453,29 @@ discard block |
||
| 386 | 453 | |
| 387 | 454 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
| 388 | 455 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 389 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 456 | + if ($filter_name == '') { |
|
| 457 | + $filter_name = $this->filter_name; |
|
| 458 | + } |
|
| 390 | 459 | if ($year == '' && $month == '') { |
| 391 | - if ($globalVATSIM) $forsource = 'vatsim'; |
|
| 392 | - if ($globalIVAO) $forsource = 'ivao'; |
|
| 460 | + if ($globalVATSIM) { |
|
| 461 | + $forsource = 'vatsim'; |
|
| 462 | + } |
|
| 463 | + if ($globalIVAO) { |
|
| 464 | + $forsource = 'ivao'; |
|
| 465 | + } |
|
| 393 | 466 | if (isset($forsource)) { |
| 394 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 395 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
|
| 467 | + if ($limit) { |
|
| 468 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 469 | + } else { |
|
| 470 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
|
| 471 | + } |
|
| 396 | 472 | $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
| 397 | 473 | } else { |
| 398 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 399 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
|
| 474 | + if ($limit) { |
|
| 475 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 476 | + } else { |
|
| 477 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
|
| 478 | + } |
|
| 400 | 479 | $query_values = array(':filter_name' => $filter_name); |
| 401 | 480 | } |
| 402 | 481 | try { |
@@ -406,7 +485,9 @@ discard block |
||
| 406 | 485 | echo "error : ".$e->getMessage(); |
| 407 | 486 | } |
| 408 | 487 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 409 | - } else $all = array(); |
|
| 488 | + } else { |
|
| 489 | + $all = array(); |
|
| 490 | + } |
|
| 410 | 491 | if (empty($all)) { |
| 411 | 492 | $Spotter = new Spotter($this->db); |
| 412 | 493 | $filters = array(); |
@@ -421,7 +502,9 @@ discard block |
||
| 421 | 502 | } |
| 422 | 503 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 423 | 504 | global $globalStatsFilters; |
| 424 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 505 | + if ($filter_name == '') { |
|
| 506 | + $filter_name = $this->filter_name; |
|
| 507 | + } |
|
| 425 | 508 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 426 | 509 | $Spotter = new Spotter($this->db); |
| 427 | 510 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -430,8 +513,11 @@ discard block |
||
| 430 | 513 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 431 | 514 | } |
| 432 | 515 | if ($year == '' && $month == '') { |
| 433 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 434 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 516 | + if ($limit) { |
|
| 517 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 518 | + } else { |
|
| 519 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 520 | + } |
|
| 435 | 521 | try { |
| 436 | 522 | $sth = $this->db->prepare($query); |
| 437 | 523 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -439,11 +525,16 @@ discard block |
||
| 439 | 525 | echo "error : ".$e->getMessage(); |
| 440 | 526 | } |
| 441 | 527 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 442 | - } else $all = array(); |
|
| 528 | + } else { |
|
| 529 | + $all = array(); |
|
| 530 | + } |
|
| 443 | 531 | } else { |
| 444 | 532 | if ($year == '' && $month == '') { |
| 445 | - if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 446 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 533 | + if ($limit) { |
|
| 534 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0"; |
|
| 535 | + } else { |
|
| 536 | + $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 537 | + } |
|
| 447 | 538 | try { |
| 448 | 539 | $sth = $this->db->prepare($query); |
| 449 | 540 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -451,7 +542,9 @@ discard block |
||
| 451 | 542 | echo "error : ".$e->getMessage(); |
| 452 | 543 | } |
| 453 | 544 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 454 | - } else $all = array(); |
|
| 545 | + } else { |
|
| 546 | + $all = array(); |
|
| 547 | + } |
|
| 455 | 548 | } |
| 456 | 549 | if (empty($all)) { |
| 457 | 550 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -470,7 +563,9 @@ discard block |
||
| 470 | 563 | } |
| 471 | 564 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 472 | 565 | global $globalStatsFilters; |
| 473 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 566 | + if ($filter_name == '') { |
|
| 567 | + $filter_name = $this->filter_name; |
|
| 568 | + } |
|
| 474 | 569 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 475 | 570 | $Spotter = new Spotter($this->db); |
| 476 | 571 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -479,8 +574,11 @@ discard block |
||
| 479 | 574 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 480 | 575 | } |
| 481 | 576 | if ($year == '' && $month == '') { |
| 482 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 483 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 577 | + if ($limit) { |
|
| 578 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 579 | + } else { |
|
| 580 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 581 | + } |
|
| 484 | 582 | try { |
| 485 | 583 | $sth = $this->db->prepare($query); |
| 486 | 584 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -488,11 +586,16 @@ discard block |
||
| 488 | 586 | echo "error : ".$e->getMessage(); |
| 489 | 587 | } |
| 490 | 588 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 491 | - } else $all = array(); |
|
| 589 | + } else { |
|
| 590 | + $all = array(); |
|
| 591 | + } |
|
| 492 | 592 | } else { |
| 493 | 593 | if ($year == '' && $month == '') { |
| 494 | - if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 495 | - else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 594 | + if ($limit) { |
|
| 595 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 596 | + } else { |
|
| 597 | + $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
|
| 598 | + } |
|
| 496 | 599 | try { |
| 497 | 600 | $sth = $this->db->prepare($query); |
| 498 | 601 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -500,7 +603,9 @@ discard block |
||
| 500 | 603 | echo "error : ".$e->getMessage(); |
| 501 | 604 | } |
| 502 | 605 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 503 | - } else $all = array(); |
|
| 606 | + } else { |
|
| 607 | + $all = array(); |
|
| 608 | + } |
|
| 504 | 609 | } |
| 505 | 610 | if (empty($all)) { |
| 506 | 611 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -519,7 +624,9 @@ discard block |
||
| 519 | 624 | } |
| 520 | 625 | public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 521 | 626 | $Connection = new Connection($this->db); |
| 522 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 627 | + if ($filter_name == '') { |
|
| 628 | + $filter_name = $this->filter_name; |
|
| 629 | + } |
|
| 523 | 630 | if ($Connection->tableExists('countries')) { |
| 524 | 631 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 525 | 632 | $Spotter = new Spotter($this->db); |
@@ -529,8 +636,11 @@ discard block |
||
| 529 | 636 | foreach ($airlines as $airline) { |
| 530 | 637 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 531 | 638 | } |
| 532 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 533 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 639 | + if ($limit) { |
|
| 640 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 641 | + } else { |
|
| 642 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 643 | + } |
|
| 534 | 644 | try { |
| 535 | 645 | $sth = $this->db->prepare($query); |
| 536 | 646 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -539,11 +649,16 @@ discard block |
||
| 539 | 649 | } |
| 540 | 650 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 541 | 651 | return $all; |
| 542 | - } else return array(); |
|
| 652 | + } else { |
|
| 653 | + return array(); |
|
| 654 | + } |
|
| 543 | 655 | } else { |
| 544 | 656 | if ($year == '' && $month == '') { |
| 545 | - if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 546 | - else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 657 | + if ($limit) { |
|
| 658 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0"; |
|
| 659 | + } else { |
|
| 660 | + $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
|
| 661 | + } |
|
| 547 | 662 | try { |
| 548 | 663 | $sth = $this->db->prepare($query); |
| 549 | 664 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -552,7 +667,9 @@ discard block |
||
| 552 | 667 | } |
| 553 | 668 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 554 | 669 | return $all; |
| 555 | - } else return array(); |
|
| 670 | + } else { |
|
| 671 | + return array(); |
|
| 672 | + } |
|
| 556 | 673 | } |
| 557 | 674 | } else { |
| 558 | 675 | /* |
@@ -566,10 +683,15 @@ discard block |
||
| 566 | 683 | } |
| 567 | 684 | public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
| 568 | 685 | global $globalStatsFilters; |
| 569 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 686 | + if ($filter_name == '') { |
|
| 687 | + $filter_name = $this->filter_name; |
|
| 688 | + } |
|
| 570 | 689 | if ($year == '' && $month == '') { |
| 571 | - if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0"; |
|
| 572 | - else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
|
| 690 | + if ($limit) { |
|
| 691 | + $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0"; |
|
| 692 | + } else { |
|
| 693 | + $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
|
| 694 | + } |
|
| 573 | 695 | try { |
| 574 | 696 | $sth = $this->db->prepare($query); |
| 575 | 697 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -577,7 +699,9 @@ discard block |
||
| 577 | 699 | echo "error : ".$e->getMessage(); |
| 578 | 700 | } |
| 579 | 701 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 580 | - } else $all = array(); |
|
| 702 | + } else { |
|
| 703 | + $all = array(); |
|
| 704 | + } |
|
| 581 | 705 | if (empty($all)) { |
| 582 | 706 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 583 | 707 | if ($filter_name != '') { |
@@ -592,7 +716,9 @@ discard block |
||
| 592 | 716 | |
| 593 | 717 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 594 | 718 | global $globalStatsFilters; |
| 595 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 719 | + if ($filter_name == '') { |
|
| 720 | + $filter_name = $this->filter_name; |
|
| 721 | + } |
|
| 596 | 722 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 597 | 723 | $Spotter = new Spotter($this->db); |
| 598 | 724 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -601,8 +727,11 @@ discard block |
||
| 601 | 727 | foreach ($airlines as $airline) { |
| 602 | 728 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 603 | 729 | } |
| 604 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 605 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 730 | + if ($limit) { |
|
| 731 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 732 | + } else { |
|
| 733 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 734 | + } |
|
| 606 | 735 | try { |
| 607 | 736 | $sth = $this->db->prepare($query); |
| 608 | 737 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -610,11 +739,16 @@ discard block |
||
| 610 | 739 | echo "error : ".$e->getMessage(); |
| 611 | 740 | } |
| 612 | 741 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 613 | - } else $all = array(); |
|
| 742 | + } else { |
|
| 743 | + $all = array(); |
|
| 744 | + } |
|
| 614 | 745 | } else { |
| 615 | 746 | if ($year == '' && $month == '') { |
| 616 | - if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 617 | - else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 747 | + if ($limit) { |
|
| 748 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0"; |
|
| 749 | + } else { |
|
| 750 | + $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
|
| 751 | + } |
|
| 618 | 752 | try { |
| 619 | 753 | $sth = $this->db->prepare($query); |
| 620 | 754 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -622,7 +756,9 @@ discard block |
||
| 622 | 756 | echo "error : ".$e->getMessage(); |
| 623 | 757 | } |
| 624 | 758 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 625 | - } else $all = array(); |
|
| 759 | + } else { |
|
| 760 | + $all = array(); |
|
| 761 | + } |
|
| 626 | 762 | } |
| 627 | 763 | if (empty($all)) { |
| 628 | 764 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -641,7 +777,9 @@ discard block |
||
| 641 | 777 | } |
| 642 | 778 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 643 | 779 | global $globalStatsFilters; |
| 644 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 780 | + if ($filter_name == '') { |
|
| 781 | + $filter_name = $this->filter_name; |
|
| 782 | + } |
|
| 645 | 783 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 646 | 784 | $Spotter = new Spotter($this->db); |
| 647 | 785 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -650,8 +788,11 @@ discard block |
||
| 650 | 788 | foreach ($airlines as $airline) { |
| 651 | 789 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 652 | 790 | } |
| 653 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 654 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 791 | + if ($limit) { |
|
| 792 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 793 | + } else { |
|
| 794 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 795 | + } |
|
| 655 | 796 | try { |
| 656 | 797 | $sth = $this->db->prepare($query); |
| 657 | 798 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -659,11 +800,16 @@ discard block |
||
| 659 | 800 | echo "error : ".$e->getMessage(); |
| 660 | 801 | } |
| 661 | 802 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 662 | - } else $all = array(); |
|
| 803 | + } else { |
|
| 804 | + $all = array(); |
|
| 805 | + } |
|
| 663 | 806 | } else { |
| 664 | 807 | if ($year == '' && $month == '') { |
| 665 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 666 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 808 | + if ($limit) { |
|
| 809 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 810 | + } else { |
|
| 811 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 812 | + } |
|
| 667 | 813 | try { |
| 668 | 814 | $sth = $this->db->prepare($query); |
| 669 | 815 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -671,7 +817,9 @@ discard block |
||
| 671 | 817 | echo "error : ".$e->getMessage(); |
| 672 | 818 | } |
| 673 | 819 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 674 | - } else $all = array(); |
|
| 820 | + } else { |
|
| 821 | + $all = array(); |
|
| 822 | + } |
|
| 675 | 823 | } |
| 676 | 824 | if (empty($all)) { |
| 677 | 825 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -696,7 +844,9 @@ discard block |
||
| 696 | 844 | $icao = $value['airport_departure_icao']; |
| 697 | 845 | if (isset($all[$icao])) { |
| 698 | 846 | $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 699 | - } else $all[$icao] = $value; |
|
| 847 | + } else { |
|
| 848 | + $all[$icao] = $value; |
|
| 849 | + } |
|
| 700 | 850 | } |
| 701 | 851 | $count = array(); |
| 702 | 852 | foreach ($all as $key => $row) { |
@@ -708,7 +858,9 @@ discard block |
||
| 708 | 858 | } |
| 709 | 859 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 710 | 860 | global $globalStatsFilters; |
| 711 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 861 | + if ($filter_name == '') { |
|
| 862 | + $filter_name = $this->filter_name; |
|
| 863 | + } |
|
| 712 | 864 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 713 | 865 | $Spotter = new Spotter($this->db); |
| 714 | 866 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -717,8 +869,11 @@ discard block |
||
| 717 | 869 | foreach ($airlines as $airline) { |
| 718 | 870 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 719 | 871 | } |
| 720 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 721 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 872 | + if ($limit) { |
|
| 873 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 874 | + } else { |
|
| 875 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 876 | + } |
|
| 722 | 877 | try { |
| 723 | 878 | $sth = $this->db->prepare($query); |
| 724 | 879 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -726,11 +881,16 @@ discard block |
||
| 726 | 881 | echo "error : ".$e->getMessage(); |
| 727 | 882 | } |
| 728 | 883 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 729 | - } else $all = array(); |
|
| 884 | + } else { |
|
| 885 | + $all = array(); |
|
| 886 | + } |
|
| 730 | 887 | } else { |
| 731 | 888 | if ($year == '' && $month == '') { |
| 732 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 733 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 889 | + if ($limit) { |
|
| 890 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 891 | + } else { |
|
| 892 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 893 | + } |
|
| 734 | 894 | try { |
| 735 | 895 | $sth = $this->db->prepare($query); |
| 736 | 896 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -738,7 +898,9 @@ discard block |
||
| 738 | 898 | echo "error : ".$e->getMessage(); |
| 739 | 899 | } |
| 740 | 900 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 741 | - } else $all = array(); |
|
| 901 | + } else { |
|
| 902 | + $all = array(); |
|
| 903 | + } |
|
| 742 | 904 | } |
| 743 | 905 | if (empty($all)) { |
| 744 | 906 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -763,7 +925,9 @@ discard block |
||
| 763 | 925 | $icao = $value['airport_arrival_icao']; |
| 764 | 926 | if (isset($all[$icao])) { |
| 765 | 927 | $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 766 | - } else $all[$icao] = $value; |
|
| 928 | + } else { |
|
| 929 | + $all[$icao] = $value; |
|
| 930 | + } |
|
| 767 | 931 | } |
| 768 | 932 | $count = array(); |
| 769 | 933 | foreach ($all as $key => $row) { |
@@ -775,7 +939,9 @@ discard block |
||
| 775 | 939 | } |
| 776 | 940 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 777 | 941 | global $globalDBdriver, $globalStatsFilters; |
| 778 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 942 | + if ($filter_name == '') { |
|
| 943 | + $filter_name = $this->filter_name; |
|
| 944 | + } |
|
| 779 | 945 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 780 | 946 | $Spotter = new Spotter($this->db); |
| 781 | 947 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -784,20 +950,32 @@ discard block |
||
| 784 | 950 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 785 | 951 | } |
| 786 | 952 | if ($globalDBdriver == 'mysql') { |
| 787 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 788 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 953 | + if ($limit) { |
|
| 954 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 955 | + } else { |
|
| 956 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 957 | + } |
|
| 789 | 958 | } else { |
| 790 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 791 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 959 | + if ($limit) { |
|
| 960 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 961 | + } else { |
|
| 962 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date"; |
|
| 963 | + } |
|
| 792 | 964 | } |
| 793 | 965 | $query_data = array(':filter_name' => $filter_name); |
| 794 | 966 | } else { |
| 795 | 967 | if ($globalDBdriver == 'mysql') { |
| 796 | - if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 797 | - else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 968 | + if ($limit) { |
|
| 969 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 970 | + } else { |
|
| 971 | + $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 972 | + } |
|
| 798 | 973 | } else { |
| 799 | - if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 800 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 974 | + if ($limit) { |
|
| 975 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 976 | + } else { |
|
| 977 | + $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 978 | + } |
|
| 801 | 979 | } |
| 802 | 980 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 803 | 981 | } |
@@ -825,7 +1003,9 @@ discard block |
||
| 825 | 1003 | |
| 826 | 1004 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
| 827 | 1005 | global $globalStatsFilters; |
| 828 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1006 | + if ($filter_name == '') { |
|
| 1007 | + $filter_name = $this->filter_name; |
|
| 1008 | + } |
|
| 829 | 1009 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 830 | 1010 | $Spotter = new Spotter($this->db); |
| 831 | 1011 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -862,7 +1042,9 @@ discard block |
||
| 862 | 1042 | } |
| 863 | 1043 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 864 | 1044 | global $globalDBdriver, $globalStatsFilters; |
| 865 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1045 | + if ($filter_name == '') { |
|
| 1046 | + $filter_name = $this->filter_name; |
|
| 1047 | + } |
|
| 866 | 1048 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 867 | 1049 | $Spotter = new Spotter($this->db); |
| 868 | 1050 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -907,7 +1089,9 @@ discard block |
||
| 907 | 1089 | } |
| 908 | 1090 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 909 | 1091 | global $globalStatsFilters; |
| 910 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1092 | + if ($filter_name == '') { |
|
| 1093 | + $filter_name = $this->filter_name; |
|
| 1094 | + } |
|
| 911 | 1095 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 912 | 1096 | $Spotter = new Spotter($this->db); |
| 913 | 1097 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -944,7 +1128,9 @@ discard block |
||
| 944 | 1128 | } |
| 945 | 1129 | public function countAllDatesMarine($filter_name = '') { |
| 946 | 1130 | global $globalStatsFilters; |
| 947 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1131 | + if ($filter_name == '') { |
|
| 1132 | + $filter_name = $this->filter_name; |
|
| 1133 | + } |
|
| 948 | 1134 | $query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 949 | 1135 | $query_data = array(':filter_name' => $filter_name); |
| 950 | 1136 | try { |
@@ -966,7 +1152,9 @@ discard block |
||
| 966 | 1152 | } |
| 967 | 1153 | public function countAllDatesTracker($filter_name = '') { |
| 968 | 1154 | global $globalStatsFilters; |
| 969 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1155 | + if ($filter_name == '') { |
|
| 1156 | + $filter_name = $this->filter_name; |
|
| 1157 | + } |
|
| 970 | 1158 | $query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 971 | 1159 | $query_data = array(':filter_name' => $filter_name); |
| 972 | 1160 | try { |
@@ -988,7 +1176,9 @@ discard block |
||
| 988 | 1176 | } |
| 989 | 1177 | public function countAllDatesByAirlines($filter_name = '') { |
| 990 | 1178 | global $globalStatsFilters; |
| 991 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1179 | + if ($filter_name == '') { |
|
| 1180 | + $filter_name = $this->filter_name; |
|
| 1181 | + } |
|
| 992 | 1182 | $query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name"; |
| 993 | 1183 | $query_data = array('filter_name' => $filter_name); |
| 994 | 1184 | try { |
@@ -1010,7 +1200,9 @@ discard block |
||
| 1010 | 1200 | } |
| 1011 | 1201 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 1012 | 1202 | global $globalStatsFilters, $globalDBdriver; |
| 1013 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1203 | + if ($filter_name == '') { |
|
| 1204 | + $filter_name = $this->filter_name; |
|
| 1205 | + } |
|
| 1014 | 1206 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1015 | 1207 | $Spotter = new Spotter($this->db); |
| 1016 | 1208 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1095,7 +1287,9 @@ discard block |
||
| 1095 | 1287 | } |
| 1096 | 1288 | public function countAllMilitaryMonths($filter_name = '') { |
| 1097 | 1289 | global $globalStatsFilters; |
| 1098 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1290 | + if ($filter_name == '') { |
|
| 1291 | + $filter_name = $this->filter_name; |
|
| 1292 | + } |
|
| 1099 | 1293 | $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
| 1100 | 1294 | try { |
| 1101 | 1295 | $sth = $this->db->prepare($query); |
@@ -1116,7 +1310,9 @@ discard block |
||
| 1116 | 1310 | } |
| 1117 | 1311 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 1118 | 1312 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 1119 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1313 | + if ($filter_name == '') { |
|
| 1314 | + $filter_name = $this->filter_name; |
|
| 1315 | + } |
|
| 1120 | 1316 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1121 | 1317 | $Spotter = new Spotter($this->db); |
| 1122 | 1318 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1124,12 +1320,18 @@ discard block |
||
| 1124 | 1320 | foreach ($airlines as $airline) { |
| 1125 | 1321 | $alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao'])); |
| 1126 | 1322 | } |
| 1127 | - if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1128 | - else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1323 | + if ($limit) { |
|
| 1324 | + $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1325 | + } else { |
|
| 1326 | + $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date"; |
|
| 1327 | + } |
|
| 1129 | 1328 | $query_data = array(':filter_name' => $filter_name); |
| 1130 | 1329 | } else { |
| 1131 | - if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1132 | - else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1330 | + if ($limit) { |
|
| 1331 | + $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1332 | + } else { |
|
| 1333 | + $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 1334 | + } |
|
| 1133 | 1335 | $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 1134 | 1336 | } |
| 1135 | 1337 | if ($orderby == 'hour') { |
@@ -1139,7 +1341,9 @@ discard block |
||
| 1139 | 1341 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 1140 | 1342 | } |
| 1141 | 1343 | } |
| 1142 | - if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
|
| 1344 | + if ($orderby == 'count') { |
|
| 1345 | + $query .= " ORDER BY hour_count DESC"; |
|
| 1346 | + } |
|
| 1143 | 1347 | try { |
| 1144 | 1348 | $sth = $this->db->prepare($query); |
| 1145 | 1349 | $sth->execute($query_data); |
@@ -1163,8 +1367,12 @@ discard block |
||
| 1163 | 1367 | } |
| 1164 | 1368 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 1165 | 1369 | global $globalStatsFilters; |
| 1166 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1167 | - if ($year == '') $year = date('Y'); |
|
| 1370 | + if ($filter_name == '') { |
|
| 1371 | + $filter_name = $this->filter_name; |
|
| 1372 | + } |
|
| 1373 | + if ($year == '') { |
|
| 1374 | + $year = date('Y'); |
|
| 1375 | + } |
|
| 1168 | 1376 | $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
| 1169 | 1377 | if (empty($all)) { |
| 1170 | 1378 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1183,8 +1391,12 @@ discard block |
||
| 1183 | 1391 | } |
| 1184 | 1392 | public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
| 1185 | 1393 | global $globalStatsFilters; |
| 1186 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1187 | - if ($year == '') $year = date('Y'); |
|
| 1394 | + if ($filter_name == '') { |
|
| 1395 | + $filter_name = $this->filter_name; |
|
| 1396 | + } |
|
| 1397 | + if ($year == '') { |
|
| 1398 | + $year = date('Y'); |
|
| 1399 | + } |
|
| 1188 | 1400 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 1189 | 1401 | if (empty($all)) { |
| 1190 | 1402 | $filters = array(); |
@@ -1200,8 +1412,12 @@ discard block |
||
| 1200 | 1412 | } |
| 1201 | 1413 | public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
| 1202 | 1414 | global $globalStatsFilters; |
| 1203 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1204 | - if ($year == '') $year = date('Y'); |
|
| 1415 | + if ($filter_name == '') { |
|
| 1416 | + $filter_name = $this->filter_name; |
|
| 1417 | + } |
|
| 1418 | + if ($year == '') { |
|
| 1419 | + $year = date('Y'); |
|
| 1420 | + } |
|
| 1205 | 1421 | $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
| 1206 | 1422 | if (empty($all)) { |
| 1207 | 1423 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1220,7 +1436,9 @@ discard block |
||
| 1220 | 1436 | } |
| 1221 | 1437 | public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 1222 | 1438 | global $globalStatsFilters; |
| 1223 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1439 | + if ($filter_name == '') { |
|
| 1440 | + $filter_name = $this->filter_name; |
|
| 1441 | + } |
|
| 1224 | 1442 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1225 | 1443 | $Spotter = new Spotter($this->db); |
| 1226 | 1444 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1238,7 +1456,9 @@ discard block |
||
| 1238 | 1456 | } |
| 1239 | 1457 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1240 | 1458 | $all = $result[0]['nb']; |
| 1241 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1459 | + } else { |
|
| 1460 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1461 | + } |
|
| 1242 | 1462 | } else { |
| 1243 | 1463 | if ($year == '' && $month == '') { |
| 1244 | 1464 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1250,7 +1470,9 @@ discard block |
||
| 1250 | 1470 | } |
| 1251 | 1471 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1252 | 1472 | $all = $result[0]['nb']; |
| 1253 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1473 | + } else { |
|
| 1474 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 1475 | + } |
|
| 1254 | 1476 | } |
| 1255 | 1477 | if (empty($all)) { |
| 1256 | 1478 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
@@ -1269,7 +1491,9 @@ discard block |
||
| 1269 | 1491 | } |
| 1270 | 1492 | public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
| 1271 | 1493 | global $globalStatsFilters; |
| 1272 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1494 | + if ($filter_name == '') { |
|
| 1495 | + $filter_name = $this->filter_name; |
|
| 1496 | + } |
|
| 1273 | 1497 | if ($year == '' && $month == '') { |
| 1274 | 1498 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 1275 | 1499 | try { |
@@ -1280,7 +1504,9 @@ discard block |
||
| 1280 | 1504 | } |
| 1281 | 1505 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1282 | 1506 | $all = $result[0]['nb_airline']; |
| 1283 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1507 | + } else { |
|
| 1508 | + $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1509 | + } |
|
| 1284 | 1510 | if (empty($all)) { |
| 1285 | 1511 | $filters = array(); |
| 1286 | 1512 | $filters = array('year' => $year,'month' => $month); |
@@ -1295,7 +1521,9 @@ discard block |
||
| 1295 | 1521 | } |
| 1296 | 1522 | public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 1297 | 1523 | global $globalStatsFilters; |
| 1298 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1524 | + if ($filter_name == '') { |
|
| 1525 | + $filter_name = $this->filter_name; |
|
| 1526 | + } |
|
| 1299 | 1527 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1300 | 1528 | $Spotter = new Spotter($this->db); |
| 1301 | 1529 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1350,7 +1578,9 @@ discard block |
||
| 1350 | 1578 | } |
| 1351 | 1579 | public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 1352 | 1580 | global $globalStatsFilters; |
| 1353 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1581 | + if ($filter_name == '') { |
|
| 1582 | + $filter_name = $this->filter_name; |
|
| 1583 | + } |
|
| 1354 | 1584 | //if ($year == '') $year = date('Y'); |
| 1355 | 1585 | if ($year == '' && $month == '') { |
| 1356 | 1586 | $query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -1379,7 +1609,9 @@ discard block |
||
| 1379 | 1609 | } |
| 1380 | 1610 | |
| 1381 | 1611 | public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
| 1382 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1612 | + if ($filter_name == '') { |
|
| 1613 | + $filter_name = $this->filter_name; |
|
| 1614 | + } |
|
| 1383 | 1615 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1384 | 1616 | $Spotter = new Spotter($this->db); |
| 1385 | 1617 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1403,7 +1635,9 @@ discard block |
||
| 1403 | 1635 | return $all; |
| 1404 | 1636 | } |
| 1405 | 1637 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 1406 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1638 | + if ($filter_name == '') { |
|
| 1639 | + $filter_name = $this->filter_name; |
|
| 1640 | + } |
|
| 1407 | 1641 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 1408 | 1642 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 1409 | 1643 | try { |
@@ -1416,7 +1650,9 @@ discard block |
||
| 1416 | 1650 | return $all; |
| 1417 | 1651 | } |
| 1418 | 1652 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 1419 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1653 | + if ($filter_name == '') { |
|
| 1654 | + $filter_name = $this->filter_name; |
|
| 1655 | + } |
|
| 1420 | 1656 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1421 | 1657 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 1422 | 1658 | try { |
@@ -1427,7 +1663,9 @@ discard block |
||
| 1427 | 1663 | } |
| 1428 | 1664 | } |
| 1429 | 1665 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 1430 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1666 | + if ($filter_name == '') { |
|
| 1667 | + $filter_name = $this->filter_name; |
|
| 1668 | + } |
|
| 1431 | 1669 | global $globalArchiveMonths, $globalDBdriver; |
| 1432 | 1670 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1433 | 1671 | $Spotter = new Spotter($this->db); |
@@ -1483,7 +1721,9 @@ discard block |
||
| 1483 | 1721 | } |
| 1484 | 1722 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1485 | 1723 | global $globalArchiveMonths, $globalDBdriver; |
| 1486 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1724 | + if ($filter_name == '') { |
|
| 1725 | + $filter_name = $this->filter_name; |
|
| 1726 | + } |
|
| 1487 | 1727 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1488 | 1728 | $Spotter = new Spotter($this->db); |
| 1489 | 1729 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1516,7 +1756,9 @@ discard block |
||
| 1516 | 1756 | } |
| 1517 | 1757 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1518 | 1758 | global $globalArchiveMonths, $globalDBdriver; |
| 1519 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1759 | + if ($filter_name == '') { |
|
| 1760 | + $filter_name = $this->filter_name; |
|
| 1761 | + } |
|
| 1520 | 1762 | if (strpos($stats_airline,'alliance_') !== FALSE) { |
| 1521 | 1763 | $Spotter = new Spotter($this->db); |
| 1522 | 1764 | $airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline))); |
@@ -1547,7 +1789,9 @@ discard block |
||
| 1547 | 1789 | } |
| 1548 | 1790 | public function getStatsAirlineTotal($filter_name = '') { |
| 1549 | 1791 | global $globalArchiveMonths, $globalDBdriver; |
| 1550 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1792 | + if ($filter_name == '') { |
|
| 1793 | + $filter_name = $this->filter_name; |
|
| 1794 | + } |
|
| 1551 | 1795 | if ($globalDBdriver == 'mysql') { |
| 1552 | 1796 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1553 | 1797 | } else { |
@@ -1564,7 +1808,9 @@ discard block |
||
| 1564 | 1808 | } |
| 1565 | 1809 | public function getStatsOwnerTotal($filter_name = '') { |
| 1566 | 1810 | global $globalArchiveMonths, $globalDBdriver; |
| 1567 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1811 | + if ($filter_name == '') { |
|
| 1812 | + $filter_name = $this->filter_name; |
|
| 1813 | + } |
|
| 1568 | 1814 | if ($globalDBdriver == 'mysql') { |
| 1569 | 1815 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1570 | 1816 | } else { |
@@ -1581,7 +1827,9 @@ discard block |
||
| 1581 | 1827 | } |
| 1582 | 1828 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1583 | 1829 | global $globalArchiveMonths, $globalDBdriver; |
| 1584 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1830 | + if ($filter_name == '') { |
|
| 1831 | + $filter_name = $this->filter_name; |
|
| 1832 | + } |
|
| 1585 | 1833 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1586 | 1834 | try { |
| 1587 | 1835 | $sth = $this->db->prepare($query); |
@@ -1590,12 +1838,17 @@ discard block |
||
| 1590 | 1838 | echo "error : ".$e->getMessage(); |
| 1591 | 1839 | } |
| 1592 | 1840 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1593 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1594 | - else return 0; |
|
| 1841 | + if (isset($all[0]['cnt'])) { |
|
| 1842 | + return $all[0]['cnt']; |
|
| 1843 | + } else { |
|
| 1844 | + return 0; |
|
| 1845 | + } |
|
| 1595 | 1846 | } |
| 1596 | 1847 | public function getStatsPilotTotal($filter_name = '') { |
| 1597 | 1848 | global $globalArchiveMonths, $globalDBdriver; |
| 1598 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1849 | + if ($filter_name == '') { |
|
| 1850 | + $filter_name = $this->filter_name; |
|
| 1851 | + } |
|
| 1599 | 1852 | if ($globalDBdriver == 'mysql') { |
| 1600 | 1853 | $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
| 1601 | 1854 | } else { |
@@ -1612,7 +1865,9 @@ discard block |
||
| 1612 | 1865 | } |
| 1613 | 1866 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1614 | 1867 | global $globalArchiveMonths, $globalDBdriver; |
| 1615 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1868 | + if ($filter_name == '') { |
|
| 1869 | + $filter_name = $this->filter_name; |
|
| 1870 | + } |
|
| 1616 | 1871 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1617 | 1872 | try { |
| 1618 | 1873 | $sth = $this->db->prepare($query); |
@@ -1621,13 +1876,18 @@ discard block |
||
| 1621 | 1876 | echo "error : ".$e->getMessage(); |
| 1622 | 1877 | } |
| 1623 | 1878 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1624 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1625 | - else return 0; |
|
| 1879 | + if (isset($all[0]['cnt'])) { |
|
| 1880 | + return $all[0]['cnt']; |
|
| 1881 | + } else { |
|
| 1882 | + return 0; |
|
| 1883 | + } |
|
| 1626 | 1884 | } |
| 1627 | 1885 | |
| 1628 | 1886 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1629 | 1887 | global $globalDBdriver; |
| 1630 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1888 | + if ($filter_name == '') { |
|
| 1889 | + $filter_name = $this->filter_name; |
|
| 1890 | + } |
|
| 1631 | 1891 | if ($globalDBdriver == 'mysql') { |
| 1632 | 1892 | $query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt"; |
| 1633 | 1893 | } else { |
@@ -1643,7 +1903,9 @@ discard block |
||
| 1643 | 1903 | } |
| 1644 | 1904 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1645 | 1905 | global $globalDBdriver; |
| 1646 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1906 | + if ($filter_name == '') { |
|
| 1907 | + $filter_name = $this->filter_name; |
|
| 1908 | + } |
|
| 1647 | 1909 | if ($globalDBdriver == 'mysql') { |
| 1648 | 1910 | $query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1649 | 1911 | } else { |
@@ -2116,27 +2378,37 @@ discard block |
||
| 2116 | 2378 | date_default_timezone_set('UTC'); |
| 2117 | 2379 | if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2118 | 2380 | $last_update = $this->getLastStatsUpdate('last_update_stats_marine'); |
| 2119 | - if ($globalDebug) echo '!!! Update Marine stats !!!'."\n"; |
|
| 2381 | + if ($globalDebug) { |
|
| 2382 | + echo '!!! Update Marine stats !!!'."\n"; |
|
| 2383 | + } |
|
| 2120 | 2384 | if (isset($last_update[0]['value'])) { |
| 2121 | 2385 | $last_update_day = $last_update[0]['value']; |
| 2122 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2386 | + } else { |
|
| 2387 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2388 | + } |
|
| 2123 | 2389 | $reset = false; |
| 2124 | 2390 | $Marine = new Marine($this->db); |
| 2125 | 2391 | $filtername = 'marine'; |
| 2126 | 2392 | if ($Connection->tableExists('countries')) { |
| 2127 | - if ($globalDebug) echo 'Count all vessels by countries...'."\n"; |
|
| 2393 | + if ($globalDebug) { |
|
| 2394 | + echo 'Count all vessels by countries...'."\n"; |
|
| 2395 | + } |
|
| 2128 | 2396 | $alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day); |
| 2129 | 2397 | foreach ($alldata as $number) { |
| 2130 | 2398 | $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset); |
| 2131 | 2399 | } |
| 2132 | 2400 | } |
| 2133 | - if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
|
| 2401 | + if ($globalDebug) { |
|
| 2402 | + echo 'Count all vessels by months...'."\n"; |
|
| 2403 | + } |
|
| 2134 | 2404 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2135 | 2405 | $filter_last_month = array('since_date' => $last_month); |
| 2136 | 2406 | $alldata = $Marine->countAllMonths($filter_last_month); |
| 2137 | 2407 | $lastyear = false; |
| 2138 | 2408 | foreach ($alldata as $number) { |
| 2139 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2409 | + if ($number['year_name'] != date('Y')) { |
|
| 2410 | + $lastyear = true; |
|
| 2411 | + } |
|
| 2140 | 2412 | $this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2141 | 2413 | } |
| 2142 | 2414 | echo 'Marine data...'."\n"; |
@@ -2172,26 +2444,36 @@ discard block |
||
| 2172 | 2444 | } |
| 2173 | 2445 | if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2174 | 2446 | $last_update = $this->getLastStatsUpdate('last_update_stats_tracker'); |
| 2175 | - if ($globalDebug) echo '!!! Update tracker stats !!!'."\n"; |
|
| 2447 | + if ($globalDebug) { |
|
| 2448 | + echo '!!! Update tracker stats !!!'."\n"; |
|
| 2449 | + } |
|
| 2176 | 2450 | if (isset($last_update[0]['value'])) { |
| 2177 | 2451 | $last_update_day = $last_update[0]['value']; |
| 2178 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2452 | + } else { |
|
| 2453 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2454 | + } |
|
| 2179 | 2455 | $reset = false; |
| 2180 | 2456 | $Tracker = new Tracker($this->db); |
| 2181 | 2457 | if ($Connection->tableExists('countries')) { |
| 2182 | - if ($globalDebug) echo 'Count all trackers by countries...'."\n"; |
|
| 2458 | + if ($globalDebug) { |
|
| 2459 | + echo 'Count all trackers by countries...'."\n"; |
|
| 2460 | + } |
|
| 2183 | 2461 | $alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day); |
| 2184 | 2462 | foreach ($alldata as $number) { |
| 2185 | 2463 | $this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset); |
| 2186 | 2464 | } |
| 2187 | 2465 | } |
| 2188 | - if ($globalDebug) echo 'Count all vessels by months...'."\n"; |
|
| 2466 | + if ($globalDebug) { |
|
| 2467 | + echo 'Count all vessels by months...'."\n"; |
|
| 2468 | + } |
|
| 2189 | 2469 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2190 | 2470 | $filter_last_month = array('since_date' => $last_month); |
| 2191 | 2471 | $alldata = $Tracker->countAllMonths($filter_last_month); |
| 2192 | 2472 | $lastyear = false; |
| 2193 | 2473 | foreach ($alldata as $number) { |
| 2194 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2474 | + if ($number['year_name'] != date('Y')) { |
|
| 2475 | + $lastyear = true; |
|
| 2476 | + } |
|
| 2195 | 2477 | $this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2196 | 2478 | } |
| 2197 | 2479 | echo 'Tracker data...'."\n"; |
@@ -2228,10 +2510,14 @@ discard block |
||
| 2228 | 2510 | |
| 2229 | 2511 | if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) { |
| 2230 | 2512 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2231 | - if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n"; |
|
| 2513 | + if ($globalDebug) { |
|
| 2514 | + echo '!!! Update aicraft stats !!!'."\n"; |
|
| 2515 | + } |
|
| 2232 | 2516 | if (isset($last_update[0]['value'])) { |
| 2233 | 2517 | $last_update_day = $last_update[0]['value']; |
| 2234 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 2518 | + } else { |
|
| 2519 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 2520 | + } |
|
| 2235 | 2521 | $reset = false; |
| 2236 | 2522 | //if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) { |
| 2237 | 2523 | if ($globalStatsResetYear) { |
@@ -2240,43 +2526,63 @@ discard block |
||
| 2240 | 2526 | } |
| 2241 | 2527 | $Spotter = new Spotter($this->db); |
| 2242 | 2528 | |
| 2243 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 2529 | + if ($globalDebug) { |
|
| 2530 | + echo 'Count all aircraft types...'."\n"; |
|
| 2531 | + } |
|
| 2244 | 2532 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
| 2245 | 2533 | foreach ($alldata as $number) { |
| 2246 | 2534 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
| 2247 | 2535 | } |
| 2248 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 2536 | + if ($globalDebug) { |
|
| 2537 | + echo 'Count all airlines...'."\n"; |
|
| 2538 | + } |
|
| 2249 | 2539 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
| 2250 | 2540 | foreach ($alldata as $number) { |
| 2251 | 2541 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
| 2252 | 2542 | } |
| 2253 | - if ($globalDebug) echo 'Count all registrations...'."\n"; |
|
| 2543 | + if ($globalDebug) { |
|
| 2544 | + echo 'Count all registrations...'."\n"; |
|
| 2545 | + } |
|
| 2254 | 2546 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
| 2255 | 2547 | foreach ($alldata as $number) { |
| 2256 | 2548 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
| 2257 | 2549 | } |
| 2258 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 2550 | + if ($globalDebug) { |
|
| 2551 | + echo 'Count all callsigns...'."\n"; |
|
| 2552 | + } |
|
| 2259 | 2553 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
| 2260 | 2554 | foreach ($alldata as $number) { |
| 2261 | 2555 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 2262 | 2556 | } |
| 2263 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 2557 | + if ($globalDebug) { |
|
| 2558 | + echo 'Count all owners...'."\n"; |
|
| 2559 | + } |
|
| 2264 | 2560 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
| 2265 | 2561 | foreach ($alldata as $number) { |
| 2266 | 2562 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
| 2267 | 2563 | } |
| 2268 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 2564 | + if ($globalDebug) { |
|
| 2565 | + echo 'Count all pilots...'."\n"; |
|
| 2566 | + } |
|
| 2269 | 2567 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
| 2270 | 2568 | foreach ($alldata as $number) { |
| 2271 | - if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
|
| 2569 | + if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') { |
|
| 2570 | + $number['pilot_id'] = $number['pilot_name']; |
|
| 2571 | + } |
|
| 2272 | 2572 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
| 2273 | 2573 | } |
| 2274 | 2574 | |
| 2275 | - if ($globalDebug) echo 'Count all departure airports...'."\n"; |
|
| 2575 | + if ($globalDebug) { |
|
| 2576 | + echo 'Count all departure airports...'."\n"; |
|
| 2577 | + } |
|
| 2276 | 2578 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 2277 | - if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
|
| 2579 | + if ($globalDebug) { |
|
| 2580 | + echo 'Count all detected departure airports...'."\n"; |
|
| 2581 | + } |
|
| 2278 | 2582 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
| 2279 | - if ($globalDebug) echo 'Order departure airports...'."\n"; |
|
| 2583 | + if ($globalDebug) { |
|
| 2584 | + echo 'Order departure airports...'."\n"; |
|
| 2585 | + } |
|
| 2280 | 2586 | $alldata = array(); |
| 2281 | 2587 | foreach ($pall as $value) { |
| 2282 | 2588 | $icao = $value['airport_departure_icao']; |
@@ -2286,7 +2592,9 @@ discard block |
||
| 2286 | 2592 | $icao = $value['airport_departure_icao']; |
| 2287 | 2593 | if (isset($alldata[$icao])) { |
| 2288 | 2594 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2289 | - } else $alldata[$icao] = $value; |
|
| 2595 | + } else { |
|
| 2596 | + $alldata[$icao] = $value; |
|
| 2597 | + } |
|
| 2290 | 2598 | } |
| 2291 | 2599 | $count = array(); |
| 2292 | 2600 | foreach ($alldata as $key => $row) { |
@@ -2296,11 +2604,17 @@ discard block |
||
| 2296 | 2604 | foreach ($alldata as $number) { |
| 2297 | 2605 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset); |
| 2298 | 2606 | } |
| 2299 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 2607 | + if ($globalDebug) { |
|
| 2608 | + echo 'Count all arrival airports...'."\n"; |
|
| 2609 | + } |
|
| 2300 | 2610 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 2301 | - if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
|
| 2611 | + if ($globalDebug) { |
|
| 2612 | + echo 'Count all detected arrival airports...'."\n"; |
|
| 2613 | + } |
|
| 2302 | 2614 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
| 2303 | - if ($globalDebug) echo 'Order arrival airports...'."\n"; |
|
| 2615 | + if ($globalDebug) { |
|
| 2616 | + echo 'Order arrival airports...'."\n"; |
|
| 2617 | + } |
|
| 2304 | 2618 | $alldata = array(); |
| 2305 | 2619 | foreach ($pall as $value) { |
| 2306 | 2620 | $icao = $value['airport_arrival_icao']; |
@@ -2310,7 +2624,9 @@ discard block |
||
| 2310 | 2624 | $icao = $value['airport_arrival_icao']; |
| 2311 | 2625 | if (isset($alldata[$icao])) { |
| 2312 | 2626 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2313 | - } else $alldata[$icao] = $value; |
|
| 2627 | + } else { |
|
| 2628 | + $alldata[$icao] = $value; |
|
| 2629 | + } |
|
| 2314 | 2630 | } |
| 2315 | 2631 | $count = array(); |
| 2316 | 2632 | foreach ($alldata as $key => $row) { |
@@ -2321,7 +2637,9 @@ discard block |
||
| 2321 | 2637 | echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset); |
| 2322 | 2638 | } |
| 2323 | 2639 | if ($Connection->tableExists('countries')) { |
| 2324 | - if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
|
| 2640 | + if ($globalDebug) { |
|
| 2641 | + echo 'Count all flights by countries...'."\n"; |
|
| 2642 | + } |
|
| 2325 | 2643 | //$SpotterArchive = new SpotterArchive(); |
| 2326 | 2644 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 2327 | 2645 | $Spotter = new Spotter($this->db); |
@@ -2332,7 +2650,9 @@ discard block |
||
| 2332 | 2650 | } |
| 2333 | 2651 | |
| 2334 | 2652 | if (isset($globalAccidents) && $globalAccidents) { |
| 2335 | - if ($globalDebug) echo 'Count fatalities stats...'."\n"; |
|
| 2653 | + if ($globalDebug) { |
|
| 2654 | + echo 'Count fatalities stats...'."\n"; |
|
| 2655 | + } |
|
| 2336 | 2656 | $Accident = new Accident($this->db); |
| 2337 | 2657 | $this->deleteStatsByType('fatalities_byyear'); |
| 2338 | 2658 | $alldata = $Accident->countFatalitiesByYear(); |
@@ -2348,48 +2668,68 @@ discard block |
||
| 2348 | 2668 | |
| 2349 | 2669 | // Add by month using getstat if month finish... |
| 2350 | 2670 | //if (date('m',strtotime($last_update_day)) != date('m')) { |
| 2351 | - if ($globalDebug) echo 'Count all flights by months...'."\n"; |
|
| 2671 | + if ($globalDebug) { |
|
| 2672 | + echo 'Count all flights by months...'."\n"; |
|
| 2673 | + } |
|
| 2352 | 2674 | $last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day))); |
| 2353 | 2675 | $filter_last_month = array('since_date' => $last_month); |
| 2354 | 2676 | $Spotter = new Spotter($this->db); |
| 2355 | 2677 | $alldata = $Spotter->countAllMonths($filter_last_month); |
| 2356 | 2678 | $lastyear = false; |
| 2357 | 2679 | foreach ($alldata as $number) { |
| 2358 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2680 | + if ($number['year_name'] != date('Y')) { |
|
| 2681 | + $lastyear = true; |
|
| 2682 | + } |
|
| 2359 | 2683 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2360 | 2684 | } |
| 2361 | - if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
|
| 2685 | + if ($globalDebug) { |
|
| 2686 | + echo 'Count all military flights by months...'."\n"; |
|
| 2687 | + } |
|
| 2362 | 2688 | $alldata = $Spotter->countAllMilitaryMonths($filter_last_month); |
| 2363 | 2689 | foreach ($alldata as $number) { |
| 2364 | 2690 | $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2365 | 2691 | } |
| 2366 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 2692 | + if ($globalDebug) { |
|
| 2693 | + echo 'Count all owners by months...'."\n"; |
|
| 2694 | + } |
|
| 2367 | 2695 | $alldata = $Spotter->countAllMonthsOwners($filter_last_month); |
| 2368 | 2696 | foreach ($alldata as $number) { |
| 2369 | 2697 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2370 | 2698 | } |
| 2371 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 2699 | + if ($globalDebug) { |
|
| 2700 | + echo 'Count all pilots by months...'."\n"; |
|
| 2701 | + } |
|
| 2372 | 2702 | $alldata = $Spotter->countAllMonthsPilots($filter_last_month); |
| 2373 | 2703 | foreach ($alldata as $number) { |
| 2374 | 2704 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2375 | 2705 | } |
| 2376 | - if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
|
| 2706 | + if ($globalDebug) { |
|
| 2707 | + echo 'Count all airlines by months...'."\n"; |
|
| 2708 | + } |
|
| 2377 | 2709 | $alldata = $Spotter->countAllMonthsAirlines($filter_last_month); |
| 2378 | 2710 | foreach ($alldata as $number) { |
| 2379 | 2711 | $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2380 | 2712 | } |
| 2381 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 2713 | + if ($globalDebug) { |
|
| 2714 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 2715 | + } |
|
| 2382 | 2716 | $alldata = $Spotter->countAllMonthsAircrafts($filter_last_month); |
| 2383 | 2717 | foreach ($alldata as $number) { |
| 2384 | 2718 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2385 | 2719 | } |
| 2386 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 2720 | + if ($globalDebug) { |
|
| 2721 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 2722 | + } |
|
| 2387 | 2723 | $alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month); |
| 2388 | 2724 | foreach ($alldata as $number) { |
| 2389 | 2725 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
| 2390 | 2726 | } |
| 2391 | - if ($globalDebug) echo 'Airports data...'."\n"; |
|
| 2392 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 2727 | + if ($globalDebug) { |
|
| 2728 | + echo 'Airports data...'."\n"; |
|
| 2729 | + } |
|
| 2730 | + if ($globalDebug) { |
|
| 2731 | + echo '...Departure'."\n"; |
|
| 2732 | + } |
|
| 2393 | 2733 | $this->deleteStatAirport('daily'); |
| 2394 | 2734 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 2395 | 2735 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
@@ -2507,7 +2847,9 @@ discard block |
||
| 2507 | 2847 | // Count by airlines |
| 2508 | 2848 | echo '--- Stats by airlines ---'."\n"; |
| 2509 | 2849 | if ($Connection->tableExists('countries')) { |
| 2510 | - if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2850 | + if ($globalDebug) { |
|
| 2851 | + echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2852 | + } |
|
| 2511 | 2853 | $SpotterArchive = new SpotterArchive($this->db); |
| 2512 | 2854 | //$Spotter = new Spotter($this->db); |
| 2513 | 2855 | $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
@@ -2516,37 +2858,53 @@ discard block |
||
| 2516 | 2858 | $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
| 2517 | 2859 | } |
| 2518 | 2860 | } |
| 2519 | - if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2861 | + if ($globalDebug) { |
|
| 2862 | + echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2863 | + } |
|
| 2520 | 2864 | $Spotter = new Spotter($this->db); |
| 2521 | 2865 | $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
| 2522 | 2866 | foreach ($alldata as $number) { |
| 2523 | 2867 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
| 2524 | 2868 | } |
| 2525 | - if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2869 | + if ($globalDebug) { |
|
| 2870 | + echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2871 | + } |
|
| 2526 | 2872 | $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
| 2527 | 2873 | foreach ($alldata as $number) { |
| 2528 | 2874 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
| 2529 | 2875 | } |
| 2530 | - if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
|
| 2876 | + if ($globalDebug) { |
|
| 2877 | + echo 'Count all callsigns by airlines...'."\n"; |
|
| 2878 | + } |
|
| 2531 | 2879 | $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
| 2532 | 2880 | foreach ($alldata as $number) { |
| 2533 | 2881 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 2534 | 2882 | } |
| 2535 | - if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
|
| 2883 | + if ($globalDebug) { |
|
| 2884 | + echo 'Count all owners by airlines...'."\n"; |
|
| 2885 | + } |
|
| 2536 | 2886 | $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
| 2537 | 2887 | foreach ($alldata as $number) { |
| 2538 | 2888 | $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
| 2539 | 2889 | } |
| 2540 | - if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
|
| 2890 | + if ($globalDebug) { |
|
| 2891 | + echo 'Count all pilots by airlines...'."\n"; |
|
| 2892 | + } |
|
| 2541 | 2893 | $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
| 2542 | 2894 | foreach ($alldata as $number) { |
| 2543 | 2895 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
| 2544 | 2896 | } |
| 2545 | - if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
|
| 2897 | + if ($globalDebug) { |
|
| 2898 | + echo 'Count all departure airports by airlines...'."\n"; |
|
| 2899 | + } |
|
| 2546 | 2900 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 2547 | - if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2901 | + if ($globalDebug) { |
|
| 2902 | + echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2903 | + } |
|
| 2548 | 2904 | $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
| 2549 | - if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2905 | + if ($globalDebug) { |
|
| 2906 | + echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2907 | + } |
|
| 2550 | 2908 | //$alldata = array(); |
| 2551 | 2909 | foreach ($dall as $value) { |
| 2552 | 2910 | $icao = $value['airport_departure_icao']; |
@@ -2567,11 +2925,17 @@ discard block |
||
| 2567 | 2925 | foreach ($alldata as $number) { |
| 2568 | 2926 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset); |
| 2569 | 2927 | } |
| 2570 | - if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2928 | + if ($globalDebug) { |
|
| 2929 | + echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2930 | + } |
|
| 2571 | 2931 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 2572 | - if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2932 | + if ($globalDebug) { |
|
| 2933 | + echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2934 | + } |
|
| 2573 | 2935 | $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
| 2574 | - if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
|
| 2936 | + if ($globalDebug) { |
|
| 2937 | + echo 'Order arrival airports by airlines...'."\n"; |
|
| 2938 | + } |
|
| 2575 | 2939 | //$alldata = array(); |
| 2576 | 2940 | foreach ($dall as $value) { |
| 2577 | 2941 | $icao = $value['airport_arrival_icao']; |
@@ -2590,37 +2954,53 @@ discard block |
||
| 2590 | 2954 | } |
| 2591 | 2955 | $alldata = $pall; |
| 2592 | 2956 | foreach ($alldata as $number) { |
| 2593 | - if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2957 | + if ($number['airline_icao'] != '') { |
|
| 2958 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 2959 | + } |
|
| 2960 | + } |
|
| 2961 | + if ($globalDebug) { |
|
| 2962 | + echo 'Count all flights by months by airlines...'."\n"; |
|
| 2594 | 2963 | } |
| 2595 | - if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
|
| 2596 | 2964 | $Spotter = new Spotter($this->db); |
| 2597 | 2965 | $alldata = $Spotter->countAllMonthsByAirlines($filter_last_month); |
| 2598 | 2966 | $lastyear = false; |
| 2599 | 2967 | foreach ($alldata as $number) { |
| 2600 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2968 | + if ($number['year_name'] != date('Y')) { |
|
| 2969 | + $lastyear = true; |
|
| 2970 | + } |
|
| 2601 | 2971 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2602 | 2972 | } |
| 2603 | - if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
|
| 2973 | + if ($globalDebug) { |
|
| 2974 | + echo 'Count all owners by months by airlines...'."\n"; |
|
| 2975 | + } |
|
| 2604 | 2976 | $alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month); |
| 2605 | 2977 | foreach ($alldata as $number) { |
| 2606 | 2978 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2607 | 2979 | } |
| 2608 | - if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2980 | + if ($globalDebug) { |
|
| 2981 | + echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2982 | + } |
|
| 2609 | 2983 | $alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month); |
| 2610 | 2984 | foreach ($alldata as $number) { |
| 2611 | 2985 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2612 | 2986 | } |
| 2613 | - if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2987 | + if ($globalDebug) { |
|
| 2988 | + echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2989 | + } |
|
| 2614 | 2990 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month); |
| 2615 | 2991 | foreach ($alldata as $number) { |
| 2616 | 2992 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2617 | 2993 | } |
| 2618 | - if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2994 | + if ($globalDebug) { |
|
| 2995 | + echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2996 | + } |
|
| 2619 | 2997 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month); |
| 2620 | 2998 | foreach ($alldata as $number) { |
| 2621 | 2999 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
| 2622 | 3000 | } |
| 2623 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 3001 | + if ($globalDebug) { |
|
| 3002 | + echo '...Departure'."\n"; |
|
| 3003 | + } |
|
| 2624 | 3004 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 2625 | 3005 | $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
| 2626 | 3006 | foreach ($dall as $value) { |
@@ -2643,7 +3023,9 @@ discard block |
||
| 2643 | 3023 | foreach ($alldata as $number) { |
| 2644 | 3024 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']); |
| 2645 | 3025 | } |
| 2646 | - if ($globalDebug) echo '...Arrival'."\n"; |
|
| 3026 | + if ($globalDebug) { |
|
| 3027 | + echo '...Arrival'."\n"; |
|
| 3028 | + } |
|
| 2647 | 3029 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 2648 | 3030 | $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
| 2649 | 3031 | foreach ($dall as $value) { |
@@ -2667,13 +3049,19 @@ discard block |
||
| 2667 | 3049 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']); |
| 2668 | 3050 | } |
| 2669 | 3051 | |
| 2670 | - if ($globalDebug) echo 'Flights data...'."\n"; |
|
| 2671 | - if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
|
| 3052 | + if ($globalDebug) { |
|
| 3053 | + echo 'Flights data...'."\n"; |
|
| 3054 | + } |
|
| 3055 | + if ($globalDebug) { |
|
| 3056 | + echo '-> countAllDatesLastMonth...'."\n"; |
|
| 3057 | + } |
|
| 2672 | 3058 | $alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month); |
| 2673 | 3059 | foreach ($alldata as $number) { |
| 2674 | 3060 | $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
| 2675 | 3061 | } |
| 2676 | - if ($globalDebug) echo '-> countAllDates...'."\n"; |
|
| 3062 | + if ($globalDebug) { |
|
| 3063 | + echo '-> countAllDates...'."\n"; |
|
| 3064 | + } |
|
| 2677 | 3065 | //$previousdata = $this->countAllDatesByAirlines(); |
| 2678 | 3066 | $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month)); |
| 2679 | 3067 | $values = array(); |
@@ -2686,14 +3074,18 @@ discard block |
||
| 2686 | 3074 | $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
| 2687 | 3075 | } |
| 2688 | 3076 | |
| 2689 | - if ($globalDebug) echo '-> countAllHours...'."\n"; |
|
| 3077 | + if ($globalDebug) { |
|
| 3078 | + echo '-> countAllHours...'."\n"; |
|
| 3079 | + } |
|
| 2690 | 3080 | $alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month); |
| 2691 | 3081 | foreach ($alldata as $number) { |
| 2692 | 3082 | $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
| 2693 | 3083 | } |
| 2694 | 3084 | |
| 2695 | 3085 | // Stats by filters |
| 2696 | - if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array(); |
|
| 3086 | + if (!isset($globalStatsFilters) || $globalStatsFilters == '') { |
|
| 3087 | + $globalStatsFilters = array(); |
|
| 3088 | + } |
|
| 2697 | 3089 | foreach ($globalStatsFilters as $name => $filter) { |
| 2698 | 3090 | if (!empty($filter)) { |
| 2699 | 3091 | //$filter_name = $filter['name']; |
@@ -2701,7 +3093,9 @@ discard block |
||
| 2701 | 3093 | $reset = false; |
| 2702 | 3094 | $last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name); |
| 2703 | 3095 | if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) { |
| 2704 | - if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 3096 | + if ($globalDebug) { |
|
| 3097 | + echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 3098 | + } |
|
| 2705 | 3099 | $this->deleteOldStats($filter_name); |
| 2706 | 3100 | unset($last_update); |
| 2707 | 3101 | } |
@@ -2718,39 +3112,55 @@ discard block |
||
| 2718 | 3112 | $reset = true; |
| 2719 | 3113 | } |
| 2720 | 3114 | // Count by filter |
| 2721 | - if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 3115 | + if ($globalDebug) { |
|
| 3116 | + echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 3117 | + } |
|
| 2722 | 3118 | $Spotter = new Spotter($this->db); |
| 2723 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 3119 | + if ($globalDebug) { |
|
| 3120 | + echo 'Count all aircraft types...'."\n"; |
|
| 3121 | + } |
|
| 2724 | 3122 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
| 2725 | 3123 | foreach ($alldata as $number) { |
| 2726 | 3124 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
| 2727 | 3125 | } |
| 2728 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 3126 | + if ($globalDebug) { |
|
| 3127 | + echo 'Count all airlines...'."\n"; |
|
| 3128 | + } |
|
| 2729 | 3129 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
| 2730 | 3130 | foreach ($alldata as $number) { |
| 2731 | 3131 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
| 2732 | 3132 | } |
| 2733 | - if ($globalDebug) echo 'Count all aircraft registrations...'."\n"; |
|
| 3133 | + if ($globalDebug) { |
|
| 3134 | + echo 'Count all aircraft registrations...'."\n"; |
|
| 3135 | + } |
|
| 2734 | 3136 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
| 2735 | 3137 | foreach ($alldata as $number) { |
| 2736 | 3138 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
| 2737 | 3139 | } |
| 2738 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 3140 | + if ($globalDebug) { |
|
| 3141 | + echo 'Count all callsigns...'."\n"; |
|
| 3142 | + } |
|
| 2739 | 3143 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
| 2740 | 3144 | foreach ($alldata as $number) { |
| 2741 | 3145 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
| 2742 | 3146 | } |
| 2743 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 3147 | + if ($globalDebug) { |
|
| 3148 | + echo 'Count all owners...'."\n"; |
|
| 3149 | + } |
|
| 2744 | 3150 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
| 2745 | 3151 | foreach ($alldata as $number) { |
| 2746 | 3152 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
| 2747 | 3153 | } |
| 2748 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 3154 | + if ($globalDebug) { |
|
| 3155 | + echo 'Count all pilots...'."\n"; |
|
| 3156 | + } |
|
| 2749 | 3157 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
| 2750 | 3158 | foreach ($alldata as $number) { |
| 2751 | 3159 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 2752 | 3160 | } |
| 2753 | - if ($globalDebug) echo 'Count departure airports...'."\n"; |
|
| 3161 | + if ($globalDebug) { |
|
| 3162 | + echo 'Count departure airports...'."\n"; |
|
| 3163 | + } |
|
| 2754 | 3164 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 2755 | 3165 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
| 2756 | 3166 | $alldata = array(); |
@@ -2762,7 +3172,9 @@ discard block |
||
| 2762 | 3172 | $icao = $value['airport_departure_icao']; |
| 2763 | 3173 | if (isset($alldata[$icao])) { |
| 2764 | 3174 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2765 | - } else $alldata[$icao] = $value; |
|
| 3175 | + } else { |
|
| 3176 | + $alldata[$icao] = $value; |
|
| 3177 | + } |
|
| 2766 | 3178 | } |
| 2767 | 3179 | $count = array(); |
| 2768 | 3180 | foreach ($alldata as $key => $row) { |
@@ -2772,7 +3184,9 @@ discard block |
||
| 2772 | 3184 | foreach ($alldata as $number) { |
| 2773 | 3185 | echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
| 2774 | 3186 | } |
| 2775 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 3187 | + if ($globalDebug) { |
|
| 3188 | + echo 'Count all arrival airports...'."\n"; |
|
| 3189 | + } |
|
| 2776 | 3190 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2777 | 3191 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2778 | 3192 | $alldata = array(); |
@@ -2784,7 +3198,9 @@ discard block |
||
| 2784 | 3198 | $icao = $value['airport_arrival_icao']; |
| 2785 | 3199 | if (isset($alldata[$icao])) { |
| 2786 | 3200 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2787 | - } else $alldata[$icao] = $value; |
|
| 3201 | + } else { |
|
| 3202 | + $alldata[$icao] = $value; |
|
| 3203 | + } |
|
| 2788 | 3204 | } |
| 2789 | 3205 | $count = array(); |
| 2790 | 3206 | foreach ($alldata as $key => $row) { |
@@ -2794,35 +3210,49 @@ discard block |
||
| 2794 | 3210 | foreach ($alldata as $number) { |
| 2795 | 3211 | echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset); |
| 2796 | 3212 | } |
| 2797 | - if ($globalDebug) echo 'Count all months...'."\n"; |
|
| 3213 | + if ($globalDebug) { |
|
| 3214 | + echo 'Count all months...'."\n"; |
|
| 3215 | + } |
|
| 2798 | 3216 | $Spotter = new Spotter($this->db); |
| 2799 | 3217 | $alldata = $Spotter->countAllMonths($filter); |
| 2800 | 3218 | $lastyear = false; |
| 2801 | 3219 | foreach ($alldata as $number) { |
| 2802 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 3220 | + if ($number['year_name'] != date('Y')) { |
|
| 3221 | + $lastyear = true; |
|
| 3222 | + } |
|
| 2803 | 3223 | $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2804 | 3224 | } |
| 2805 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 3225 | + if ($globalDebug) { |
|
| 3226 | + echo 'Count all owners by months...'."\n"; |
|
| 3227 | + } |
|
| 2806 | 3228 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2807 | 3229 | foreach ($alldata as $number) { |
| 2808 | 3230 | $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2809 | 3231 | } |
| 2810 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 3232 | + if ($globalDebug) { |
|
| 3233 | + echo 'Count all pilots by months...'."\n"; |
|
| 3234 | + } |
|
| 2811 | 3235 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2812 | 3236 | foreach ($alldata as $number) { |
| 2813 | 3237 | $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2814 | 3238 | } |
| 2815 | - if ($globalDebug) echo 'Count all military by months...'."\n"; |
|
| 3239 | + if ($globalDebug) { |
|
| 3240 | + echo 'Count all military by months...'."\n"; |
|
| 3241 | + } |
|
| 2816 | 3242 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2817 | 3243 | foreach ($alldata as $number) { |
| 2818 | 3244 | $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2819 | 3245 | } |
| 2820 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 3246 | + if ($globalDebug) { |
|
| 3247 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 3248 | + } |
|
| 2821 | 3249 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2822 | 3250 | foreach ($alldata as $number) { |
| 2823 | 3251 | $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
| 2824 | 3252 | } |
| 2825 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 3253 | + if ($globalDebug) { |
|
| 3254 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 3255 | + } |
|
| 2826 | 3256 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2827 | 3257 | foreach ($alldata as $number) { |
| 2828 | 3258 | $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
