Ysurac /
FlightAirMap
@@ -39,30 +39,30 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | function quaternionrotate($heading, $attitude = 0, $bank = 0) { |
| 42 | - // Assuming the angles are in radians. |
|
| 43 | - $c1 = cos($heading/2); |
|
| 44 | - $s1 = sin($heading/2); |
|
| 45 | - $c2 = cos($attitude/2); |
|
| 46 | - $s2 = sin($attitude/2); |
|
| 47 | - $c3 = cos($bank/2); |
|
| 48 | - $s3 = sin($bank/2); |
|
| 49 | - $c1c2 = $c1*$c2; |
|
| 50 | - $s1s2 = $s1*$s2; |
|
| 51 | - $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | - $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | - $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | - $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | - return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 42 | + // Assuming the angles are in radians. |
|
| 43 | + $c1 = cos($heading/2); |
|
| 44 | + $s1 = sin($heading/2); |
|
| 45 | + $c2 = cos($attitude/2); |
|
| 46 | + $s2 = sin($attitude/2); |
|
| 47 | + $c3 = cos($bank/2); |
|
| 48 | + $s3 = sin($bank/2); |
|
| 49 | + $c1c2 = $c1*$c2; |
|
| 50 | + $s1s2 = $s1*$s2; |
|
| 51 | + $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | + $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | + $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | + $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | + return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 56 | 56 | // return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365'); |
| 57 | 57 | |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | if (isset($_GET['download'])) { |
| 62 | - if ($_GET['download'] == "true") |
|
| 63 | - { |
|
| 62 | + if ($_GET['download'] == "true") |
|
| 63 | + { |
|
| 64 | 64 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 65 | - } |
|
| 65 | + } |
|
| 66 | 66 | } |
| 67 | 67 | header('Content-Type: text/javascript'); |
| 68 | 68 | |
@@ -229,10 +229,10 @@ discard block |
||
| 229 | 229 | $image = "images/placeholder_thumb.png"; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 233 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 234 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 235 | - if ($prev_flightaware_id != $id) { |
|
| 232 | + if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 233 | + elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 234 | + elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 235 | + if ($prev_flightaware_id != $id) { |
|
| 236 | 236 | if ($prev_flightaware_id != '') { |
| 237 | 237 | $output .= ']'; |
| 238 | 238 | $output .= '}'; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 272 | 272 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 273 | 273 | } else $aircraft_shadow = ''; |
| 274 | - $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
|
| 274 | + $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
|
| 275 | 275 | if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) { |
| 276 | 276 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
| 277 | 277 | $output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}'; |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
| 302 | 302 | $output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}'; |
| 303 | 303 | } |
| 304 | - $output .= '},'; |
|
| 304 | + $output .= '},'; |
|
| 305 | 305 | } elseif ($aircraft_icao != '') { |
| 306 | 306 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
| 307 | 307 | if (isset($aircraft_info[0]['engine_type'])) { |
@@ -8,8 +8,12 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | $tracker = false; |
| 10 | 10 | $marine = false; |
| 11 | -if (isset($_GET['tracker'])) $tracker = true; |
|
| 12 | -if (isset($_GET['marine'])) $marine = true; |
|
| 11 | +if (isset($_GET['tracker'])) { |
|
| 12 | + $tracker = true; |
|
| 13 | +} |
|
| 14 | +if (isset($_GET['marine'])) { |
|
| 15 | + $marine = true; |
|
| 16 | +} |
|
| 13 | 17 | if ($tracker) { |
| 14 | 18 | require_once('require/class.Tracker.php'); |
| 15 | 19 | require_once('require/class.TrackerLive.php'); |
@@ -66,23 +70,46 @@ discard block |
||
| 66 | 70 | } |
| 67 | 71 | header('Content-Type: text/javascript'); |
| 68 | 72 | |
| 69 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 70 | -else $compress = $globalJsonCompress; |
|
| 73 | +if (!isset($globalJsonCompress)) { |
|
| 74 | + $compress = true; |
|
| 75 | +} else { |
|
| 76 | + $compress = $globalJsonCompress; |
|
| 77 | +} |
|
| 71 | 78 | |
| 72 | 79 | $from_archive = false; |
| 73 | 80 | $min = false; |
| 74 | 81 | $allhistory = false; |
| 75 | 82 | $filter['source'] = array(); |
| 76 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 77 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 78 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 79 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 80 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 81 | -if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 82 | -if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 83 | -if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 84 | -if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 85 | -if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 83 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') { |
|
| 84 | + $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 85 | +} |
|
| 86 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') { |
|
| 87 | + $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 88 | +} |
|
| 89 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') { |
|
| 90 | + $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 91 | +} |
|
| 92 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') { |
|
| 93 | + $filter['source'] = array_merge($filter['source'],array('sbs','famaprs')); |
|
| 94 | +} |
|
| 95 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') { |
|
| 96 | + $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 97 | +} |
|
| 98 | +if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') { |
|
| 99 | + $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING); |
|
| 100 | +} |
|
| 101 | +if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') { |
|
| 102 | + $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING); |
|
| 103 | +} |
|
| 104 | +if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') { |
|
| 105 | + $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING); |
|
| 106 | +} |
|
| 107 | +if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') { |
|
| 108 | + $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING); |
|
| 109 | +} |
|
| 110 | +if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') { |
|
| 111 | + $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING); |
|
| 112 | +} |
|
| 86 | 113 | /* |
| 87 | 114 | if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) { |
| 88 | 115 | $min = true; |
@@ -167,8 +194,12 @@ discard block |
||
| 167 | 194 | } else { |
| 168 | 195 | $flightcnt = $SpotterLive->getLiveSpotterCount($filter); |
| 169 | 196 | } |
| 170 | - if ($flightcnt == '') $flightcnt = 0; |
|
| 171 | -} else $flightcnt = 0; |
|
| 197 | + if ($flightcnt == '') { |
|
| 198 | + $flightcnt = 0; |
|
| 199 | + } |
|
| 200 | + } else { |
|
| 201 | + $flightcnt = 0; |
|
| 202 | +} |
|
| 172 | 203 | |
| 173 | 204 | $sqltime = round(microtime(true)-$begintime,2); |
| 174 | 205 | $minitime = time(); |
@@ -191,7 +222,9 @@ discard block |
||
| 191 | 222 | $j = 0; |
| 192 | 223 | $prev_flightaware_id = ''; |
| 193 | 224 | $speed = 1; |
| 194 | -if (isset($archivespeed)) $speed = $archivespeed; |
|
| 225 | +if (isset($archivespeed)) { |
|
| 226 | + $speed = $archivespeed; |
|
| 227 | +} |
|
| 195 | 228 | $output = '['; |
| 196 | 229 | if ($tracker) { |
| 197 | 230 | $output .= '{"id" : "document", "name" : "tracker","version" : "1.0"'; |
@@ -229,9 +262,13 @@ discard block |
||
| 229 | 262 | $image = "images/placeholder_thumb.png"; |
| 230 | 263 | } |
| 231 | 264 | |
| 232 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 233 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 234 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 265 | + if (isset($spotter_item['flightaware_id'])) { |
|
| 266 | + $id = $spotter_item['flightaware_id']; |
|
| 267 | + } elseif (isset($spotter_item['famtrackid'])) { |
|
| 268 | + $id = $spotter_item['famtrackid']; |
|
| 269 | + } elseif (isset($spotter_item['fammarine_id'])) { |
|
| 270 | + $id = $spotter_item['fammarine_id']; |
|
| 271 | + } |
|
| 235 | 272 | if ($prev_flightaware_id != $id) { |
| 236 | 273 | if ($prev_flightaware_id != '') { |
| 237 | 274 | $output .= ']'; |
@@ -270,7 +307,9 @@ discard block |
||
| 270 | 307 | $spotter_item['engine_type'] = $aircraft_info[0]['engine_type']; |
| 271 | 308 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 272 | 309 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 273 | - } else $aircraft_shadow = ''; |
|
| 310 | + } else { |
|
| 311 | + $aircraft_shadow = ''; |
|
| 312 | + } |
|
| 274 | 313 | $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
| 275 | 314 | if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) { |
| 276 | 315 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
@@ -278,7 +317,9 @@ discard block |
||
| 278 | 317 | } |
| 279 | 318 | $output .= '},'; |
| 280 | 319 | } |
| 281 | - } else $output .= ' "billboard" : {"image" : "data:image/png;base64,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","scale" : 0.5},'; |
|
| 320 | + } else { |
|
| 321 | + $output .= ' "billboard" : {"image" : "data:image/png;base64,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","scale" : 0.5},'; |
|
| 322 | + } |
|
| 282 | 323 | } elseif ($one3dmodel) { |
| 283 | 324 | if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') { |
| 284 | 325 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20'; |
@@ -309,7 +350,9 @@ discard block |
||
| 309 | 350 | $spotter_item['engine_type'] = $aircraft_info[0]['engine_type']; |
| 310 | 351 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 311 | 352 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 312 | - } else $aircraft_shadow = ''; |
|
| 353 | + } else { |
|
| 354 | + $aircraft_shadow = ''; |
|
| 355 | + } |
|
| 313 | 356 | if ($aircraft_shadow != '') { |
| 314 | 357 | if (isset($modelsdb[$aircraft_shadow])) { |
| 315 | 358 | $output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20'; |
@@ -446,7 +489,9 @@ discard block |
||
| 446 | 489 | } |
| 447 | 490 | $output .= '},'; |
| 448 | 491 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 449 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 492 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 493 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 494 | + } |
|
| 450 | 495 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 451 | 496 | } |
| 452 | 497 | } elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') { |
@@ -468,7 +513,9 @@ discard block |
||
| 468 | 513 | } |
| 469 | 514 | $output .= '},'; |
| 470 | 515 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 471 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 516 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 517 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 518 | + } |
|
| 472 | 519 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 473 | 520 | } |
| 474 | 521 | } else { |
@@ -481,7 +528,9 @@ discard block |
||
| 481 | 528 | } |
| 482 | 529 | $output .= '},'; |
| 483 | 530 | //if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
| 484 | - if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 531 | + if ($spotter_item['aircraft_icao'] != '') { |
|
| 532 | + $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
|
| 533 | + } |
|
| 485 | 534 | $modelsdb[$aircraft_icao] = 'Cesium_Air.glb'; |
| 486 | 535 | } |
| 487 | 536 | } elseif ($tracker && isset($spotter_item['type'])) { |
@@ -536,8 +585,12 @@ discard block |
||
| 536 | 585 | // $output .= '"interpolationDegree" : 5,'; |
| 537 | 586 | // $output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", '; |
| 538 | 587 | $output .= '"cartographicDegrees": ['; |
| 539 | - if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']); |
|
| 540 | - if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
|
| 588 | + if ($minitime > strtotime($spotter_item['date'])) { |
|
| 589 | + $minitime = strtotime($spotter_item['date']); |
|
| 590 | + } |
|
| 591 | + if ($maxitime < strtotime($spotter_item['date'])) { |
|
| 592 | + $maxitime = strtotime($spotter_item['date']); |
|
| 593 | + } |
|
| 541 | 594 | $output .= '"'.date("c",strtotime($spotter_item['date'])).'", '; |
| 542 | 595 | $output .= $spotter_item['longitude'].', '; |
| 543 | 596 | $output .= $spotter_item['latitude']; |
@@ -546,19 +599,26 @@ discard block |
||
| 546 | 599 | if (!$tracker && !$marine) { |
| 547 | 600 | $output .= ', '.round($spotter_item['altitude']*30.48); |
| 548 | 601 | $prevalt = round($spotter_item['altitude']*30.48); |
| 549 | - } else $output .= ', 0'; |
|
| 602 | + } else { |
|
| 603 | + $output .= ', 0'; |
|
| 604 | + } |
|
| 550 | 605 | //$orientation = '"orientation" : { '; |
| 551 | 606 | //$orientation .= '"unitQuaternion": ['; |
| 552 | 607 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
| 553 | 608 | //$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w']; |
| 554 | 609 | } else { |
| 555 | 610 | $output .= ',"'.date("c",strtotime($spotter_item['date'])).'", '; |
| 556 | - if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']); |
|
| 611 | + if ($maxitime < strtotime($spotter_item['date'])) { |
|
| 612 | + $maxitime = strtotime($spotter_item['date']); |
|
| 613 | + } |
|
| 557 | 614 | if ($spotter_item['ground_speed'] == 0) { |
| 558 | 615 | $output .= $prevlong.', '; |
| 559 | 616 | $output .= $prevlat; |
| 560 | - if (!$tracker && !$marine) $output .= ', '.$prevalt; |
|
| 561 | - else $output .= ', 0'; |
|
| 617 | + if (!$tracker && !$marine) { |
|
| 618 | + $output .= ', '.$prevalt; |
|
| 619 | + } else { |
|
| 620 | + $output .= ', 0'; |
|
| 621 | + } |
|
| 562 | 622 | } else { |
| 563 | 623 | $output .= $spotter_item['longitude'].', '; |
| 564 | 624 | $output .= $spotter_item['latitude']; |
@@ -572,7 +632,9 @@ discard block |
||
| 572 | 632 | } else { |
| 573 | 633 | $output .= ', '.round($spotter_item['altitude']*30.48); |
| 574 | 634 | } |
| 575 | - } else $output .= ', 0'; |
|
| 635 | + } else { |
|
| 636 | + $output .= ', 0'; |
|
| 637 | + } |
|
| 576 | 638 | } |
| 577 | 639 | //$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0)); |
| 578 | 640 | //$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w']; |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | require_once(dirname(__FILE__).'/class.create_db.php'); |
| 11 | 11 | require_once(dirname(__FILE__).'/class.update_schema.php'); |
| 12 | 12 | require_once(dirname(__FILE__).'/class.settings.php'); |
| 13 | -$title="Install"; |
|
| 13 | +$title = "Install"; |
|
| 14 | 14 | require(dirname(__FILE__).'/../require/settings.php'); |
| 15 | 15 | require(dirname(__FILE__).'/header.php'); |
| 16 | 16 | |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | if (!extension_loaded('curl')) { |
| 70 | 70 | $error[] = "Curl is not loaded."; |
| 71 | 71 | } |
| 72 | -if(function_exists('apache_get_modules') ){ |
|
| 73 | - if(!in_array('mod_rewrite',apache_get_modules())) { |
|
| 72 | +if (function_exists('apache_get_modules')) { |
|
| 73 | + if (!in_array('mod_rewrite', apache_get_modules())) { |
|
| 74 | 74 | $error[] = "mod_rewrite is not available."; |
| 75 | 75 | } |
| 76 | 76 | /* |
@@ -86,8 +86,8 @@ discard block |
||
| 86 | 86 | print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>'; |
| 87 | 87 | if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) { |
| 88 | 88 | if (function_exists('get_headers')) { |
| 89 | - $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"]))); |
|
| 90 | - if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) { |
|
| 89 | + $check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"]))); |
|
| 90 | + if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) { |
|
| 91 | 91 | print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>'; |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -441,13 +441,13 @@ discard block |
||
| 441 | 441 | ?> |
| 442 | 442 | <tr> |
| 443 | 443 | <?php |
| 444 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 444 | + if (filter_var($source['host'], FILTER_VALIDATE_URL)) { |
|
| 445 | 445 | ?> |
| 446 | 446 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 447 | 447 | <td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td> |
| 448 | 448 | <?php |
| 449 | 449 | } else { |
| 450 | - $hostport = explode(':',$source['host']); |
|
| 450 | + $hostport = explode(':', $source['host']); |
|
| 451 | 451 | if (isset($hostport[1])) { |
| 452 | 452 | $host = $hostport[0]; |
| 453 | 453 | $port = $hostport[1]; |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | <br /> |
| 796 | 796 | <p> |
| 797 | 797 | <label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label> |
| 798 | - <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" /> |
|
| 798 | + <input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" /> |
|
| 799 | 799 | </p> |
| 800 | 800 | <br /> |
| 801 | 801 | <p> |
@@ -846,14 +846,14 @@ discard block |
||
| 846 | 846 | $error = ''; |
| 847 | 847 | |
| 848 | 848 | if (isset($_POST['dbtype'])) { |
| 849 | - $dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING); |
|
| 850 | - $dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING); |
|
| 851 | - $dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING); |
|
| 852 | - $dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING); |
|
| 853 | - $dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING); |
|
| 854 | - $dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING); |
|
| 855 | - $dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING); |
|
| 856 | - $dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING); |
|
| 849 | + $dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING); |
|
| 850 | + $dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING); |
|
| 851 | + $dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING); |
|
| 852 | + $dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING); |
|
| 853 | + $dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING); |
|
| 854 | + $dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING); |
|
| 855 | + $dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING); |
|
| 856 | + $dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING); |
|
| 857 | 857 | |
| 858 | 858 | if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded'; |
| 859 | 859 | if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded'; |
@@ -873,48 +873,48 @@ discard block |
||
| 873 | 873 | } else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
| 874 | 874 | */ |
| 875 | 875 | |
| 876 | - $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname)); |
|
| 876 | + $settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname)); |
|
| 877 | 877 | |
| 878 | - $sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING); |
|
| 879 | - $siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING); |
|
| 880 | - $timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING); |
|
| 881 | - $language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING); |
|
| 882 | - $settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language)); |
|
| 878 | + $sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING); |
|
| 879 | + $siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING); |
|
| 880 | + $timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING); |
|
| 881 | + $language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING); |
|
| 882 | + $settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language)); |
|
| 883 | 883 | |
| 884 | - $mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING); |
|
| 885 | - $mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING); |
|
| 886 | - $mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING); |
|
| 887 | - $googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING); |
|
| 888 | - $bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING); |
|
| 889 | - $mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING); |
|
| 890 | - $hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING); |
|
| 891 | - $hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING); |
|
| 892 | - $settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey)); |
|
| 884 | + $mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING); |
|
| 885 | + $mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING); |
|
| 886 | + $mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING); |
|
| 887 | + $googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING); |
|
| 888 | + $bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING); |
|
| 889 | + $mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING); |
|
| 890 | + $hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING); |
|
| 891 | + $hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING); |
|
| 892 | + $settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey)); |
|
| 893 | 893 | |
| 894 | - $latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING); |
|
| 895 | - $latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING); |
|
| 896 | - $longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING); |
|
| 897 | - $longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING); |
|
| 898 | - $livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 899 | - $settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom)); |
|
| 894 | + $latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING); |
|
| 895 | + $latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING); |
|
| 896 | + $longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING); |
|
| 897 | + $longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING); |
|
| 898 | + $livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 899 | + $settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom)); |
|
| 900 | 900 | |
| 901 | - $squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING); |
|
| 902 | - $settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country)); |
|
| 901 | + $squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING); |
|
| 902 | + $settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country)); |
|
| 903 | 903 | |
| 904 | - $latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING); |
|
| 905 | - $longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING); |
|
| 906 | - $settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter)); |
|
| 904 | + $latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING); |
|
| 905 | + $longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING); |
|
| 906 | + $settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter)); |
|
| 907 | 907 | |
| 908 | - $acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING); |
|
| 908 | + $acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING); |
|
| 909 | 909 | if ($acars == 'acars') { |
| 910 | - $settings = array_merge($settings,array('globalACARS' => 'TRUE')); |
|
| 910 | + $settings = array_merge($settings, array('globalACARS' => 'TRUE')); |
|
| 911 | 911 | } else { |
| 912 | - $settings = array_merge($settings,array('globalACARS' => 'FALSE')); |
|
| 912 | + $settings = array_merge($settings, array('globalACARS' => 'FALSE')); |
|
| 913 | 913 | } |
| 914 | 914 | |
| 915 | - $flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING); |
|
| 916 | - $flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING); |
|
| 917 | - $settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 915 | + $flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING); |
|
| 916 | + $flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING); |
|
| 917 | + $settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword)); |
|
| 918 | 918 | |
| 919 | 919 | $source_name = $_POST['source_name']; |
| 920 | 920 | $source_latitude = $_POST['source_latitude']; |
@@ -928,8 +928,8 @@ discard block |
||
| 928 | 928 | |
| 929 | 929 | $sources = array(); |
| 930 | 930 | foreach ($source_name as $keys => $name) { |
| 931 | - if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]); |
|
| 932 | - else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]); |
|
| 931 | + if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]); |
|
| 932 | + else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]); |
|
| 933 | 933 | } |
| 934 | 934 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 935 | 935 | |
@@ -942,24 +942,24 @@ discard block |
||
| 942 | 942 | $sbsurl = $_POST['sbsurl']; |
| 943 | 943 | */ |
| 944 | 944 | |
| 945 | - $globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING); |
|
| 946 | - $globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING); |
|
| 947 | - $globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING); |
|
| 948 | - $globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING); |
|
| 949 | - $globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING); |
|
| 950 | - $globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING); |
|
| 951 | - $globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING); |
|
| 952 | - $datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING); |
|
| 945 | + $globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING); |
|
| 946 | + $globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING); |
|
| 947 | + $globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING); |
|
| 948 | + $globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING); |
|
| 949 | + $globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING); |
|
| 950 | + $globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING); |
|
| 951 | + $globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING); |
|
| 952 | + $datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING); |
|
| 953 | 953 | |
| 954 | - $globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING); |
|
| 955 | - if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE')); |
|
| 956 | - else $settings = array_merge($settings,array('globalAircraft' => 'FALSE')); |
|
| 957 | - $globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING); |
|
| 958 | - if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE')); |
|
| 959 | - else $settings = array_merge($settings,array('globalTracker' => 'FALSE')); |
|
| 960 | - $globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING); |
|
| 961 | - if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE')); |
|
| 962 | - else $settings = array_merge($settings,array('globalMarine' => 'FALSE')); |
|
| 954 | + $globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING); |
|
| 955 | + if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE')); |
|
| 956 | + else $settings = array_merge($settings, array('globalAircraft' => 'FALSE')); |
|
| 957 | + $globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING); |
|
| 958 | + if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE')); |
|
| 959 | + else $settings = array_merge($settings, array('globalTracker' => 'FALSE')); |
|
| 960 | + $globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING); |
|
| 961 | + if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE')); |
|
| 962 | + else $settings = array_merge($settings, array('globalMarine' => 'FALSE')); |
|
| 963 | 963 | |
| 964 | 964 | /* |
| 965 | 965 | $globalSBS1Hosts = array(); |
@@ -975,7 +975,7 @@ discard block |
||
| 975 | 975 | } |
| 976 | 976 | $settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts)); |
| 977 | 977 | */ |
| 978 | - $settings_comment = array_merge($settings_comment,array('globalSBS1Hosts')); |
|
| 978 | + $settings_comment = array_merge($settings_comment, array('globalSBS1Hosts')); |
|
| 979 | 979 | $host = $_POST['host']; |
| 980 | 980 | $port = $_POST['port']; |
| 981 | 981 | $name = $_POST['name']; |
@@ -990,96 +990,96 @@ discard block |
||
| 990 | 990 | else $cov = 'FALSE'; |
| 991 | 991 | if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE'; |
| 992 | 992 | else $arch = 'FALSE'; |
| 993 | - if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch); |
|
| 993 | + if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch); |
|
| 994 | 994 | } |
| 995 | - $settings = array_merge($settings,array('globalSources' => $gSources)); |
|
| 995 | + $settings = array_merge($settings, array('globalSources' => $gSources)); |
|
| 996 | 996 | |
| 997 | 997 | /* |
| 998 | 998 | $sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT); |
| 999 | 999 | $settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout)); |
| 1000 | 1000 | */ |
| 1001 | - $acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING); |
|
| 1002 | - $acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT); |
|
| 1003 | - $settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport)); |
|
| 1001 | + $acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING); |
|
| 1002 | + $acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT); |
|
| 1003 | + $settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport)); |
|
| 1004 | 1004 | |
| 1005 | - $bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING); |
|
| 1006 | - $settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly)); |
|
| 1005 | + $bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING); |
|
| 1006 | + $settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly)); |
|
| 1007 | 1007 | |
| 1008 | - $notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING); |
|
| 1009 | - $settings = array_merge($settings,array('globalNOTAMSource' => $notamsource)); |
|
| 1010 | - $metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING); |
|
| 1011 | - $settings = array_merge($settings,array('globalMETARurl' => $metarsource)); |
|
| 1008 | + $notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING); |
|
| 1009 | + $settings = array_merge($settings, array('globalNOTAMSource' => $notamsource)); |
|
| 1010 | + $metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING); |
|
| 1011 | + $settings = array_merge($settings, array('globalMETARurl' => $metarsource)); |
|
| 1012 | 1012 | |
| 1013 | - $zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING); |
|
| 1014 | - $zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING); |
|
| 1015 | - $zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT); |
|
| 1013 | + $zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING); |
|
| 1014 | + $zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING); |
|
| 1015 | + $zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT); |
|
| 1016 | 1016 | if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') { |
| 1017 | - $settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance))); |
|
| 1018 | - } else $settings = array_merge($settings,array('globalDistanceIgnore' => array())); |
|
| 1017 | + $settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance))); |
|
| 1018 | + } else $settings = array_merge($settings, array('globalDistanceIgnore' => array())); |
|
| 1019 | 1019 | |
| 1020 | - $refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1021 | - $settings = array_merge($settings,array('globalLiveInterval' => $refresh)); |
|
| 1022 | - $maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT); |
|
| 1023 | - $settings = array_merge($settings,array('globalMapRefresh' => $maprefresh)); |
|
| 1024 | - $mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT); |
|
| 1025 | - $settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle)); |
|
| 1026 | - $closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT); |
|
| 1027 | - $settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist)); |
|
| 1020 | + $refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1021 | + $settings = array_merge($settings, array('globalLiveInterval' => $refresh)); |
|
| 1022 | + $maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT); |
|
| 1023 | + $settings = array_merge($settings, array('globalMapRefresh' => $maprefresh)); |
|
| 1024 | + $mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT); |
|
| 1025 | + $settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle)); |
|
| 1026 | + $closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT); |
|
| 1027 | + $settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist)); |
|
| 1028 | 1028 | |
| 1029 | - $aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | - $settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize)); |
|
| 1029 | + $aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize)); |
|
| 1031 | 1031 | |
| 1032 | - $archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1033 | - $settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths)); |
|
| 1032 | + $archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1033 | + $settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths)); |
|
| 1034 | 1034 | |
| 1035 | - $archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING); |
|
| 1035 | + $archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING); |
|
| 1036 | 1036 | if ($archiveyear == "archiveyear") { |
| 1037 | - $settings = array_merge($settings,array('globalArchiveYear' => 'TRUE')); |
|
| 1037 | + $settings = array_merge($settings, array('globalArchiveYear' => 'TRUE')); |
|
| 1038 | 1038 | } else { |
| 1039 | - $settings = array_merge($settings,array('globalArchiveYear' => 'FALSE')); |
|
| 1039 | + $settings = array_merge($settings, array('globalArchiveYear' => 'FALSE')); |
|
| 1040 | 1040 | } |
| 1041 | - $archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1042 | - $settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1043 | - $archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT); |
|
| 1044 | - $settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1041 | + $archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1042 | + $settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths)); |
|
| 1043 | + $archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT); |
|
| 1044 | + $settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths)); |
|
| 1045 | 1045 | |
| 1046 | - $britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING); |
|
| 1047 | - $settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1048 | - $transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING); |
|
| 1049 | - $settings = array_merge($settings,array('globalTransaviaKey' => $transavia)); |
|
| 1046 | + $britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING); |
|
| 1047 | + $settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways)); |
|
| 1048 | + $transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING); |
|
| 1049 | + $settings = array_merge($settings, array('globalTransaviaKey' => $transavia)); |
|
| 1050 | 1050 | |
| 1051 | - $lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING); |
|
| 1052 | - $lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING); |
|
| 1053 | - $settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret))); |
|
| 1051 | + $lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING); |
|
| 1052 | + $lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING); |
|
| 1053 | + $settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret))); |
|
| 1054 | 1054 | |
| 1055 | 1055 | // Create in settings.php keys not yet configurable if not already here |
| 1056 | 1056 | //if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => '')); |
| 1057 | - if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE')); |
|
| 1057 | + if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE')); |
|
| 1058 | 1058 | |
| 1059 | - $resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING); |
|
| 1059 | + $resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING); |
|
| 1060 | 1060 | if ($resetyearstats == 'resetyearstats') { |
| 1061 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1061 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE')); |
|
| 1062 | 1062 | } else { |
| 1063 | - $settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1063 | + $settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE')); |
|
| 1064 | 1064 | } |
| 1065 | 1065 | |
| 1066 | - $archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING); |
|
| 1066 | + $archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING); |
|
| 1067 | 1067 | if ($archive == 'archive') { |
| 1068 | - $settings = array_merge($settings,array('globalArchive' => 'TRUE')); |
|
| 1068 | + $settings = array_merge($settings, array('globalArchive' => 'TRUE')); |
|
| 1069 | 1069 | } else { |
| 1070 | - $settings = array_merge($settings,array('globalArchive' => 'FALSE')); |
|
| 1070 | + $settings = array_merge($settings, array('globalArchive' => 'FALSE')); |
|
| 1071 | 1071 | } |
| 1072 | - $daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING); |
|
| 1072 | + $daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING); |
|
| 1073 | 1073 | if ($daemon == 'daemon') { |
| 1074 | - $settings = array_merge($settings,array('globalDaemon' => 'TRUE')); |
|
| 1074 | + $settings = array_merge($settings, array('globalDaemon' => 'TRUE')); |
|
| 1075 | 1075 | } else { |
| 1076 | - $settings = array_merge($settings,array('globalDaemon' => 'FALSE')); |
|
| 1076 | + $settings = array_merge($settings, array('globalDaemon' => 'FALSE')); |
|
| 1077 | 1077 | } |
| 1078 | - $schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING); |
|
| 1078 | + $schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING); |
|
| 1079 | 1079 | if ($schedules == 'schedules') { |
| 1080 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE')); |
|
| 1080 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE')); |
|
| 1081 | 1081 | } else { |
| 1082 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE')); |
|
| 1082 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE')); |
|
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | 1085 | /* |
@@ -1090,201 +1090,201 @@ discard block |
||
| 1090 | 1090 | $settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE')); |
| 1091 | 1091 | } |
| 1092 | 1092 | */ |
| 1093 | - $settings = array_merge($settings,array('globalFlightAware' => 'FALSE')); |
|
| 1094 | - if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE')); |
|
| 1095 | - else $settings = array_merge($settings,array('globalSBS1' => 'FALSE')); |
|
| 1096 | - if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE')); |
|
| 1097 | - else $settings = array_merge($settings,array('globalAPRS' => 'FALSE')); |
|
| 1093 | + $settings = array_merge($settings, array('globalFlightAware' => 'FALSE')); |
|
| 1094 | + if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE')); |
|
| 1095 | + else $settings = array_merge($settings, array('globalSBS1' => 'FALSE')); |
|
| 1096 | + if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE')); |
|
| 1097 | + else $settings = array_merge($settings, array('globalAPRS' => 'FALSE')); |
|
| 1098 | 1098 | $va = false; |
| 1099 | 1099 | if ($globalivao == 'ivao') { |
| 1100 | - $settings = array_merge($settings,array('globalIVAO' => 'TRUE')); |
|
| 1100 | + $settings = array_merge($settings, array('globalIVAO' => 'TRUE')); |
|
| 1101 | 1101 | $va = true; |
| 1102 | - } else $settings = array_merge($settings,array('globalIVAO' => 'FALSE')); |
|
| 1102 | + } else $settings = array_merge($settings, array('globalIVAO' => 'FALSE')); |
|
| 1103 | 1103 | if ($globalvatsim == 'vatsim') { |
| 1104 | - $settings = array_merge($settings,array('globalVATSIM' => 'TRUE')); |
|
| 1104 | + $settings = array_merge($settings, array('globalVATSIM' => 'TRUE')); |
|
| 1105 | 1105 | $va = true; |
| 1106 | - } else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE')); |
|
| 1106 | + } else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE')); |
|
| 1107 | 1107 | if ($globalphpvms == 'phpvms') { |
| 1108 | - $settings = array_merge($settings,array('globalphpVMS' => 'TRUE')); |
|
| 1108 | + $settings = array_merge($settings, array('globalphpVMS' => 'TRUE')); |
|
| 1109 | 1109 | $va = true; |
| 1110 | - } else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE')); |
|
| 1110 | + } else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE')); |
|
| 1111 | 1111 | if ($globalvam == 'vam') { |
| 1112 | - $settings = array_merge($settings,array('globalVAM' => 'TRUE')); |
|
| 1112 | + $settings = array_merge($settings, array('globalVAM' => 'TRUE')); |
|
| 1113 | 1113 | $va = true; |
| 1114 | - } else $settings = array_merge($settings,array('globalVAM' => 'FALSE')); |
|
| 1114 | + } else $settings = array_merge($settings, array('globalVAM' => 'FALSE')); |
|
| 1115 | 1115 | if ($va) { |
| 1116 | - $settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE')); |
|
| 1117 | - } else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE')); |
|
| 1116 | + $settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE')); |
|
| 1117 | + } else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE')); |
|
| 1118 | 1118 | if ($globalva == 'va' || $va) { |
| 1119 | - $settings = array_merge($settings,array('globalVA' => 'TRUE')); |
|
| 1120 | - } else $settings = array_merge($settings,array('globalVA' => 'FALSE')); |
|
| 1119 | + $settings = array_merge($settings, array('globalVA' => 'TRUE')); |
|
| 1120 | + } else $settings = array_merge($settings, array('globalVA' => 'FALSE')); |
|
| 1121 | 1121 | |
| 1122 | 1122 | |
| 1123 | 1123 | |
| 1124 | - $notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING); |
|
| 1124 | + $notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING); |
|
| 1125 | 1125 | if ($notam == 'notam') { |
| 1126 | - $settings = array_merge($settings,array('globalNOTAM' => 'TRUE')); |
|
| 1126 | + $settings = array_merge($settings, array('globalNOTAM' => 'TRUE')); |
|
| 1127 | 1127 | } else { |
| 1128 | - $settings = array_merge($settings,array('globalNOTAM' => 'FALSE')); |
|
| 1128 | + $settings = array_merge($settings, array('globalNOTAM' => 'FALSE')); |
|
| 1129 | 1129 | } |
| 1130 | - $owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING); |
|
| 1130 | + $owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING); |
|
| 1131 | 1131 | if ($owner == 'owner') { |
| 1132 | - $settings = array_merge($settings,array('globalOwner' => 'TRUE')); |
|
| 1132 | + $settings = array_merge($settings, array('globalOwner' => 'TRUE')); |
|
| 1133 | 1133 | } else { |
| 1134 | - $settings = array_merge($settings,array('globalOwner' => 'FALSE')); |
|
| 1134 | + $settings = array_merge($settings, array('globalOwner' => 'FALSE')); |
|
| 1135 | 1135 | } |
| 1136 | - $map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING); |
|
| 1136 | + $map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING); |
|
| 1137 | 1137 | if ($map3d == 'map3d') { |
| 1138 | - $settings = array_merge($settings,array('globalMap3D' => 'TRUE')); |
|
| 1138 | + $settings = array_merge($settings, array('globalMap3D' => 'TRUE')); |
|
| 1139 | 1139 | } else { |
| 1140 | - $settings = array_merge($settings,array('globalMap3D' => 'FALSE')); |
|
| 1140 | + $settings = array_merge($settings, array('globalMap3D' => 'FALSE')); |
|
| 1141 | 1141 | } |
| 1142 | - $crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING); |
|
| 1142 | + $crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING); |
|
| 1143 | 1143 | if ($crash == 'crash') { |
| 1144 | - $settings = array_merge($settings,array('globalAccidents' => 'TRUE')); |
|
| 1144 | + $settings = array_merge($settings, array('globalAccidents' => 'TRUE')); |
|
| 1145 | 1145 | } else { |
| 1146 | - $settings = array_merge($settings,array('globalAccidents' => 'FALSE')); |
|
| 1146 | + $settings = array_merge($settings, array('globalAccidents' => 'FALSE')); |
|
| 1147 | 1147 | } |
| 1148 | - $mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING); |
|
| 1148 | + $mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING); |
|
| 1149 | 1149 | if ($mapsatellites == 'mapsatellites') { |
| 1150 | - $settings = array_merge($settings,array('globalMapSatellites' => 'TRUE')); |
|
| 1150 | + $settings = array_merge($settings, array('globalMapSatellites' => 'TRUE')); |
|
| 1151 | 1151 | } else { |
| 1152 | - $settings = array_merge($settings,array('globalMapSatellites' => 'FALSE')); |
|
| 1152 | + $settings = array_merge($settings, array('globalMapSatellites' => 'FALSE')); |
|
| 1153 | 1153 | } |
| 1154 | - $map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING); |
|
| 1154 | + $map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING); |
|
| 1155 | 1155 | if ($map3ddefault == 'map3ddefault') { |
| 1156 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE')); |
|
| 1156 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE')); |
|
| 1157 | 1157 | } else { |
| 1158 | - $settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE')); |
|
| 1158 | + $settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE')); |
|
| 1159 | 1159 | } |
| 1160 | - $translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING); |
|
| 1160 | + $translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING); |
|
| 1161 | 1161 | if ($translate == 'translate') { |
| 1162 | - $settings = array_merge($settings,array('globalTranslate' => 'TRUE')); |
|
| 1162 | + $settings = array_merge($settings, array('globalTranslate' => 'TRUE')); |
|
| 1163 | 1163 | } else { |
| 1164 | - $settings = array_merge($settings,array('globalTranslate' => 'FALSE')); |
|
| 1164 | + $settings = array_merge($settings, array('globalTranslate' => 'FALSE')); |
|
| 1165 | 1165 | } |
| 1166 | - $realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING); |
|
| 1166 | + $realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING); |
|
| 1167 | 1167 | if ($realairlines == 'realairlines') { |
| 1168 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE')); |
|
| 1168 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE')); |
|
| 1169 | 1169 | } else { |
| 1170 | - $settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE')); |
|
| 1170 | + $settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE')); |
|
| 1171 | 1171 | } |
| 1172 | - $estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING); |
|
| 1172 | + $estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING); |
|
| 1173 | 1173 | if ($estimation == 'estimation') { |
| 1174 | - $settings = array_merge($settings,array('globalMapEstimation' => 'TRUE')); |
|
| 1174 | + $settings = array_merge($settings, array('globalMapEstimation' => 'TRUE')); |
|
| 1175 | 1175 | } else { |
| 1176 | - $settings = array_merge($settings,array('globalMapEstimation' => 'FALSE')); |
|
| 1176 | + $settings = array_merge($settings, array('globalMapEstimation' => 'FALSE')); |
|
| 1177 | 1177 | } |
| 1178 | - $metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING); |
|
| 1178 | + $metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING); |
|
| 1179 | 1179 | if ($metar == 'metar') { |
| 1180 | - $settings = array_merge($settings,array('globalMETAR' => 'TRUE')); |
|
| 1180 | + $settings = array_merge($settings, array('globalMETAR' => 'TRUE')); |
|
| 1181 | 1181 | } else { |
| 1182 | - $settings = array_merge($settings,array('globalMETAR' => 'FALSE')); |
|
| 1182 | + $settings = array_merge($settings, array('globalMETAR' => 'FALSE')); |
|
| 1183 | 1183 | } |
| 1184 | - $metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING); |
|
| 1184 | + $metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING); |
|
| 1185 | 1185 | if ($metarcycle == 'metarcycle') { |
| 1186 | - $settings = array_merge($settings,array('globalMETARcycle' => 'TRUE')); |
|
| 1186 | + $settings = array_merge($settings, array('globalMETARcycle' => 'TRUE')); |
|
| 1187 | 1187 | } else { |
| 1188 | - $settings = array_merge($settings,array('globalMETARcycle' => 'FALSE')); |
|
| 1188 | + $settings = array_merge($settings, array('globalMETARcycle' => 'FALSE')); |
|
| 1189 | 1189 | } |
| 1190 | - $fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING); |
|
| 1190 | + $fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING); |
|
| 1191 | 1191 | if ($fork == 'fork') { |
| 1192 | - $settings = array_merge($settings,array('globalFork' => 'TRUE')); |
|
| 1192 | + $settings = array_merge($settings, array('globalFork' => 'TRUE')); |
|
| 1193 | 1193 | } else { |
| 1194 | - $settings = array_merge($settings,array('globalFork' => 'FALSE')); |
|
| 1194 | + $settings = array_merge($settings, array('globalFork' => 'FALSE')); |
|
| 1195 | 1195 | } |
| 1196 | 1196 | |
| 1197 | - $colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING); |
|
| 1197 | + $colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING); |
|
| 1198 | 1198 | if ($colormap == 'colormap') { |
| 1199 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1199 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE')); |
|
| 1200 | 1200 | } else { |
| 1201 | - $settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1201 | + $settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE')); |
|
| 1202 | 1202 | } |
| 1203 | 1203 | |
| 1204 | 1204 | if (isset($_POST['aircrafticoncolor'])) { |
| 1205 | - $aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING); |
|
| 1206 | - $settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1))); |
|
| 1205 | + $aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING); |
|
| 1206 | + $settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1))); |
|
| 1207 | 1207 | } |
| 1208 | 1208 | |
| 1209 | - $airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT); |
|
| 1210 | - $settings = array_merge($settings,array('globalAirportZoom' => $airportzoom)); |
|
| 1209 | + $airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT); |
|
| 1210 | + $settings = array_merge($settings, array('globalAirportZoom' => $airportzoom)); |
|
| 1211 | 1211 | |
| 1212 | - $unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING); |
|
| 1213 | - $settings = array_merge($settings,array('globalUnitDistance' => $unitdistance)); |
|
| 1214 | - $unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING); |
|
| 1215 | - $settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude)); |
|
| 1216 | - $unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING); |
|
| 1217 | - $settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed)); |
|
| 1212 | + $unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING); |
|
| 1213 | + $settings = array_merge($settings, array('globalUnitDistance' => $unitdistance)); |
|
| 1214 | + $unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING); |
|
| 1215 | + $settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude)); |
|
| 1216 | + $unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING); |
|
| 1217 | + $settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed)); |
|
| 1218 | 1218 | |
| 1219 | - $mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING); |
|
| 1219 | + $mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING); |
|
| 1220 | 1220 | if ($mappopup == 'mappopup') { |
| 1221 | - $settings = array_merge($settings,array('globalMapPopup' => 'TRUE')); |
|
| 1221 | + $settings = array_merge($settings, array('globalMapPopup' => 'TRUE')); |
|
| 1222 | 1222 | } else { |
| 1223 | - $settings = array_merge($settings,array('globalMapPopup' => 'FALSE')); |
|
| 1223 | + $settings = array_merge($settings, array('globalMapPopup' => 'FALSE')); |
|
| 1224 | 1224 | } |
| 1225 | - $airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING); |
|
| 1225 | + $airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING); |
|
| 1226 | 1226 | if ($airportpopup == 'airportpopup') { |
| 1227 | - $settings = array_merge($settings,array('globalAirportPopup' => 'TRUE')); |
|
| 1227 | + $settings = array_merge($settings, array('globalAirportPopup' => 'TRUE')); |
|
| 1228 | 1228 | } else { |
| 1229 | - $settings = array_merge($settings,array('globalAirportPopup' => 'FALSE')); |
|
| 1229 | + $settings = array_merge($settings, array('globalAirportPopup' => 'FALSE')); |
|
| 1230 | 1230 | } |
| 1231 | - $maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING); |
|
| 1231 | + $maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING); |
|
| 1232 | 1232 | if ($maphistory == 'maphistory') { |
| 1233 | - $settings = array_merge($settings,array('globalMapHistory' => 'TRUE')); |
|
| 1233 | + $settings = array_merge($settings, array('globalMapHistory' => 'TRUE')); |
|
| 1234 | 1234 | } else { |
| 1235 | - $settings = array_merge($settings,array('globalMapHistory' => 'FALSE')); |
|
| 1235 | + $settings = array_merge($settings, array('globalMapHistory' => 'FALSE')); |
|
| 1236 | 1236 | } |
| 1237 | - $maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING); |
|
| 1237 | + $maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING); |
|
| 1238 | 1238 | if ($maptooltip == 'maptooltip') { |
| 1239 | - $settings = array_merge($settings,array('globalMapTooltip' => 'TRUE')); |
|
| 1239 | + $settings = array_merge($settings, array('globalMapTooltip' => 'TRUE')); |
|
| 1240 | 1240 | } else { |
| 1241 | - $settings = array_merge($settings,array('globalMapTooltip' => 'FALSE')); |
|
| 1241 | + $settings = array_merge($settings, array('globalMapTooltip' => 'FALSE')); |
|
| 1242 | 1242 | } |
| 1243 | - $flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING); |
|
| 1243 | + $flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING); |
|
| 1244 | 1244 | if ($flightroute == 'flightroute') { |
| 1245 | - $settings = array_merge($settings,array('globalMapRoute' => 'TRUE')); |
|
| 1245 | + $settings = array_merge($settings, array('globalMapRoute' => 'TRUE')); |
|
| 1246 | 1246 | } else { |
| 1247 | - $settings = array_merge($settings,array('globalMapRoute' => 'FALSE')); |
|
| 1247 | + $settings = array_merge($settings, array('globalMapRoute' => 'FALSE')); |
|
| 1248 | 1248 | } |
| 1249 | - $allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING); |
|
| 1249 | + $allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING); |
|
| 1250 | 1250 | if ($allflights == 'allflights') { |
| 1251 | - $settings = array_merge($settings,array('globalAllFlights' => 'TRUE')); |
|
| 1251 | + $settings = array_merge($settings, array('globalAllFlights' => 'TRUE')); |
|
| 1252 | 1252 | } else { |
| 1253 | - $settings = array_merge($settings,array('globalAllFlights' => 'FALSE')); |
|
| 1253 | + $settings = array_merge($settings, array('globalAllFlights' => 'FALSE')); |
|
| 1254 | 1254 | } |
| 1255 | - $bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING); |
|
| 1255 | + $bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING); |
|
| 1256 | 1256 | if ($bbox == 'bbox') { |
| 1257 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE')); |
|
| 1257 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE')); |
|
| 1258 | 1258 | } else { |
| 1259 | - $settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE')); |
|
| 1259 | + $settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE')); |
|
| 1260 | 1260 | } |
| 1261 | - $waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING); |
|
| 1261 | + $waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING); |
|
| 1262 | 1262 | if ($waypoints == 'waypoints') { |
| 1263 | - $settings = array_merge($settings,array('globalWaypoints' => 'TRUE')); |
|
| 1263 | + $settings = array_merge($settings, array('globalWaypoints' => 'TRUE')); |
|
| 1264 | 1264 | } else { |
| 1265 | - $settings = array_merge($settings,array('globalWaypoints' => 'FALSE')); |
|
| 1265 | + $settings = array_merge($settings, array('globalWaypoints' => 'FALSE')); |
|
| 1266 | 1266 | } |
| 1267 | - $noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING); |
|
| 1267 | + $noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING); |
|
| 1268 | 1268 | if ($noairlines == 'noairlines') { |
| 1269 | - $settings = array_merge($settings,array('globalNoAirlines' => 'TRUE')); |
|
| 1269 | + $settings = array_merge($settings, array('globalNoAirlines' => 'TRUE')); |
|
| 1270 | 1270 | } else { |
| 1271 | - $settings = array_merge($settings,array('globalNoAirlines' => 'FALSE')); |
|
| 1271 | + $settings = array_merge($settings, array('globalNoAirlines' => 'FALSE')); |
|
| 1272 | 1272 | } |
| 1273 | 1273 | |
| 1274 | - if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE')); |
|
| 1274 | + if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE')); |
|
| 1275 | 1275 | |
| 1276 | 1276 | // Set some defaults values... |
| 1277 | 1277 | if (!isset($globalAircraftImageSources)) { |
| 1278 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1279 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1278 | + $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 1279 | + $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1280 | 1280 | } |
| 1281 | 1281 | |
| 1282 | 1282 | if (!isset($globalSchedulesSources)) { |
| 1283 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1284 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1283 | + $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware'); |
|
| 1284 | + $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1285 | 1285 | } |
| 1286 | 1286 | |
| 1287 | - $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
|
| 1287 | + $settings = array_merge($settings, array('globalInstalled' => 'TRUE')); |
|
| 1288 | 1288 | |
| 1289 | 1289 | if ($error == '') settings::modify_settings($settings); |
| 1290 | 1290 | if ($error == '') settings::comment_settings($settings_comment); |
