@@ -322,14 +322,14 @@ discard block |
||
322 | 322 | </tr> |
323 | 323 | <!-- |
324 | 324 | <?php |
325 | - if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') { |
|
326 | - require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
327 | - $Connection = new Connection(); |
|
325 | + if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') { |
|
326 | + require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
327 | + $Connection = new Connection(); |
|
328 | 328 | ?> |
329 | 329 | --> |
330 | 330 | <?php |
331 | 331 | if ($Connection->db != NULL) { |
332 | - if ($Connection->tableExists('source_location')) { |
|
332 | + if ($Connection->tableExists('source_location')) { |
|
333 | 333 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
334 | 334 | $Source = new Source(); |
335 | 335 | //$alllocations = $Source->getAllLocationInfo(); |
@@ -349,9 +349,9 @@ discard block |
||
349 | 349 | |
350 | 350 | <?php |
351 | 351 | } |
352 | - } |
|
352 | + } |
|
353 | + } |
|
353 | 354 | } |
354 | - } |
|
355 | 355 | ?> |
356 | 356 | |
357 | 357 | <tr> |
@@ -461,12 +461,12 @@ discard block |
||
461 | 461 | ?> |
462 | 462 | <tr> |
463 | 463 | <?php |
464 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
464 | + if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
465 | 465 | ?> |
466 | 466 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
467 | 467 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td> |
468 | 468 | <?php |
469 | - } else { |
|
469 | + } else { |
|
470 | 470 | $hostport = explode(':',$source['host']); |
471 | 471 | if (isset($hostport[1])) { |
472 | 472 | $host = $hostport[0]; |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | <td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td> |
480 | 480 | <td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php print $port; ?>" /></td> |
481 | 481 | <?php |
482 | - } |
|
482 | + } |
|
483 | 483 | ?> |
484 | 484 | <td> |
485 | 485 | <select name="format[]" id="format"> |
@@ -893,7 +893,7 @@ discard block |
||
893 | 893 | <br /> |
894 | 894 | <p> |
895 | 895 | <?php |
896 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
896 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
897 | 897 | ?> |
898 | 898 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
899 | 899 | <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
@@ -903,11 +903,11 @@ discard block |
||
903 | 903 | <b>The directory cache is not writable, aircraft icon will not be cached</b> |
904 | 904 | <?php |
905 | 905 | } |
906 | - } else { |
|
906 | + } else { |
|
907 | 907 | ?> |
908 | 908 | <b>PHP GD is not installed, you can't change color of aircraft icon on map</b> |
909 | 909 | <?php |
910 | - } |
|
910 | + } |
|
911 | 911 | ?> |
912 | 912 | </p> |
913 | 913 | <br /> |
@@ -931,7 +931,7 @@ discard block |
||
931 | 931 | </p> |
932 | 932 | <?php |
933 | 933 | require('../footer.php'); |
934 | - exit; |
|
934 | + exit; |
|
935 | 935 | } |
936 | 936 | // ' |
937 | 937 | $settings = array(); |
@@ -1022,8 +1022,8 @@ discard block |
||
1022 | 1022 | |
1023 | 1023 | $sources = array(); |
1024 | 1024 | foreach ($source_name as $keys => $name) { |
1025 | - 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]); |
|
1026 | - 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]); |
|
1025 | + 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]); |
|
1026 | + 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]); |
|
1027 | 1027 | } |
1028 | 1028 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
1029 | 1029 | |
@@ -1408,14 +1408,14 @@ discard block |
||
1408 | 1408 | |
1409 | 1409 | // Set some defaults values... |
1410 | 1410 | if (!isset($globalAircraftImageSources)) { |
1411 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
1412 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
1411 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
1412 | + $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
1413 | 1413 | } |
1414 | 1414 | |
1415 | 1415 | if (!isset($globalSchedulesSources)) { |
1416 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
1417 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
1418 | - } |
|
1416 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
1417 | + $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
1418 | + } |
|
1419 | 1419 | |
1420 | 1420 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
1421 | 1421 | |
@@ -1462,21 +1462,21 @@ discard block |
||
1462 | 1462 | $popi = false; |
1463 | 1463 | $popw = false; |
1464 | 1464 | foreach ($_SESSION['done'] as $done) { |
1465 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
1466 | - if ($done == 'Create database') $pop = true; |
|
1467 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
1468 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
1469 | - if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
1465 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
1466 | + if ($done == 'Create database') $pop = true; |
|
1467 | + if ($_SESSION['install'] == 'database_create') $pop = true; |
|
1468 | + if ($_SESSION['install'] == 'database_import') $popi = true; |
|
1469 | + if ($_SESSION['install'] == 'waypoints') $popw = true; |
|
1470 | 1470 | } |
1471 | 1471 | if ($pop) { |
1472 | - sleep(5); |
|
1473 | - print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
1472 | + sleep(5); |
|
1473 | + print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
1474 | 1474 | } else if ($popi) { |
1475 | - sleep(5); |
|
1476 | - print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
1475 | + sleep(5); |
|
1476 | + print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
1477 | 1477 | } else if ($popw) { |
1478 | - sleep(5); |
|
1479 | - print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
1478 | + sleep(5); |
|
1479 | + print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>'; |
|
1480 | 1480 | } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
1481 | 1481 | print '</div></ul>'; |
1482 | 1482 | print '<div id="error"></div>'; |
@@ -1539,7 +1539,7 @@ discard block |
||
1539 | 1539 | unset($_COOKIE['install']); |
1540 | 1540 | print '<div class="info column"><ul>'; |
1541 | 1541 | foreach ($_SESSION['done'] as $done) { |
1542 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
1542 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
1543 | 1543 | } |
1544 | 1544 | print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>'; |
1545 | 1545 | print '</ul></div>'; |