diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index a334844a..f2a88369 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -701,7 +701,7 @@ opcache.validate_timestamps'), ('system', 'distribution', ''), ('system', 'update_channel', 'stable'), ('system', 'updatecheck_data', ''), - ('system', 'update_notify_last', '0.11.0-dev1'), + ('system', 'update_notify_last', '2.0.0-beta1'), ('api', 'enabled', '0'), ('2fa', 'enabled', '1'), ('panel', 'decimal_places', '4'), @@ -743,7 +743,7 @@ opcache.validate_timestamps'), ('panel', 'logo_overridetheme', '0'), ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), - ('panel', 'version', '0.11.0-dev1'), + ('panel', 'version', '2.0.0-beta1'), ('panel', 'db_version', '202112310'); diff --git a/install/updates/froxlor/update_0.11.inc.php b/install/updates/froxlor/update_2.x.inc.php similarity index 99% rename from install/updates/froxlor/update_0.11.inc.php rename to install/updates/froxlor/update_2.x.inc.php index 8da662a0..7a2fc2d9 100644 --- a/install/updates/froxlor/update_0.11.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -39,7 +39,7 @@ if (!defined('_CRON_UPDATE')) { // last 0.10.x release if (Froxlor::isFroxlorVersion('0.10.99')) { - $update_to = '0.11.0-dev1'; + $update_to = '2.0.0-beta1'; Update::showUpdateStep("Updating from 0.10.99 to ".$update_to, false); diff --git a/install/updates/preconfig/preconfig_0.11.inc.php b/install/updates/preconfig/preconfig_2.x.inc.php similarity index 96% rename from install/updates/preconfig/preconfig_0.11.inc.php rename to install/updates/preconfig/preconfig_2.x.inc.php index 28d8dc43..ff427cf5 100644 --- a/install/updates/preconfig/preconfig_0.11.inc.php +++ b/install/updates/preconfig/preconfig_2.x.inc.php @@ -29,12 +29,12 @@ use Froxlor\Config\ConfigParser; use Froxlor\Install\Update; $preconfig = [ - 'title' => '0.11.x updates', + 'title' => '2.x updates', 'fields' => [] ]; $return = []; -if (Update::versionInUpdate($current_version, '0.11.0-dev1')) { +if (Update::versionInUpdate($current_version, '2.0.0-beta1')) { $description = 'We have rearranged the settings and split them into basic and advanced categories. This makes it easier for users who do not need all the detailed or very specific settings and options and gives a better overview of the basic/mostly used settings.'; $return['panel_settings_mode_note'] = ['type' => 'infotext', 'value' => $description]; $question = 'Chose settings mode (you can change that at any time)'; diff --git a/install/updatesql.php b/install/updatesql.php index 52913846..22cf2ad3 100644 --- a/install/updatesql.php +++ b/install/updatesql.php @@ -52,7 +52,7 @@ try { if (Froxlor::isFroxlor()) { include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_0.10.inc.php')); - include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_0.11.inc.php')); + include_once(FileDir::makeCorrectFile(dirname(__FILE__) . '/updates/froxlor/update_2.x.inc.php')); // Check Froxlor - database integrity (only happens after all updates are done, so we know the db-layout is okay) Update::showUpdateStep("Checking database integrity"); diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index 14dca8e0..bed653b4 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '0.11.0-dev1'; + const VERSION = '2.0.0-beta1'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202112310'; diff --git a/lib/init.php b/lib/init.php index 5ec6505d..5db591fe 100644 --- a/lib/init.php +++ b/lib/init.php @@ -154,7 +154,7 @@ UI::setLinker($linker); /** * Global Theme-variable */ -if (Update::versionInUpdate(Settings::Get('panel.version'), '0.11.0-dev1')) { +if (Update::versionInUpdate(Settings::Get('panel.version'), '2.0.0-beta1')) { $theme = $_deftheme; } else { $theme = (Settings::Get('panel.default_theme') !== null) ? Settings::Get('panel.default_theme') : $_deftheme;