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

Allow service ftpserver to be specified via configuration-template-xml default (#1234)

Browse Source
This commit is contained in:
sro0
2024-02-09 08:06:57 +01:00
committed by GitHub
parent 396274d954
commit 953baec023
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -653,14 +653,18 @@ class Core
private function createJsonArray(&$db_user) private function createJsonArray(&$db_user)
{ {
// use traffic analyzer from settings as we could define defaults in the lib/configfiles/*.xml templates // use traffic analyzer and ftpserver from settings as we could define defaults in the lib/configfiles/*.xml templates
// which can be useful for third-party package-maintainer (e.g. other distros) to have more control // which can be useful for third-party package-maintainer (e.g. other distros) to have more control
// over the installation defaults (less hardcoded values) // over the installation defaults (less hardcoded values)
$traffic_analyzer = $db_user->query(" $custom_dependency = $db_user->query("
SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'traffictool' SELECT `varname`, `value` FROM `" . TABLE_PANEL_SETTINGS . "`
WHERE `settinggroup` = 'system' AND (`varname` = 'traffictool' OR `varname` = 'ftpserver')
"); ");
$ta_result = $traffic_analyzer->fetch(\PDO::FETCH_ASSOC); $cd_result = $custom_dependency->fetchAll(\PDO::FETCH_KEY_PAIR);
$system_params = ["cron", "libnssextrausers", "logrotate", $ta_result['value']]; $system_params = ["cron", "libnssextrausers", "logrotate"];
if (isset($cd_result['traffictool'])) {
$system_params[] = $cd_result['traffictool'];
}
if ($this->validatedData['webserver_backend'] == 'php-fpm') { if ($this->validatedData['webserver_backend'] == 'php-fpm') {
$system_params[] = 'php-fpm'; $system_params[] = 'php-fpm';
} elseif ($this->validatedData['webserver_backend'] == 'fcgid') { } elseif ($this->validatedData['webserver_backend'] == 'fcgid') {
@@ -673,7 +677,7 @@ class Core
'smtp' => 'postfix_dovecot', 'smtp' => 'postfix_dovecot',
'mail' => 'dovecot_postfix2', 'mail' => 'dovecot_postfix2',
'antispam' => 'rspamd', 'antispam' => 'rspamd',
'ftp' => 'proftpd', 'ftp' => $cd_result['ftpserver'] ?? 'x',
'system' => $system_params 'system' => $system_params
]; ];
$_SESSION['installation']['json_params'] = json_encode($json_params); $_SESSION['installation']['json_params'] = json_encode($json_params);