@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | print '</ul>You <strong>must</strong> add these modules.</div>'; |
| 84 | 84 | require('../footer.php'); |
| 85 | - exit; |
|
| 85 | + exit; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | if (!isset($_SESSION['install']) && !isset($_POST['dbtype']) && (count($error) == 0)) { |
@@ -291,17 +291,17 @@ discard block |
||
| 291 | 291 | </tr> |
| 292 | 292 | <!-- |
| 293 | 293 | <?php |
| 294 | - require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 295 | - $Connection = new Connection(); |
|
| 294 | + require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
|
| 295 | + $Connection = new Connection(); |
|
| 296 | 296 | ?> |
| 297 | 297 | --> |
| 298 | 298 | <?php |
| 299 | - if ($Connection->db != NULL) { |
|
| 299 | + if ($Connection->db != NULL) { |
|
| 300 | 300 | if ($Connection->tableExists('source_location')) { |
| 301 | - require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 302 | - $Source = new Source(); |
|
| 303 | - $alllocations = $Source->getAllLocationInfo(); |
|
| 304 | - foreach ($alllocations as $location) { |
|
| 301 | + require_once(dirname(__FILE__).'/../require/class.Source.php'); |
|
| 302 | + $Source = new Source(); |
|
| 303 | + $alllocations = $Source->getAllLocationInfo(); |
|
| 304 | + foreach ($alllocations as $location) { |
|
| 305 | 305 | ?> |
| 306 | 306 | <tr> |
| 307 | 307 | <input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" /> |
@@ -315,9 +315,9 @@ discard block |
||
| 315 | 315 | </tr> |
| 316 | 316 | |
| 317 | 317 | <?php |
| 318 | - } |
|
| 318 | + } |
|
| 319 | + } |
|
| 319 | 320 | } |
| 320 | - } |
|
| 321 | 321 | ?> |
| 322 | 322 | |
| 323 | 323 | <tr> |
@@ -408,12 +408,12 @@ discard block |
||
| 408 | 408 | ?> |
| 409 | 409 | <tr> |
| 410 | 410 | <?php |
| 411 | - if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 411 | + if (filter_var($source['host'],FILTER_VALIDATE_URL)) { |
|
| 412 | 412 | ?> |
| 413 | 413 | <td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td> |
| 414 | 414 | <td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td> |
| 415 | 415 | <?php |
| 416 | - } else { |
|
| 416 | + } else { |
|
| 417 | 417 | $hostport = explode(':',$source['host']); |
| 418 | 418 | if (isset($hostport[1])) { |
| 419 | 419 | $host = $hostport[0]; |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | <td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td> |
| 427 | 427 | <td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td> |
| 428 | 428 | <?php |
| 429 | - } |
|
| 429 | + } |
|
| 430 | 430 | ?> |
| 431 | 431 | <td> |
| 432 | 432 | <select name="format[]" id="format"> |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | <br /> |
| 702 | 702 | <p> |
| 703 | 703 | <?php |
| 704 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 704 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 705 | 705 | ?> |
| 706 | 706 | <label for="aircrafticoncolor">Color of aircraft icon on map</label> |
| 707 | 707 | <input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" /> |
@@ -711,11 +711,11 @@ discard block |
||
| 711 | 711 | <b>The directory cache is not writable, aircraft icon will not be cached</b> |
| 712 | 712 | <?php |
| 713 | 713 | } |
| 714 | - } else { |
|
| 714 | + } else { |
|
| 715 | 715 | ?> |
| 716 | 716 | <b>PHP GD is not installed, you can t change color of aircraft icon on map</b> |
| 717 | 717 | <?php |
| 718 | - } |
|
| 718 | + } |
|
| 719 | 719 | ?> |
| 720 | 720 | </p> |
| 721 | 721 | <br /> |
@@ -734,7 +734,7 @@ discard block |
||
| 734 | 734 | </p> |
| 735 | 735 | <?php |
| 736 | 736 | require('../footer.php'); |
| 737 | - exit; |
|
| 737 | + exit; |
|
| 738 | 738 | } |
| 739 | 739 | |
| 740 | 740 | $settings = array(); |
@@ -824,8 +824,8 @@ discard block |
||
| 824 | 824 | |
| 825 | 825 | $sources = array(); |
| 826 | 826 | foreach ($source_name as $keys => $name) { |
| 827 | - 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]); |
|
| 828 | - 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]); |
|
| 827 | + 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]); |
|
| 828 | + 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]); |
|
| 829 | 829 | } |
| 830 | 830 | if (count($sources) > 0) $_SESSION['sources'] = $sources; |
| 831 | 831 | |
@@ -1078,14 +1078,14 @@ discard block |
||
| 1078 | 1078 | |
| 1079 | 1079 | // Set some defaults values... |
| 1080 | 1080 | if (!isset($globalAircraftImageSources)) { |
| 1081 | - $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1082 | - $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1081 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 1082 | + $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources)); |
|
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | 1085 | if (!isset($globalSchedulesSources)) { |
| 1086 | - $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1087 | - $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1088 | - } |
|
| 1086 | + $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware'); |
|
| 1087 | + $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources)); |
|
| 1088 | + } |
|
| 1089 | 1089 | |
| 1090 | 1090 | $settings = array_merge($settings,array('globalInstalled' => 'TRUE')); |
| 1091 | 1091 | |
@@ -1125,17 +1125,17 @@ discard block |
||
| 1125 | 1125 | print '<ul><div id="step">'; |
| 1126 | 1126 | $pop = false; |
| 1127 | 1127 | foreach ($_SESSION['done'] as $done) { |
| 1128 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1129 | - if ($done == 'Create database') $pop = true; |
|
| 1130 | - if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1131 | - if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1128 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1129 | + if ($done == 'Create database') $pop = true; |
|
| 1130 | + if ($_SESSION['install'] == 'database_create') $pop = true; |
|
| 1131 | + if ($_SESSION['install'] == 'database_import') $popi = true; |
|
| 1132 | 1132 | } |
| 1133 | 1133 | if ($pop) { |
| 1134 | - sleep(5); |
|
| 1135 | - print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1134 | + sleep(5); |
|
| 1135 | + print '<li>Create database....<img src="../images/loading.gif" /></li>'; |
|
| 1136 | 1136 | } else if ($popi) { |
| 1137 | - sleep(5); |
|
| 1138 | - print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1137 | + sleep(5); |
|
| 1138 | + print '<li>Create and import tables....<img src="../images/loading.gif" /></li>'; |
|
| 1139 | 1139 | } else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>'; |
| 1140 | 1140 | print '</div></ul>'; |
| 1141 | 1141 | print '<div id="error"></div>'; |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | unset($_COOKIE['install']); |
| 1199 | 1199 | print '<div class="info column"><ul>'; |
| 1200 | 1200 | foreach ($_SESSION['done'] as $done) { |
| 1201 | - print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1201 | + print '<li>'.$done.'....<strong>SUCCESS</strong></li>'; |
|
| 1202 | 1202 | } |
| 1203 | 1203 | print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>'; |
| 1204 | 1204 | print '</ul></div>'; |