diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c199e..b9d5123 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ The following is a history of the changes made to this project. -## v2.7.0 *(pre-release)* +## v2.7.1 *(pre-release)* + +* Added missing purgeAircraft setting to the database. *(advanced)* + +## v2.7.0 *(not released)* * Added option to install dump1090-hptoa. * Added ADSBHub support. diff --git a/build/portal/html/classes/template.class.php b/build/portal/html/classes/template.class.php index 310e86b..e075026 100644 --- a/build/portal/html/classes/template.class.php +++ b/build/portal/html/classes/template.class.php @@ -7,7 +7,7 @@ // // // The MIT License (MIT) // // // - // Copyright (c) 2015-2016 Joseph A. Prochazka // + // Copyright (c) 2015-2019 Joseph A. Prochazka // // // // Permission is hereby granted, free of charge, to any person obtaining a copy // // of this software and associated documentation files (the "Software"), to deal // @@ -37,7 +37,7 @@ // Check if the portal is installed or needs upgraded. - $thisVersion = "2.7.0"; + $thisVersion = "2.7.1"; if (!file_exists($_SERVER['DOCUMENT_ROOT']."/classes/settings.class.php")) { header ("Location: /install/install.php"); diff --git a/build/portal/html/install/index.php b/build/portal/html/install/index.php index 6828cc1..562c854 100644 --- a/build/portal/html/install/index.php +++ b/build/portal/html/install/index.php @@ -7,7 +7,7 @@ // // // The MIT License (MIT) // // // - // Copyright (c) 2015-2016 Joseph A. Prochazka // + // Copyright (c) 2015-2019 Joseph A. Prochazka // // // // Permission is hereby granted, free of charge, to any person obtaining a copy // // of this software and associated documentation files (the "Software"), to deal // @@ -29,7 +29,7 @@ ///////////////////////////////////////////////////////////////////////////////////// // The most current stable release. - $thisVersion = "2.7.0"; + $thisVersion = "2.7.1"; // Begin the upgrade process if this release is newer than what is installed. if (file_exists($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."classes".DIRECTORY_SEPARATOR."settings.class.php")) { @@ -428,7 +428,8 @@ EOF; $common->addSetting('timeZone', $_POST['timeZone']); $common->addSetting('enableWebNotifications', FALSE); $common->addSetting('googleMapsApiKey', ''); - $common->addSetting("hideNavbarAndFooter", "FALSE"); + $common->addSetting("hideNavbarAndFooter", FALSE); + $common->addSetting("purgeAircraft", FALSE); if ($_POST['driver'] == "xml") $common->addSetting('enableFlights', FALSE); diff --git a/build/portal/html/install/upgrade-v2.7.1.php b/build/portal/html/install/upgrade-v2.7.1.php new file mode 100644 index 0000000..093b43f --- /dev/null +++ b/build/portal/html/install/upgrade-v2.7.1.php @@ -0,0 +1,71 @@ +addSetting("purgeAircraft", "FALSE"); + + // Update the version and patch settings.. + $common->updateSetting("version", "2.7.1"); + $common->updateSetting("patch", ""); + + // The upgrade process completed successfully. + $results['success'] = TRUE; + $results['message'] = "Upgrade to v2.7.1 successful."; + return $results; + + } catch(Exception $e) { + // Something went wrong during this upgrade process. + $results['success'] = FALSE; + $results['message'] = $e->getMessage(); + return $results; + } + } +?> + diff --git a/build/portal/html/install/upgrade.php b/build/portal/html/install/upgrade.php index dee700f..7e2f713 100644 --- a/build/portal/html/install/upgrade.php +++ b/build/portal/html/install/upgrade.php @@ -7,7 +7,7 @@ // // // The MIT License (MIT) // // // - // Copyright (c) 2015-2016 Joseph A. Prochazka // + // Copyright (c) 2015-2019 Joseph A. Prochazka // // // // Permission is hereby granted, free of charge, to any person obtaining a copy // // of this software and associated documentation files (the "Software"), to deal // @@ -33,7 +33,7 @@ $common = new common(); // The most current stable release. - $thisVersion = "2.7.0"; + $thisVersion = "2.7.1"; // Begin the upgrade process if this release is newer than what is installed. if ($common->getSetting("version") == $thisVersion) { @@ -159,6 +159,15 @@ $version = "2.7.0"; } + // UPGRADE TO V2.7.1 + if ($common->getSetting("version") == "2.7.0" && $success) { + $json = file_get_contents("http://localhost/install/upgrade-v2.7.1.php"); + $results = json_decode($json, TRUE); + $success = $results['success']; + $message = $results['message']; + $version = "2.7.1"; + } + require_once($_SERVER['DOCUMENT_ROOT'].DIRECTORY_SEPARATOR."admin".DIRECTORY_SEPARATOR."includes".DIRECTORY_SEPARATOR."header.inc.php"); // Display the instalation wizard.