maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

migrate update/preconfig to a more OOP way and remove unnecessary file/dir complexity

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-05-01 16:48:43 +02:00
parent 1557482d17
commit c59c5efc11
14 changed files with 219 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin_updates.php
View File

@@ -30,6 +30,7 @@ use Froxlor\Cron\TaskId;
use Froxlor\Database\Database;
use Froxlor\Froxlor;
use Froxlor\FroxlorLogger;
use Froxlor\Install\Preconfig;
use Froxlor\Settings;
use Froxlor\System\Cronjob;
use Froxlor\UI\Panel\UI;
@@ -96,15 +97,15 @@ if ($page == 'overview') {
$new_version = Froxlor::VERSION;
$new_db_version = Froxlor::DBVERSION;
$ui_text = lng('update.update_information.part_a');
if (Froxlor::VERSION != $current_version) {
$ui_text = str_replace('%curversion', $current_version, $ui_text);
$ui_text = str_replace('%newversion', $new_version, $ui_text);
$replacer_currentversion = $current_version;
$replacer_newversion = $new_version;
} else {
// show db version
$ui_text = str_replace('%curversion', $current_db_version, $ui_text);
$ui_text = str_replace('%newversion', $new_db_version, $ui_text);
$replacer_currentversion = $current_db_version;
$replacer_newversion = $new_db_version;
}
$ui_text = lng('update.update_information.part_a', [$replacer_newversion, $replacer_currentversion]);
$ui_text .= lng('update.update_information.part_b');
$upd_formfield = [
@@ -121,8 +122,8 @@ if ($page == 'overview') {
]
];
include_once Froxlor::getInstallDir() . '/install/updates/preconfig.php';
$preconfig = getPreConfig($current_version, $current_db_version);
$preconfig = Preconfig::getPreConfig();
if (!empty($preconfig)) {
$upd_formfield['updates']['sections'] = $preconfig;
}