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

fixes for finishing installation correctly

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-20 10:44:05 +02:00
parent 9dc95e086d
commit 2c9b2c1d67
7 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Froxlor/Install/Install.php
View File

@@ -404,8 +404,20 @@ class Install
$default = 'bullseye';
// read os-release
if (@file_exists('/etc/os-release')) {
$os_dist = parse_ini_file('/etc/os-release', false);
if (@file_exists('/etc/os-release') && is_readable('/etc/os-release')) {
if (function_exists('parse_ini_file')) {
$os_dist = parse_ini_file('/etc/os-release', false);
} else {
$osrf = explode("\n", file_get_contents('/etc/os-release'));
foreach ($osrf as $line) {
$osrfline = explode("\n", $line);
if ($osrfline[0] == 'VERSION_CODENAME') {
$os_dist['VERSION_CODENAME'] = $osrfline[1];
} else if ($osrfline[0] == 'ID') {
$os_dist['ID'] = $osrfline[1];
}
}
}
return strtolower($os_dist['VERSION_CODENAME'] ?? ($os_dist['ID'] ?? $default));
}
return $default;

20
lib/Froxlor/Install/Install/Core.php
View File

@@ -116,6 +116,7 @@ class Core
$this->doDataEntries($pdo);
// create JSON array for config-services
$this->createJsonArray();
$this->createUserdataParamStr();
}
public function getUnprivilegedPdo(): PDO
@@ -675,4 +676,23 @@ class Core
];
$_SESSION['installation']['json_params'] = json_encode($json_params);
}
private function createUserdataParamStr()
{
$req_fields = [
'mysql_host',
'mysql_unprivileged_user',
'mysql_unprivileged_pass',
'mysql_database',
'mysql_root_user',
'mysql_root_pass',
'mysql_ssl_ca_file',
'mysql_ssl_verify_server_certificate'
];
$json_params = [];
foreach ($req_fields as $field) {
$json_params[$field] = $this->validatedData[$field] ?? "";
}
$_SESSION['installation']['ud_str'] = base64_encode(json_encode($json_params));
}
}