Ysurac /
FlightAirMap
@@ -5,8 +5,11 @@ discard block |
||
| 5 | 5 | $file_path = pathinfo($_SERVER['SCRIPT_NAME']); |
| 6 | 6 | $current_page = $file_path['filename']; |
| 7 | 7 | date_default_timezone_set($globalTimezone); |
| 8 | -if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType']; |
|
| 9 | -else $MapType = $globalMapProvider; |
|
| 8 | +if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') { |
|
| 9 | + $MapType = $_COOKIE['MapType']; |
|
| 10 | +} else { |
|
| 11 | + $MapType = $globalMapProvider; |
|
| 12 | +} |
|
| 10 | 13 | ?> |
| 11 | 14 | <!DOCTYPE html> |
| 12 | 15 | <html> |
@@ -181,7 +184,13 @@ discard block |
||
| 181 | 184 | <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script> |
| 182 | 185 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 183 | 186 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 184 | -<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 187 | +<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) { |
|
| 188 | + print '&latitude='.$latitude; |
|
| 189 | +} |
|
| 190 | +?><?php if(isset($longitude)) { |
|
| 191 | + print '&longitude='.$longitude; |
|
| 192 | +} |
|
| 193 | +?>&<?php print time(); ?>"></script> |
|
| 185 | 194 | <?php |
| 186 | 195 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
| 187 | 196 | ?> |
@@ -235,7 +244,13 @@ discard block |
||
| 235 | 244 | <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script> |
| 236 | 245 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
| 237 | 246 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
| 238 | -<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
| 247 | +<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) { |
|
| 248 | + print '&latitude='.$latitude; |
|
| 249 | +} |
|
| 250 | +?><?php if(isset($longitude)) { |
|
| 251 | + print '&longitude='.$longitude; |
|
| 252 | +} |
|
| 253 | +?>&<?php print time(); ?>"></script> |
|
| 239 | 254 | <?php |
| 240 | 255 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
| 241 | 256 | ?> |
@@ -308,7 +323,12 @@ discard block |
||
| 308 | 323 | <span class="icon-bar"></span> |
| 309 | 324 | </button> |
| 310 | 325 | <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a> |
| 311 | - <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a> |
|
| 326 | + <a class="navbar-brand" href="<?php if ($globalURL == '') { |
|
| 327 | + print '/'; |
|
| 328 | +} else { |
|
| 329 | + print $globalURL; |
|
| 330 | +} |
|
| 331 | +?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a> |
|
| 312 | 332 | </div> |
| 313 | 333 | <div class="collapse navbar-collapse"> |
| 314 | 334 | <ul class="nav navbar-nav"> |
@@ -386,7 +406,9 @@ discard block |
||
| 386 | 406 | $alllang = $Language->getLanguages(); |
| 387 | 407 | foreach ($alllang as $key => $lang) { |
| 388 | 408 | print '<option value="'.$key.'"'; |
| 389 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
| 409 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) { |
|
| 410 | + print ' selected '; |
|
| 411 | + } |
|
| 390 | 412 | print '>'.$lang[0].'</option>'; |
| 391 | 413 | } |
| 392 | 414 | ?> |
@@ -533,4 +555,7 @@ discard block |
||
| 533 | 555 | |
| 534 | 556 | ?> |
| 535 | 557 | |
| 536 | -<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear"> |
|
| 558 | +<section class="container main-content <?php if (strtolower($current_page) == 'index') { |
|
| 559 | + print 'index '; |
|
| 560 | +} |
|
| 561 | +?>clear"> |
|
@@ -16,7 +16,9 @@ discard block |
||
| 16 | 16 | print '<h1>'._("Aircrafts Types").'</h1>'; |
| 17 | 17 | |
| 18 | 18 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 19 | - if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 19 | + if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') { |
|
| 20 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
| 21 | + } |
|
| 20 | 22 | $previous = null; |
| 21 | 23 | print '<div class="alphabet-legend">'; |
| 22 | 24 | foreach($aircraft_types as $value) { |
@@ -24,7 +26,9 @@ discard block |
||
| 24 | 26 | $firstLetter = substr($value['aircraft_manufacturer'], 0, 1); |
| 25 | 27 | if($previous !== $firstLetter) |
| 26 | 28 | { |
| 27 | - if ($previous !== null) print ' | '; |
|
| 29 | + if ($previous !== null) { |
|
| 30 | + print ' | '; |
|
| 31 | + } |
|
| 28 | 32 | print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>'; |
| 29 | 33 | } |
| 30 | 34 | $previous = $firstLetter; |
@@ -38,7 +42,9 @@ discard block |
||
| 38 | 42 | { |
| 39 | 43 | if($previous !== $firstLetter) |
| 40 | 44 | { |
| 41 | - if ($previous !== null) print '</div>'; |
|
| 45 | + if ($previous !== null) { |
|
| 46 | + print '</div>'; |
|
| 47 | + } |
|
| 42 | 48 | print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">'; |
| 43 | 49 | } |
| 44 | 50 | $previous = $firstLetter; |
@@ -339,7 +339,9 @@ discard block |
||
| 339 | 339 | if (isset($globalTimezone)) |
| 340 | 340 | { |
| 341 | 341 | date_default_timezone_set($globalTimezone); |
| 342 | - } else date_default_timezone_set('UTC'); |
|
| 342 | + } else { |
|
| 343 | + date_default_timezone_set('UTC'); |
|
| 344 | + } |
|
| 343 | 345 | if ($showSpecial === true) |
| 344 | 346 | { |
| 345 | 347 | print '<tr class="special">'."\n"; |
@@ -358,8 +360,9 @@ discard block |
||
| 358 | 360 | print '<td class="aircraft_thumbnail">'."\n"; |
| 359 | 361 | |
| 360 | 362 | if ($spotter_item['image_source'] == 'planespotters') { |
| 361 | - if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website']; |
|
| 362 | - else { |
|
| 363 | + if ($spotter_item['image_source_website'] != '') { |
|
| 364 | + $image_src = $spotter_item['image_source_website']; |
|
| 365 | + } else { |
|
| 363 | 366 | $planespotter_url_array = explode("_", $spotter_item['image']); |
| 364 | 367 | $planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]); |
| 365 | 368 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
@@ -372,7 +375,9 @@ discard block |
||
| 372 | 375 | } else { |
| 373 | 376 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 374 | 377 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
| 375 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
| 378 | + } else { |
|
| 379 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
| 380 | + } |
|
| 376 | 381 | if (isset($spotter_item['airline_name'])) { |
| 377 | 382 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
| 378 | 383 | } else { |
@@ -395,8 +400,9 @@ discard block |
||
| 395 | 400 | print '<td class="aircraft_thumbnail">'."\n"; |
| 396 | 401 | //print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>'; |
| 397 | 402 | if ($spotter_item['image_source'] == 'planespotters') { |
| 398 | - if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website']; |
|
| 399 | - else { |
|
| 403 | + if ($spotter_item['image_source_website'] != '') { |
|
| 404 | + $image_src = $spotter_item['image_source_website']; |
|
| 405 | + } else { |
|
| 400 | 406 | $planespotter_url_array = explode("_", $spotter_array[0]['image']); |
| 401 | 407 | $planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]); |
| 402 | 408 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
@@ -413,7 +419,9 @@ discard block |
||
| 413 | 419 | } else { |
| 414 | 420 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 415 | 421 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
| 416 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
| 422 | + } else { |
|
| 423 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
| 424 | + } |
|
| 417 | 425 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 418 | 426 | print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
| 419 | 427 | } elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) { |
@@ -494,15 +502,21 @@ discard block |
||
| 494 | 502 | if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) { |
| 495 | 503 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 496 | 504 | $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
| 497 | - } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 505 | + } else { |
|
| 506 | + $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 507 | + } |
|
| 498 | 508 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 499 | 509 | $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
| 500 | - } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
| 510 | + } else { |
|
| 511 | + $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
| 512 | + } |
|
| 501 | 513 | print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n"; |
| 502 | 514 | } elseif (isset($spotter_item['real_departure_airport_time'])) { |
| 503 | 515 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 504 | 516 | $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
| 505 | - } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
| 517 | + } else { |
|
| 518 | + $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
| 519 | + } |
|
| 506 | 520 | print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n"; |
| 507 | 521 | } elseif (isset($spotter_item['departure_airport_time'])) { |
| 508 | 522 | if ($spotter_item['departure_airport_time'] > 2460) { |
@@ -524,7 +538,9 @@ discard block |
||
| 524 | 538 | $longitude = $spotter_item['longitude']; |
| 525 | 539 | } |
| 526 | 540 | $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude); |
| 527 | - } else $distance = ''; |
|
| 541 | + } else { |
|
| 542 | + $distance = ''; |
|
| 543 | + } |
|
| 528 | 544 | if ($distance != '') { |
| 529 | 545 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 530 | 546 | echo '<br/><i>'.round($distance*0.539957).' nm</i>'; |
@@ -549,7 +565,9 @@ discard block |
||
| 549 | 565 | } else { |
| 550 | 566 | if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) { |
| 551 | 567 | print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n"; |
| 552 | - if (!isset($Spotter)) $Spotter = new Spotter(); |
|
| 568 | + if (!isset($Spotter)) { |
|
| 569 | + $Spotter = new Spotter(); |
|
| 570 | + } |
|
| 553 | 571 | $arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']); |
| 554 | 572 | print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n"; |
| 555 | 573 | print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n"; |
@@ -565,20 +583,28 @@ discard block |
||
| 565 | 583 | if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) { |
| 566 | 584 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 567 | 585 | $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
| 568 | - } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
| 586 | + } else { |
|
| 587 | + $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
| 588 | + } |
|
| 569 | 589 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 570 | 590 | $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
| 571 | - } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
| 591 | + } else { |
|
| 592 | + $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
| 593 | + } |
|
| 572 | 594 | print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n"; |
| 573 | 595 | } elseif (isset($spotter_item['real_arrival_airport_time'])) { |
| 574 | 596 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 575 | 597 | $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
| 576 | - } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
| 598 | + } else { |
|
| 599 | + $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
| 600 | + } |
|
| 577 | 601 | print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n"; |
| 578 | 602 | } elseif (isset($spotter_item['arrival_airport_time'])) { |
| 579 | 603 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 580 | 604 | $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
| 581 | - } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
| 605 | + } else { |
|
| 606 | + $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
| 607 | + } |
|
| 582 | 608 | print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n"; |
| 583 | 609 | } |
| 584 | 610 | if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
@@ -591,7 +617,9 @@ discard block |
||
| 591 | 617 | $longitude = $spotter_item['longitude']; |
| 592 | 618 | } |
| 593 | 619 | $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude); |
| 594 | - } else $distance = ''; |
|
| 620 | + } else { |
|
| 621 | + $distance = ''; |
|
| 622 | + } |
|
| 595 | 623 | if ($distance != '') { |
| 596 | 624 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 597 | 625 | echo '<br/><i>'.round($distance*0.539957).' nm</i>'; |
@@ -9,7 +9,10 @@ |
||
| 9 | 9 | <?php |
| 10 | 10 | } |
| 11 | 11 | ?> |
| 12 | - <span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source & Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span> |
|
| 12 | + <span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) { |
|
| 13 | + print $globalURL; |
|
| 14 | +} |
|
| 15 | +?>/about#source">Source & Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span> |
|
| 13 | 16 | </footer> |
| 14 | 17 | |
| 15 | 18 | <div class="notifications bottom-left"></div> |
@@ -1015,8 +1015,11 @@ discard block |
||
| 1015 | 1015 | $data = file_get_contents($filename); |
| 1016 | 1016 | preg_match_all("/%%(.+?)%%/is", $data, $matches); |
| 1017 | 1017 | //print_r($matches); |
| 1018 | - if (isset($matches[1])) return $matches[1]; |
|
| 1019 | - else return array(); |
|
| 1018 | + if (isset($matches[1])) { |
|
| 1019 | + return $matches[1]; |
|
| 1020 | + } else { |
|
| 1021 | + return array(); |
|
| 1022 | + } |
|
| 1020 | 1023 | } |
| 1021 | 1024 | public function getAllNOTAMbyScope($scope) { |
| 1022 | 1025 | global $globalDBdriver; |
@@ -1043,7 +1046,9 @@ discard block |
||
| 1043 | 1046 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1044 | 1047 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1045 | 1048 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1046 | - } else return array(); |
|
| 1049 | + } else { |
|
| 1050 | + return array(); |
|
| 1051 | + } |
|
| 1047 | 1052 | if ($globalDBdriver == 'mysql') { |
| 1048 | 1053 | $query = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP()'; |
| 1049 | 1054 | } else { |
@@ -1067,7 +1072,9 @@ discard block |
||
| 1067 | 1072 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1068 | 1073 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1069 | 1074 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1070 | - } else return array(); |
|
| 1075 | + } else { |
|
| 1076 | + return array(); |
|
| 1077 | + } |
|
| 1071 | 1078 | if ($globalDBdriver == 'mysql') { |
| 1072 | 1079 | $query = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope'; |
| 1073 | 1080 | } else { |
@@ -1094,8 +1101,11 @@ discard block |
||
| 1094 | 1101 | return "error : ".$e->getMessage(); |
| 1095 | 1102 | } |
| 1096 | 1103 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1097 | - if (isset($all[0])) return $all[0]; |
|
| 1098 | - else return array(); |
|
| 1104 | + if (isset($all[0])) { |
|
| 1105 | + return $all[0]; |
|
| 1106 | + } else { |
|
| 1107 | + return array(); |
|
| 1108 | + } |
|
| 1099 | 1109 | } |
| 1100 | 1110 | |
| 1101 | 1111 | public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) { |
@@ -1173,7 +1183,9 @@ discard block |
||
| 1173 | 1183 | foreach ($alldata as $initial_data) { |
| 1174 | 1184 | $data = $this->parse($initial_data); |
| 1175 | 1185 | $notamref = $this->getNOTAMbyRef($data['ref']); |
| 1176 | - if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 1186 | + if (count($notamref) == 0) { |
|
| 1187 | + $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 1188 | + } |
|
| 1177 | 1189 | } |
| 1178 | 1190 | } |
| 1179 | 1191 | } |
@@ -1186,7 +1198,9 @@ discard block |
||
| 1186 | 1198 | foreach ($alldata as $initial_data) { |
| 1187 | 1199 | $data = $this->parse($initial_data); |
| 1188 | 1200 | $notamref = $this->getNOTAMbyRef($data['ref']); |
| 1189 | - if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 1201 | + if (!isset($notamref['notam_id'])) { |
|
| 1202 | + $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 1203 | + } |
|
| 1190 | 1204 | } |
| 1191 | 1205 | } |
| 1192 | 1206 | } |
@@ -1198,11 +1212,15 @@ discard block |
||
| 1198 | 1212 | foreach (array_chunk($allairports,20) as $airport) { |
| 1199 | 1213 | $airports_icao = array(); |
| 1200 | 1214 | foreach($airport as $icao) { |
| 1201 | - if (isset($icao['icao'])) $airports_icao[] = $icao['icao']; |
|
| 1215 | + if (isset($icao['icao'])) { |
|
| 1216 | + $airports_icao[] = $icao['icao']; |
|
| 1217 | + } |
|
| 1202 | 1218 | } |
| 1203 | 1219 | $airport_icao = implode(',',$airports_icao); |
| 1204 | 1220 | $alldata = $this->downloadNOTAM($airport_icao); |
| 1205 | - if ($globalTransaction) $this->db->beginTransaction(); |
|
| 1221 | + if ($globalTransaction) { |
|
| 1222 | + $this->db->beginTransaction(); |
|
| 1223 | + } |
|
| 1206 | 1224 | if (count($alldata) > 0) { |
| 1207 | 1225 | foreach ($alldata as $initial_data) { |
| 1208 | 1226 | //print_r($initial_data); |
@@ -1211,14 +1229,23 @@ discard block |
||
| 1211 | 1229 | if (isset($data['ref'])) { |
| 1212 | 1230 | $notamref = $this->getNOTAMbyRef($data['ref']); |
| 1213 | 1231 | if (count($notamref) == 0) { |
| 1214 | - if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']); |
|
| 1215 | - if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']); |
|
| 1216 | - elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 1232 | + if (isset($data['ref_replaced'])) { |
|
| 1233 | + $this->deleteNOTAMbyRef($data['ref_replaced']); |
|
| 1234 | + } |
|
| 1235 | + if (isset($data['ref_cancelled'])) { |
|
| 1236 | + $this->deleteNOTAMbyRef($data['ref_cancelled']); |
|
| 1237 | + } elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) { |
|
| 1238 | + echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 1239 | + } |
|
| 1217 | 1240 | } |
| 1218 | 1241 | } |
| 1219 | 1242 | } |
| 1220 | - } else echo 'Error on download. Nothing matches for '.$airport_icao."\n"; |
|
| 1221 | - if ($globalTransaction) $this->db->commit(); |
|
| 1243 | + } else { |
|
| 1244 | + echo 'Error on download. Nothing matches for '.$airport_icao."\n"; |
|
| 1245 | + } |
|
| 1246 | + if ($globalTransaction) { |
|
| 1247 | + $this->db->commit(); |
|
| 1248 | + } |
|
| 1222 | 1249 | sleep(5); |
| 1223 | 1250 | } |
| 1224 | 1251 | } |
@@ -1231,8 +1258,11 @@ discard block |
||
| 1231 | 1258 | $data = $Common->getData($url); |
| 1232 | 1259 | preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches); |
| 1233 | 1260 | //print_r($matches); |
| 1234 | - if (isset($matches[1])) return $matches[1]; |
|
| 1235 | - else return array(); |
|
| 1261 | + if (isset($matches[1])) { |
|
| 1262 | + return $matches[1]; |
|
| 1263 | + } else { |
|
| 1264 | + return array(); |
|
| 1265 | + } |
|
| 1236 | 1266 | } |
| 1237 | 1267 | |
| 1238 | 1268 | public function parse($data) { |
@@ -1255,89 +1285,145 @@ discard block |
||
| 1255 | 1285 | $rules = str_split($matches[3]); |
| 1256 | 1286 | foreach ($rules as $rule) { |
| 1257 | 1287 | if ($rule == 'I') { |
| 1258 | - if (isset($result['rules'])) $result['rules'] = $result['rules'].'/IFR'; |
|
| 1259 | - else $result['rules'] = 'IFR'; |
|
| 1288 | + if (isset($result['rules'])) { |
|
| 1289 | + $result['rules'] = $result['rules'].'/IFR'; |
|
| 1290 | + } else { |
|
| 1291 | + $result['rules'] = 'IFR'; |
|
| 1292 | + } |
|
| 1260 | 1293 | } elseif ($rule == 'V') { |
| 1261 | - if (isset($result['rules'])) $result['rules'] = $result['rules'].'/VFR'; |
|
| 1262 | - else $result['rules'] = 'VFR'; |
|
| 1294 | + if (isset($result['rules'])) { |
|
| 1295 | + $result['rules'] = $result['rules'].'/VFR'; |
|
| 1296 | + } else { |
|
| 1297 | + $result['rules'] = 'VFR'; |
|
| 1298 | + } |
|
| 1263 | 1299 | } elseif ($rule == 'K') { |
| 1264 | - if (isset($result['rules'])) $result['rules'] = $result['rules'].'/Checklist'; |
|
| 1265 | - else $result['rules'] = 'Checklist'; |
|
| 1300 | + if (isset($result['rules'])) { |
|
| 1301 | + $result['rules'] = $result['rules'].'/Checklist'; |
|
| 1302 | + } else { |
|
| 1303 | + $result['rules'] = 'Checklist'; |
|
| 1304 | + } |
|
| 1266 | 1305 | } |
| 1267 | 1306 | } |
| 1268 | 1307 | $attentions = str_split($matches[4]); |
| 1269 | 1308 | foreach ($attentions as $attention) { |
| 1270 | 1309 | if ($attention == 'N') { |
| 1271 | - if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Immediate attention'; |
|
| 1272 | - else $result['rules'] = 'Immediate attention'; |
|
| 1310 | + if (isset($result['attention'])) { |
|
| 1311 | + $result['attention'] = $result['attention'].' / Immediate attention'; |
|
| 1312 | + } else { |
|
| 1313 | + $result['rules'] = 'Immediate attention'; |
|
| 1314 | + } |
|
| 1273 | 1315 | } elseif ($attention == 'B') { |
| 1274 | - if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Operational significance'; |
|
| 1275 | - else $result['rules'] = 'Operational significance'; |
|
| 1316 | + if (isset($result['attention'])) { |
|
| 1317 | + $result['attention'] = $result['attention'].' / Operational significance'; |
|
| 1318 | + } else { |
|
| 1319 | + $result['rules'] = 'Operational significance'; |
|
| 1320 | + } |
|
| 1276 | 1321 | } elseif ($attention == 'O') { |
| 1277 | - if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Flight operations'; |
|
| 1278 | - else $result['rules'] = 'Flight operations'; |
|
| 1322 | + if (isset($result['attention'])) { |
|
| 1323 | + $result['attention'] = $result['attention'].' / Flight operations'; |
|
| 1324 | + } else { |
|
| 1325 | + $result['rules'] = 'Flight operations'; |
|
| 1326 | + } |
|
| 1279 | 1327 | } elseif ($attention == 'M') { |
| 1280 | - if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Misc'; |
|
| 1281 | - else $result['rules'] = 'Misc'; |
|
| 1328 | + if (isset($result['attention'])) { |
|
| 1329 | + $result['attention'] = $result['attention'].' / Misc'; |
|
| 1330 | + } else { |
|
| 1331 | + $result['rules'] = 'Misc'; |
|
| 1332 | + } |
|
| 1282 | 1333 | } elseif ($attention == 'K') { |
| 1283 | - if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Checklist'; |
|
| 1284 | - else $result['rules'] = 'Checklist'; |
|
| 1334 | + if (isset($result['attention'])) { |
|
| 1335 | + $result['attention'] = $result['attention'].' / Checklist'; |
|
| 1336 | + } else { |
|
| 1337 | + $result['rules'] = 'Checklist'; |
|
| 1338 | + } |
|
| 1285 | 1339 | } |
| 1286 | 1340 | } |
| 1287 | - if ($matches[5] == 'A') $result['scope'] = 'Airport warning'; |
|
| 1288 | - elseif ($matches[5] == 'E') $result['scope'] = 'Enroute warning'; |
|
| 1289 | - elseif ($matches[5] == 'W') $result['scope'] = 'Navigation warning'; |
|
| 1290 | - elseif ($matches[5] == 'K') $result['scope'] = 'Checklist'; |
|
| 1291 | - elseif ($matches[5] == 'AE') $result['scope'] = 'Airport/Enroute warning'; |
|
| 1292 | - elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning'; |
|
| 1341 | + if ($matches[5] == 'A') { |
|
| 1342 | + $result['scope'] = 'Airport warning'; |
|
| 1343 | + } elseif ($matches[5] == 'E') { |
|
| 1344 | + $result['scope'] = 'Enroute warning'; |
|
| 1345 | + } elseif ($matches[5] == 'W') { |
|
| 1346 | + $result['scope'] = 'Navigation warning'; |
|
| 1347 | + } elseif ($matches[5] == 'K') { |
|
| 1348 | + $result['scope'] = 'Checklist'; |
|
| 1349 | + } elseif ($matches[5] == 'AE') { |
|
| 1350 | + $result['scope'] = 'Airport/Enroute warning'; |
|
| 1351 | + } elseif ($matches[5] == 'AW') { |
|
| 1352 | + $result['scope'] = 'Airport/Navigation warning'; |
|
| 1353 | + } |
|
| 1293 | 1354 | $result['lower_limit'] = $matches[6]; |
| 1294 | 1355 | $result['upper_limit'] = $matches[7]; |
| 1295 | 1356 | $latitude = $Common->convertDec($matches[8],'latitude'); |
| 1296 | - if ($matches[9] == 'S') $latitude = -$latitude; |
|
| 1357 | + if ($matches[9] == 'S') { |
|
| 1358 | + $latitude = -$latitude; |
|
| 1359 | + } |
|
| 1297 | 1360 | $longitude = $Common->convertDec($matches[10],'longitude'); |
| 1298 | - if ($matches[11] == 'W') $longitude = -$longitude; |
|
| 1361 | + if ($matches[11] == 'W') { |
|
| 1362 | + $longitude = -$longitude; |
|
| 1363 | + } |
|
| 1299 | 1364 | $result['latitude'] = $latitude; |
| 1300 | 1365 | $result['longitude'] = $longitude; |
| 1301 | 1366 | $result['radius'] = intval($matches[12]); |
| 1302 | - } else echo 'ERROR : '.$line."\n"; |
|
| 1303 | - } |
|
| 1304 | - elseif (preg_match('#A\) (.*)#',$line,$matches)) { |
|
| 1367 | + } else { |
|
| 1368 | + echo 'ERROR : '.$line."\n"; |
|
| 1369 | + } |
|
| 1370 | + } elseif (preg_match('#A\) (.*)#',$line,$matches)) { |
|
| 1305 | 1371 | $result['icao'] = $matches[1]; |
| 1306 | - } |
|
| 1307 | - elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) { |
|
| 1308 | - if ($matches[1] > 50) $year = '19'.$matches[1]; |
|
| 1309 | - else $year = '20'.$matches[1]; |
|
| 1372 | + } elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) { |
|
| 1373 | + if ($matches[1] > 50) { |
|
| 1374 | + $year = '19'.$matches[1]; |
|
| 1375 | + } else { |
|
| 1376 | + $year = '20'.$matches[1]; |
|
| 1377 | + } |
|
| 1310 | 1378 | $result['date_begin'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5]; |
| 1311 | - } |
|
| 1312 | - elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) { |
|
| 1313 | - if ($matches[1] > 50) $year = '19'.$matches[1]; |
|
| 1314 | - else $year = '20'.$matches[1]; |
|
| 1379 | + } elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) { |
|
| 1380 | + if ($matches[1] > 50) { |
|
| 1381 | + $year = '19'.$matches[1]; |
|
| 1382 | + } else { |
|
| 1383 | + $year = '20'.$matches[1]; |
|
| 1384 | + } |
|
| 1315 | 1385 | $result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5]; |
| 1316 | 1386 | $result['permanent'] = 0; |
| 1317 | - } |
|
| 1318 | - elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) { |
|
| 1319 | - if ($matches[1] > 50) $year = '19'.$matches[1]; |
|
| 1320 | - else $year = '20'.$matches[1]; |
|
| 1387 | + } elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) { |
|
| 1388 | + if ($matches[1] > 50) { |
|
| 1389 | + $year = '19'.$matches[1]; |
|
| 1390 | + } else { |
|
| 1391 | + $year = '20'.$matches[1]; |
|
| 1392 | + } |
|
| 1321 | 1393 | $result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5]; |
| 1322 | - if ($matches[6] == 'EST') $result['estimated'] = 1; |
|
| 1323 | - else $result['estimated'] = 0; |
|
| 1324 | - if ($matches[6] == 'PERM') $result['permanent'] = 1; |
|
| 1325 | - else $result['permanent'] = 0; |
|
| 1326 | - } |
|
| 1327 | - elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) { |
|
| 1394 | + if ($matches[6] == 'EST') { |
|
| 1395 | + $result['estimated'] = 1; |
|
| 1396 | + } else { |
|
| 1397 | + $result['estimated'] = 0; |
|
| 1398 | + } |
|
| 1399 | + if ($matches[6] == 'PERM') { |
|
| 1400 | + $result['permanent'] = 1; |
|
| 1401 | + } else { |
|
| 1402 | + $result['permanent'] = 0; |
|
| 1403 | + } |
|
| 1404 | + } elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) { |
|
| 1328 | 1405 | $result['date_end'] = '2030/12/20 12:00'; |
| 1329 | - if ($matches[1] == 'EST') $result['estimated'] = 1; |
|
| 1330 | - else $result['estimated'] = 0; |
|
| 1331 | - if ($matches[1] == 'PERM') $result['permanent'] = 1; |
|
| 1332 | - else $result['permanent'] = 0; |
|
| 1333 | - } |
|
| 1334 | - elseif (preg_match('#E\) (.*)#',$line,$matches)) { |
|
| 1406 | + if ($matches[1] == 'EST') { |
|
| 1407 | + $result['estimated'] = 1; |
|
| 1408 | + } else { |
|
| 1409 | + $result['estimated'] = 0; |
|
| 1410 | + } |
|
| 1411 | + if ($matches[1] == 'PERM') { |
|
| 1412 | + $result['permanent'] = 1; |
|
| 1413 | + } else { |
|
| 1414 | + $result['permanent'] = 0; |
|
| 1415 | + } |
|
| 1416 | + } elseif (preg_match('#E\) (.*)#',$line,$matches)) { |
|
| 1335 | 1417 | $rtext = array(); |
| 1336 | 1418 | $text = explode(' ',$matches[1]); |
| 1337 | 1419 | foreach ($text as $word) { |
| 1338 | - if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]); |
|
| 1339 | - elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3); |
|
| 1340 | - else $rtext[] = $word; |
|
| 1420 | + if (isset($this->abbr[$word])) { |
|
| 1421 | + $rtext[] = strtoupper($this->abbr[$word]); |
|
| 1422 | + } elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) { |
|
| 1423 | + $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3); |
|
| 1424 | + } else { |
|
| 1425 | + $rtext[] = $word; |
|
| 1426 | + } |
|
| 1341 | 1427 | } |
| 1342 | 1428 | $result['text'] = implode(' ',$rtext); |
| 1343 | 1429 | //} elseif (preg_match('#F\) (.*)#',$line,$matches)) { |
@@ -1345,7 +1431,9 @@ discard block |
||
| 1345 | 1431 | } elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) { |
| 1346 | 1432 | $text = explode(' ',$line); |
| 1347 | 1433 | $result['ref'] = $text[0]; |
| 1348 | - if ($matches[1] == 'NOTAMN') $result['type'] = 'new'; |
|
| 1434 | + if ($matches[1] == 'NOTAMN') { |
|
| 1435 | + $result['type'] = 'new'; |
|
| 1436 | + } |
|
| 1349 | 1437 | if ($matches[1] == 'NOTAMC') { |
| 1350 | 1438 | $result['type'] = 'cancel'; |
| 1351 | 1439 | $result['ref_cancelled'] = $text[2]; |
@@ -1367,69 +1455,101 @@ discard block |
||
| 1367 | 1455 | switch ($code[1]) { |
| 1368 | 1456 | case 'A': |
| 1369 | 1457 | $result = 'Airspace organization '; |
| 1370 | - if (isset($this->code_airspace[$code_fp])) $result .= $this->code_airspace[$code_fp]; |
|
| 1458 | + if (isset($this->code_airspace[$code_fp])) { |
|
| 1459 | + $result .= $this->code_airspace[$code_fp]; |
|
| 1460 | + } |
|
| 1371 | 1461 | break; |
| 1372 | 1462 | case 'C': |
| 1373 | 1463 | $result = 'Communications and radar facilities '; |
| 1374 | - if (isset($this->code_comradar[$code_fp])) $result .= $this->code_comradar[$code_fp]; |
|
| 1464 | + if (isset($this->code_comradar[$code_fp])) { |
|
| 1465 | + $result .= $this->code_comradar[$code_fp]; |
|
| 1466 | + } |
|
| 1375 | 1467 | break; |
| 1376 | 1468 | case 'F': |
| 1377 | 1469 | $result = 'Facilities and services '; |
| 1378 | - if (isset($this->code_facilities[$code_fp])) $result .= $this->code_facilities[$code_fp]; |
|
| 1470 | + if (isset($this->code_facilities[$code_fp])) { |
|
| 1471 | + $result .= $this->code_facilities[$code_fp]; |
|
| 1472 | + } |
|
| 1379 | 1473 | break; |
| 1380 | 1474 | case 'I': |
| 1381 | 1475 | $result = 'Instrument and Microwave Landing System '; |
| 1382 | - if (isset($this->code_instrumentlanding[$code_fp])) $result .= $this->code_instrumentlanding[$code_fp]; |
|
| 1476 | + if (isset($this->code_instrumentlanding[$code_fp])) { |
|
| 1477 | + $result .= $this->code_instrumentlanding[$code_fp]; |
|
| 1478 | + } |
|
| 1383 | 1479 | break; |
| 1384 | 1480 | case 'L': |
| 1385 | 1481 | $result = 'Lighting facilities '; |
| 1386 | - if (isset($this->code_lightingfacilities[$code_fp])) $result .= $this->code_lightingfacilities[$code_fp]; |
|
| 1482 | + if (isset($this->code_lightingfacilities[$code_fp])) { |
|
| 1483 | + $result .= $this->code_lightingfacilities[$code_fp]; |
|
| 1484 | + } |
|
| 1387 | 1485 | break; |
| 1388 | 1486 | case 'M': |
| 1389 | 1487 | $result = 'Movement and landing areas '; |
| 1390 | - if (isset($this->code_movementareas[$code_fp])) $result .= $this->code_movementareas[$code_fp]; |
|
| 1488 | + if (isset($this->code_movementareas[$code_fp])) { |
|
| 1489 | + $result .= $this->code_movementareas[$code_fp]; |
|
| 1490 | + } |
|
| 1391 | 1491 | break; |
| 1392 | 1492 | case 'N': |
| 1393 | 1493 | $result = 'Terminal and En Route Navigation Facilities '; |
| 1394 | - if (isset($this->code_terminalfacilities[$code_fp])) $result .= $this->code_terminalfacilities[$code_fp]; |
|
| 1494 | + if (isset($this->code_terminalfacilities[$code_fp])) { |
|
| 1495 | + $result .= $this->code_terminalfacilities[$code_fp]; |
|
| 1496 | + } |
|
| 1395 | 1497 | break; |
| 1396 | 1498 | case 'O': |
| 1397 | 1499 | $result = 'Other information '; |
| 1398 | - if (isset($this->code_information[$code_fp])) $result .= $this->code_information[$code_fp]; |
|
| 1500 | + if (isset($this->code_information[$code_fp])) { |
|
| 1501 | + $result .= $this->code_information[$code_fp]; |
|
| 1502 | + } |
|
| 1399 | 1503 | break; |
| 1400 | 1504 | case 'P': |
| 1401 | 1505 | $result = 'Air Traffic procedures '; |
| 1402 | - if (isset($this->code_airtraffic[$code_fp])) $result .= $this->code_airtraffic[$code_fp]; |
|
| 1506 | + if (isset($this->code_airtraffic[$code_fp])) { |
|
| 1507 | + $result .= $this->code_airtraffic[$code_fp]; |
|
| 1508 | + } |
|
| 1403 | 1509 | break; |
| 1404 | 1510 | case 'R': |
| 1405 | 1511 | $result = 'Navigation Warnings: Airspace Restrictions '; |
| 1406 | - if (isset($this->code_navigationw[$code_fp])) $result .= $this->code_navigationw[$code_fp]; |
|
| 1512 | + if (isset($this->code_navigationw[$code_fp])) { |
|
| 1513 | + $result .= $this->code_navigationw[$code_fp]; |
|
| 1514 | + } |
|
| 1407 | 1515 | break; |
| 1408 | 1516 | case 'S': |
| 1409 | 1517 | $result = 'Air Traffic and VOLMET Services '; |
| 1410 | - if (isset($this->code_volmet[$code_fp])) $result .= $this->code_volmet[$code_fp]; |
|
| 1518 | + if (isset($this->code_volmet[$code_fp])) { |
|
| 1519 | + $result .= $this->code_volmet[$code_fp]; |
|
| 1520 | + } |
|
| 1411 | 1521 | break; |
| 1412 | 1522 | case 'W': |
| 1413 | 1523 | $result = 'Navigation Warnings: Warnings '; |
| 1414 | - if (isset($this->code_warnings[$code_fp])) $result .= $this->code_warnings[$code_fp]; |
|
| 1524 | + if (isset($this->code_warnings[$code_fp])) { |
|
| 1525 | + $result .= $this->code_warnings[$code_fp]; |
|
| 1526 | + } |
|
| 1415 | 1527 | break; |
| 1416 | 1528 | } |
| 1417 | 1529 | switch ($code[3]) { |
| 1418 | 1530 | case 'A': |
| 1419 | 1531 | // Availability |
| 1420 | - if (isset($this->code_sp_availabity[$code_sp])) $result .= ' '.$this->code_sp_availabity[$code_sp]; |
|
| 1532 | + if (isset($this->code_sp_availabity[$code_sp])) { |
|
| 1533 | + $result .= ' '.$this->code_sp_availabity[$code_sp]; |
|
| 1534 | + } |
|
| 1421 | 1535 | break; |
| 1422 | 1536 | case 'C': |
| 1423 | 1537 | // Changes |
| 1424 | - if (isset($this->code_sp_changes[$code_sp])) $result .= ' '.$this->code_sp_changes[$code_sp]; |
|
| 1538 | + if (isset($this->code_sp_changes[$code_sp])) { |
|
| 1539 | + $result .= ' '.$this->code_sp_changes[$code_sp]; |
|
| 1540 | + } |
|
| 1425 | 1541 | break; |
| 1426 | 1542 | case 'H': |
| 1427 | 1543 | // Hazardous conditions |
| 1428 | - if (isset($this->code_sp_hazardous[$code_sp])) $result .= ' '.$this->code_sp_hazardous[$code_sp]; |
|
| 1544 | + if (isset($this->code_sp_hazardous[$code_sp])) { |
|
| 1545 | + $result .= ' '.$this->code_sp_hazardous[$code_sp]; |
|
| 1546 | + } |
|
| 1429 | 1547 | break; |
| 1430 | 1548 | case 'L': |
| 1431 | 1549 | // Limitations |
| 1432 | - if (isset($this->code_sp_limitations[$code_sp])) $result .= ' '.$this->code_sp_limitations[$code_sp]; |
|
| 1550 | + if (isset($this->code_sp_limitations[$code_sp])) { |
|
| 1551 | + $result .= ' '.$this->code_sp_limitations[$code_sp]; |
|
| 1552 | + } |
|
| 1433 | 1553 | break; |
| 1434 | 1554 | case 'X': |
| 1435 | 1555 | // Other Information |
@@ -25,7 +25,9 @@ discard block |
||
| 25 | 25 | $airspace = $result[0]; |
| 26 | 26 | date_default_timezone_set('UTC'); |
| 27 | 27 | print '<div class="top">'; |
| 28 | -if (isset($airspace['name'])) $airspace['title'] = $airspace['name']; |
|
| 28 | +if (isset($airspace['name'])) { |
|
| 29 | + $airspace['title'] = $airspace['name']; |
|
| 30 | +} |
|
| 29 | 31 | print '<div class="right"><div class="callsign-details"><div class="callsign">'.$airspace['title'].'</a></div>'; |
| 30 | 32 | print '</div>'; |
| 31 | 33 | print '<div class="details">'; |
@@ -44,13 +46,17 @@ discard block |
||
| 44 | 46 | print '</div>'; |
| 45 | 47 | } |
| 46 | 48 | |
| 47 | -if (isset($airspace['ceiling'])) $airspace['tops'] = $airspace['ceiling']; |
|
| 49 | +if (isset($airspace['ceiling'])) { |
|
| 50 | + $airspace['tops'] = $airspace['ceiling']; |
|
| 51 | +} |
|
| 48 | 52 | print '<div>'; |
| 49 | 53 | print '<span>'._("Tops").'</span>'; |
| 50 | 54 | print $airspace['tops']; |
| 51 | 55 | print '</div>'; |
| 52 | 56 | |
| 53 | -if (isset($airspace['floor'])) $airspace['base'] = $airspace['floor']; |
|
| 57 | +if (isset($airspace['floor'])) { |
|
| 58 | + $airspace['base'] = $airspace['floor']; |
|
| 59 | +} |
|
| 54 | 60 | print '<div>'; |
| 55 | 61 | print '<span>'._("Base").'</span>'; |
| 56 | 62 | print $airspace['base']; |
@@ -67,12 +67,22 @@ |
||
| 67 | 67 | } else { |
| 68 | 68 | $geom = geoPHP::load(stream_get_contents($row['wkb'])); |
| 69 | 69 | } |
| 70 | - if (isset($properties['type'])) $properties['type'] = trim($properties['type']); |
|
| 71 | - elseif (isset($properties['class'])) $properties['type'] = trim($properties['class']); |
|
| 72 | - if (isset($properties['ogr_fid'])) $properties['id'] = $properties['ogr_fid']; |
|
| 73 | - elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid']; |
|
| 74 | - if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling']; |
|
| 75 | - if (isset($properties['floor'])) $properties['base'] = $properties['floor']; |
|
| 70 | + if (isset($properties['type'])) { |
|
| 71 | + $properties['type'] = trim($properties['type']); |
|
| 72 | + } elseif (isset($properties['class'])) { |
|
| 73 | + $properties['type'] = trim($properties['class']); |
|
| 74 | + } |
|
| 75 | + if (isset($properties['ogr_fid'])) { |
|
| 76 | + $properties['id'] = $properties['ogr_fid']; |
|
| 77 | + } elseif (isset($properties['ogc_fid'])) { |
|
| 78 | + $properties['id'] = $properties['ogc_fid']; |
|
| 79 | + } |
|
| 80 | + if (isset($properties['ceiling'])) { |
|
| 81 | + $properties['tops'] = $properties['ceiling']; |
|
| 82 | + } |
|
| 83 | + if (isset($properties['floor'])) { |
|
| 84 | + $properties['base'] = $properties['floor']; |
|
| 85 | + } |
|
| 76 | 86 | if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) { |
| 77 | 87 | $properties['upper_limit'] = round($matches['alt']*100*0.38048); |
| 78 | 88 | } elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) { |
@@ -14,7 +14,9 @@ discard block |
||
| 14 | 14 | //foreach ($lines as $line) |
| 15 | 15 | while (($line = fgets($handle,4096)) !== false) |
| 16 | 16 | { |
| 17 | - if (substr($line,0,2) == '--' || $line == '') continue; |
|
| 17 | + if (substr($line,0,2) == '--' || $line == '') { |
|
| 18 | + continue; |
|
| 19 | + } |
|
| 18 | 20 | $templine .= $line; |
| 19 | 21 | if (substr(trim($line), -1,1) == ';') |
| 20 | 22 | { |
@@ -40,7 +42,9 @@ discard block |
||
| 40 | 42 | //foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename) |
| 41 | 43 | while(false !== ($filename = readdir($dh))) |
| 42 | 44 | { |
| 43 | - if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename); |
|
| 45 | + if (preg_match('/\.sql$/',$filename)) { |
|
| 46 | + $error .= create_db::import_file($directory.$filename); |
|
| 47 | + } |
|
| 44 | 48 | } |
| 45 | 49 | return $error; |
| 46 | 50 | } |
@@ -56,13 +60,17 @@ discard block |
||
| 56 | 60 | // Dirty hack |
| 57 | 61 | if ($host != 'localhost' && $host != '127.0.0.1') { |
| 58 | 62 | $grantright = $_SERVER['SERVER_ADDR']; |
| 59 | - } else $grantright = 'localhost'; |
|
| 63 | + } else { |
|
| 64 | + $grantright = 'localhost'; |
|
| 65 | + } |
|
| 60 | 66 | try { |
| 61 | 67 | $dbh = new PDO($db_type.':host='.$host,$root,$root_pass); |
| 62 | 68 | $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 63 | 69 | if ($db_type == 'mysql') { |
| 64 | 70 | $dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
| 65 | - if ($grantright == 'localhost') $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
|
| 71 | + if ($grantright == 'localhost') { |
|
| 72 | + $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
|
| 73 | + } |
|
| 66 | 74 | } else if ($db_type == 'pgsql') { |
| 67 | 75 | $dbh->exec("CREATE DATABASE ".$db.";"); |
| 68 | 76 | $dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."'; |
@@ -64,8 +64,11 @@ discard block |
||
| 64 | 64 | $globalDBSname = $globalDBname; |
| 65 | 65 | $globalDBSuser = $globalDBuser; |
| 66 | 66 | $globalDBSpass = $globalDBpass; |
| 67 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 68 | - else $globalDBSport = $globalDBport; |
|
| 67 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 68 | + $globalDBSport = 3306; |
|
| 69 | + } else { |
|
| 70 | + $globalDBSport = $globalDBport; |
|
| 71 | + } |
|
| 69 | 72 | } else { |
| 70 | 73 | $DBname = 'default'; |
| 71 | 74 | $globalDBSdriver = $globalDBdriver; |
@@ -73,8 +76,11 @@ discard block |
||
| 73 | 76 | $globalDBSname = $globalDBname; |
| 74 | 77 | $globalDBSuser = $user; |
| 75 | 78 | $globalDBSpass = $pass; |
| 76 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 77 | - else $globalDBSport = $globalDBport; |
|
| 79 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 80 | + $globalDBSport = 3306; |
|
| 81 | + } else { |
|
| 82 | + $globalDBSport = $globalDBport; |
|
| 83 | + } |
|
| 78 | 84 | } |
| 79 | 85 | } else { |
| 80 | 86 | $globalDBSdriver = $globalDB[$DBname]['driver']; |
@@ -82,11 +88,16 @@ discard block |
||
| 82 | 88 | $globalDBSname = $globalDB[$DBname]['name']; |
| 83 | 89 | $globalDBSuser = $globalDB[$DBname]['user']; |
| 84 | 90 | $globalDBSpass = $globalDB[$DBname]['pass']; |
| 85 | - if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port']; |
|
| 86 | - else $globalDBSport = 3306; |
|
| 91 | + if (isset($globalDB[$DBname]['port'])) { |
|
| 92 | + $globalDBSport = $globalDB[$DBname]['port']; |
|
| 93 | + } else { |
|
| 94 | + $globalDBSport = 3306; |
|
| 95 | + } |
|
| 87 | 96 | } |
| 88 | 97 | // Set number of try to connect to DB |
| 89 | - if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5; |
|
| 98 | + if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) { |
|
| 99 | + $globalDBretry = 5; |
|
| 100 | + } |
|
| 90 | 101 | $i = 0; |
| 91 | 102 | while (true) { |
| 92 | 103 | try { |
@@ -95,10 +106,16 @@ discard block |
||
| 95 | 106 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 96 | 107 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 97 | 108 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 98 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 99 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 100 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 101 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 109 | + if (!isset($globalDBTimeOut)) { |
|
| 110 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 111 | + } else { |
|
| 112 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 113 | + } |
|
| 114 | + if (!isset($globalDBPersistent)) { |
|
| 115 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 116 | + } else { |
|
| 117 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 118 | + } |
|
| 102 | 119 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 103 | 120 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 104 | 121 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -112,22 +129,34 @@ discard block |
||
| 112 | 129 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 113 | 130 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 114 | 131 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 115 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 116 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 117 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 118 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 132 | + if (!isset($globalDBTimeOut)) { |
|
| 133 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 134 | + } else { |
|
| 135 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 136 | + } |
|
| 137 | + if (!isset($globalDBPersistent)) { |
|
| 138 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 139 | + } else { |
|
| 140 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 141 | + } |
|
| 119 | 142 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 120 | 143 | } |
| 121 | 144 | break; |
| 122 | 145 | } catch(PDOException $e) { |
| 123 | 146 | $i++; |
| 124 | - if (isset($globalDebug) && $globalDebug) echo $e->getMessage()."\n"; |
|
| 147 | + if (isset($globalDebug) && $globalDebug) { |
|
| 148 | + echo $e->getMessage()."\n"; |
|
| 149 | + } |
|
| 125 | 150 | //exit; |
| 126 | - if ($i > $globalDBretry) return false; |
|
| 151 | + if ($i > $globalDBretry) { |
|
| 152 | + return false; |
|
| 153 | + } |
|
| 127 | 154 | //return false; |
| 128 | 155 | } |
| 129 | 156 | } |
| 130 | - if ($DBname === 'default') $this->db = $this->dbs['default']; |
|
| 157 | + if ($DBname === 'default') { |
|
| 158 | + $this->db = $this->dbs['default']; |
|
| 159 | + } |
|
| 131 | 160 | return true; |
| 132 | 161 | } |
| 133 | 162 | |
@@ -139,7 +168,9 @@ discard block |
||
| 139 | 168 | } else { |
| 140 | 169 | $query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'"; |
| 141 | 170 | } |
| 142 | - if ($this->db == NULL) return false; |
|
| 171 | + if ($this->db == NULL) { |
|
| 172 | + return false; |
|
| 173 | + } |
|
| 143 | 174 | try { |
| 144 | 175 | //$Connection = new Connection(); |
| 145 | 176 | $results = $this->db->query($query); |
@@ -148,21 +179,28 @@ discard block |
||
| 148 | 179 | } |
| 149 | 180 | if($results->rowCount()>0) { |
| 150 | 181 | return true; |
| 182 | + } else { |
|
| 183 | + return false; |
|
| 151 | 184 | } |
| 152 | - else return false; |
|
| 153 | 185 | } |
| 154 | 186 | |
| 155 | 187 | public function connectionExists() |
| 156 | 188 | { |
| 157 | 189 | global $globalDBdriver, $globalDBCheckConnection; |
| 158 | - if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true; |
|
| 190 | + if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) { |
|
| 191 | + return true; |
|
| 192 | + } |
|
| 159 | 193 | $query = "SELECT 1 + 1"; |
| 160 | - if ($this->db === null) return false; |
|
| 194 | + if ($this->db === null) { |
|
| 195 | + return false; |
|
| 196 | + } |
|
| 161 | 197 | try { |
| 162 | 198 | $sum = @$this->db->query($query); |
| 163 | 199 | if ($sum instanceof \PDOStatement) { |
| 164 | 200 | $sum = $sum->fetchColumn(0); |
| 165 | - } else $sum = 0; |
|
| 201 | + } else { |
|
| 202 | + $sum = 0; |
|
| 203 | + } |
|
| 166 | 204 | if (intval($sum) !== 2) { |
| 167 | 205 | return false; |
| 168 | 206 | } |
@@ -196,8 +234,9 @@ discard block |
||
| 196 | 234 | } |
| 197 | 235 | if($results->rowCount()>0) { |
| 198 | 236 | return true; |
| 237 | + } else { |
|
| 238 | + return false; |
|
| 199 | 239 | } |
| 200 | - else return false; |
|
| 201 | 240 | } |
| 202 | 241 | |
| 203 | 242 | /* |
@@ -240,9 +279,12 @@ discard block |
||
| 240 | 279 | echo "error : ".$e->getMessage()."\n"; |
| 241 | 280 | } |
| 242 | 281 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 243 | - if ($result['nb'] > 0) return true; |
|
| 244 | - else return false; |
|
| 245 | -/* } else { |
|
| 282 | + if ($result['nb'] > 0) { |
|
| 283 | + return true; |
|
| 284 | + } else { |
|
| 285 | + return false; |
|
| 286 | + } |
|
| 287 | + /* } else { |
|
| 246 | 288 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 247 | 289 | try { |
| 248 | 290 | $results = $this->db->query($query); |
@@ -280,7 +322,9 @@ discard block |
||
| 280 | 322 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 281 | 323 | return $result['value']; |
| 282 | 324 | } |
| 283 | - } else return $version; |
|
| 325 | + } else { |
|
| 326 | + return $version; |
|
| 327 | + } |
|
| 284 | 328 | } |
| 285 | 329 | |
| 286 | 330 | /* |
@@ -288,8 +332,11 @@ discard block |
||
| 288 | 332 | * @return Boolean if latest version or not |
| 289 | 333 | */ |
| 290 | 334 | public function latest() { |
| 291 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 292 | - else return false; |
|
| 335 | + if ($this->check_schema_version() == $this->latest_schema) { |
|
| 336 | + return true; |
|
| 337 | + } else { |
|
| 338 | + return false; |
|
| 339 | + } |
|
| 293 | 340 | } |
| 294 | 341 | |
| 295 | 342 | } |
