From 13daa7d6fae5f75c5e164c6b58110fb9391cc8a7 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 7 Jul 2023 09:50:50 +0200 Subject: [PATCH] set version to 2.0.21 for upcoming maintenance release Signed-off-by: Michael Kaufmann --- install/froxlor.sql.php | 4 ++-- install/updates/froxlor/update_2.x.inc.php | 7 ++++++- install/updates/preconfig/preconfig_2.x.inc.php | 2 +- lib/Froxlor/Froxlor.php | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index 7539b493..240d8c11 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -697,7 +697,7 @@ opcache.validate_timestamps'), ('system', 'distribution', ''), ('system', 'update_channel', 'stable'), ('system', 'updatecheck_data', ''), - ('system', 'update_notify_last', '2.0.20'), + ('system', 'update_notify_last', '2.0.21'), ('system', 'traffictool', 'goaccess'), ('system', 'req_limit_per_interval', 60), ('system', 'req_limit_interval', 60), @@ -744,7 +744,7 @@ opcache.validate_timestamps'), ('panel', 'logo_overridetheme', '0'), ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), - ('panel', 'version', '2.0.20'), + ('panel', 'version', '2.0.21'), ('panel', 'db_version', '202304260'); diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index 7e3541df..20de9e0e 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -149,7 +149,7 @@ if (Froxlor::isFroxlorVersion('0.10.38.3')) { Update::showUpdateStep("Adding new settings"); $panel_settings_mode = isset($_POST['panel_settings_mode']) ? (int)$_POST['panel_settings_mode'] : 0; Settings::AddNew("panel.settings_mode", $panel_settings_mode); - $system_distribution = isset($_POST['system_distribution']) ? $_POST['system_distribution'] : ''; + $system_distribution = isset($_POST['system_distribution']) ? $_POST['system_distribution'] : 'bullseye'; Settings::AddNew("system.distribution", $system_distribution); Settings::AddNew("system.update_channel", 'stable'); Settings::AddNew("system.updatecheck_data", ''); @@ -497,3 +497,8 @@ if (Froxlor::isFroxlorVersion('2.0.19')) { Update::showUpdateStep("Updating from 2.0.19 to 2.0.20", false); Froxlor::updateToVersion('2.0.20'); } + +if (Froxlor::isFroxlorVersion('2.0.20')) { + Update::showUpdateStep("Updating from 2.0.20 to 2.0.21", false); + Froxlor::updateToVersion('2.0.21'); +} diff --git a/install/updates/preconfig/preconfig_2.x.inc.php b/install/updates/preconfig/preconfig_2.x.inc.php index 5eb3d97d..d4e0e6e4 100644 --- a/install/updates/preconfig/preconfig_2.x.inc.php +++ b/install/updates/preconfig/preconfig_2.x.inc.php @@ -54,7 +54,7 @@ if (Update::versionInUpdate($current_version, '2.0.0-beta1')) { $config_dir = FileDir::makeCorrectDir(Froxlor::getInstallDir() . '/lib/configfiles/'); // show list of available distro's $distros = glob($config_dir . '*.xml'); - $distributions_select[''] = '-'; + // selection is required $distributions_select[''] = '-'; // read in all the distros foreach ($distros as $_distribution) { // get configparser object diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index f8169694..b8269bac 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '2.0.20'; + const VERSION = '2.0.21'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202304260';