clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 10:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

generalize array-index name of settings to be settingsgroup_varname

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann 2023-02-07 13:39:09 +01:00
parent aa48ffca2b
commit de0f7d2f01
No known key found for this signature in database
GPG Key ID: C121F97338D7A352
14 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/admin/settings/120.system.php
View File

@ -121,7 +121,7 @@ return [
],
'save_method' => 'storeSettingField'
],
'update_channel' => [
'system_update_channel' => [
'label' => lng('serversettings.update_channel'),
'settinggroup' => 'system',
'varname' => 'update_channel',
@ -134,7 +134,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_validatedomain' => [
'system_validate_domain' => [
'label' => lng('serversettings.validate_domain'),
'settinggroup' => 'system',
'varname' => 'validate_domain',
@ -319,7 +319,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'hide_incompatible_settings' => [
'system_hide_incompatible_settings' => [
'label' => lng('serversettings.hide_incompatible_settings'),
'settinggroup' => 'system',
'varname' => 'hide_incompatible_settings',

10
actions/admin/settings/122.froxlorvhost.php
View File

@ -154,7 +154,7 @@ return [
/**
* FCGID
*/
'system_mod_fcgid_enabled_ownvhost' => [
'system_mod_fcgid_ownvhost' => [
'label' => lng('serversettings.mod_fcgid_ownvhost'),
'settinggroup' => 'system',
'varname' => 'mod_fcgid_ownvhost',
@ -224,7 +224,7 @@ return [
/**
* php-fpm
*/
'system_phpfpm_enabled_ownvhost' => [
'phpfpm_enabled_ownvhost' => [
'label' => lng('phpfpm.ownvhost'),
'settinggroup' => 'phpfpm',
'varname' => 'enabled_ownvhost',
@ -237,7 +237,7 @@ return [
]),
'requires_reconf' => ['system:php-fpm']
],
'system_phpfpm_httpuser' => [
'phpfpm_vhost_httpuser' => [
'label' => lng('phpfpm.vhost_httpuser'),
'settinggroup' => 'phpfpm',
'varname' => 'vhost_httpuser',
@ -250,7 +250,7 @@ return [
]),
'requires_reconf' => ['system:php-fpm']
],
'system_phpfpm_httpgroup' => [
'phpfpm_vhost_httpgroup' => [
'label' => lng('phpfpm.vhost_httpgroup'),
'settinggroup' => 'phpfpm',
'varname' => 'vhost_httpgroup',
@ -263,7 +263,7 @@ return [
]),
'requires_reconf' => ['system:php-fpm']
],
'system_phpfpm_defaultini_ownvhost' => [
'phpfpm_vhost_defaultini' => [
'label' => lng('serversettings.mod_fcgid.defaultini_ownvhost'),
'settinggroup' => 'phpfpm',
'varname' => 'vhost_defaultini',

6
actions/admin/settings/130.webserver.php
View File

@ -60,7 +60,7 @@ return [
'apache2'
]
],
'system_apache_itksupport' => [
'system_apacheitksupport' => [
'label' => lng('serversettings.apache_itksupport'),
'settinggroup' => 'system',
'varname' => 'apacheitksupport',
@ -229,7 +229,7 @@ return [
'nginx'
]
],
'system_customersslpath' => [
'system_customer_ssl_path' => [
'label' => lng('serversettings.customerssl_directory'),
'settinggroup' => 'system',
'varname' => 'customer_ssl_path',
@ -287,7 +287,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_apache_globaldiropt' => [
'system_apacheglobaldiropt' => [
'label' => lng('serversettings.apache_globaldiropt'),
'settinggroup' => 'system',
'varname' => 'apacheglobaldiropt',

2
actions/admin/settings/131.ssl.php
View File

@ -32,7 +32,7 @@ return [
'title' => lng('admin.sslsettings'),
'icon' => 'fa-solid fa-shield',
'fields' => [
'system_ssl_enabled' => [
'system_use_ssl' => [
'label' => lng('serversettings.ssl.use_ssl'),
'settinggroup' => 'system',
'varname' => 'use_ssl',

2
actions/admin/settings/135.fcgid.php
View File

@ -33,7 +33,7 @@ return [
'lighttpd'
],
'fields' => [
'system_mod_fcgid_enabled' => [
'system_mod_fcgid' => [
'label' => lng('serversettings.mod_fcgid'),
'settinggroup' => 'system',
'varname' => 'mod_fcgid',

24
actions/admin/settings/136.phpfpm.php
View File

@ -31,7 +31,7 @@ return [
'title' => lng('admin.phpfpm_settings'),
'icon' => 'fa-brands fa-php',
'fields' => [
'system_phpfpm_enabled' => [
'phpfpm_enabled' => [
'label' => lng('serversettings.phpfpm'),
'settinggroup' => 'phpfpm',
'varname' => 'enabled',
@ -45,7 +45,7 @@ return [
'overview_option' => true,
'requires_reconf' => ['http', 'system:php-fpm']
],
'system_phpfpm_defaultini' => [
'phpfpm_defaultini' => [
'label' => lng('serversettings.mod_fcgid.defaultini'),
'settinggroup' => 'phpfpm',
'varname' => 'defaultini',
@ -57,7 +57,7 @@ return [
],
'save_method' => 'storeSettingField'
],
'system_phpfpm_aliasconfigdir' => [
'phpfpm_aliasconfigdir' => [
'label' => lng('serversettings.phpfpm_settings.aliasconfigdir'),
'settinggroup' => 'phpfpm',
'varname' => 'aliasconfigdir',
@ -67,7 +67,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_tmpdir' => [
'phpfpm_tmpdir' => [
'label' => lng('serversettings.mod_fcgid.tmpdir'),
'settinggroup' => 'phpfpm',
'varname' => 'tmpdir',
@ -76,7 +76,7 @@ return [
'default' => '/var/customers/tmp/',
'save_method' => 'storeSettingField'
],
'system_phpfpm_peardir' => [
'phpfpm_peardir' => [
'label' => lng('serversettings.mod_fcgid.peardir'),
'settinggroup' => 'phpfpm',
'varname' => 'peardir',
@ -88,7 +88,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_envpath' => [
'phpfpm_envpath' => [
'label' => lng('serversettings.phpfpm_settings.envpath'),
'settinggroup' => 'phpfpm',
'varname' => 'envpath',
@ -100,7 +100,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_fastcgi_ipcdir' => [
'phpfpm_fastcgi_ipcdir' => [
'label' => lng('serversettings.phpfpm_settings.ipcdir'),
'settinggroup' => 'phpfpm',
'varname' => 'fastcgi_ipcdir',
@ -110,7 +110,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_use_mod_proxy' => [
'phpfpm_use_mod_proxy' => [
'label' => lng('phpfpm.use_mod_proxy'),
'settinggroup' => 'phpfpm',
'varname' => 'use_mod_proxy',
@ -119,7 +119,7 @@ return [
'visible' => Settings::Get('system.apache24'),
'save_method' => 'storeSettingField'
],
'system_phpfpm_ini_flags' => [
'phpfpm_ini_flags' => [
'label' => lng('phpfpm.ini_flags'),
'settinggroup' => 'phpfpm',
'varname' => 'ini_flags',
@ -128,7 +128,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_ini_values' => [
'phpfpm_ini_values' => [
'label' => lng('phpfpm.ini_values'),
'settinggroup' => 'phpfpm',
'varname' => 'ini_values',
@ -137,7 +137,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_ini_admin_flags' => [
'phpfpm_ini_admin_flags' => [
'label' => lng('phpfpm.ini_admin_flags'),
'settinggroup' => 'phpfpm',
'varname' => 'ini_admin_flags',
@ -146,7 +146,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'system_phpfpm_ini_admin_values' => [
'phpfpm_ini_admin_values' => [
'label' => lng('phpfpm.ini_admin_values'),
'settinggroup' => 'phpfpm',
'varname' => 'ini_admin_values',

8
actions/admin/settings/137.perl.php
View File

@ -29,7 +29,7 @@ return [
'title' => lng('admin.perl_settings'),
'icon' => 'fa-solid fa-code',
'fields' => [
'perl_path' => [
'system_perl_path' => [
'label' => lng('serversettings.perl_path'),
'settinggroup' => 'system',
'varname' => 'perl_path',
@ -40,7 +40,7 @@ return [
'lighttpd'
]
],
'system_perl_suexecworkaround' => [
'perl_suexecworkaround' => [
'label' => lng('serversettings.perl.suexecworkaround'),
'settinggroup' => 'perl',
'varname' => 'suexecworkaround',
@ -51,7 +51,7 @@ return [
'apache2'
]
],
'system_perl_suexeccgipath' => [
'perl_suexecpath' => [
'label' => lng('serversettings.perl.suexeccgipath'),
'settinggroup' => 'perl',
'varname' => 'suexecpath',
@ -63,7 +63,7 @@ return [
'apache2'
]
],
'perl_server' => [
'serversettings_perl_server' => [
'label' => lng('serversettings.perl_server'),
'settinggroup' => 'serversettings',
'varname' => 'perl_server',

2
actions/admin/settings/150.mail.php
View File

@ -98,7 +98,7 @@ return [
'default' => 100,
'save_method' => 'storeSettingField'
],
'system_catchall_enabled' => [
'catchall_catchall_enabled' => [
'label' => lng('serversettings.catchall_enabled'),
'settinggroup' => 'catchall',
'varname' => 'catchall_enabled',

2
actions/admin/settings/155.ftpserver.php
View File

@ -29,7 +29,7 @@ return [
'title' => lng('admin.ftpserversettings'),
'icon' => 'fa-solid fa-arrow-right-arrow-left',
'fields' => [
'ftpserver' => [
'system_ftpserver' => [
'label' => lng('admin.ftpserver'),
'settinggroup' => 'system',
'varname' => 'ftpserver',

2
actions/admin/settings/160.nameserver.php
View File

@ -31,7 +31,7 @@ return [
'title' => lng('admin.nameserversettings'),
'icon' => 'fa-solid fa-globe',
'fields' => [
'nameserver_enable' => [
'system_bind_enable' => [
'label' => lng('serversettings.bindenable'),
'settinggroup' => 'system',
'varname' => 'bind_enable',

18
actions/admin/settings/180.dkim.php
View File

@ -31,7 +31,7 @@ return [
'title' => lng('admin.dkimsettings'),
'icon' => 'fa-solid fa-fingerprint',
'fields' => [
'dkim_enabled' => [
'dkim_use_dkim' => [
'label' => lng('dkim.use_dkim'),
'settinggroup' => 'dkim',
'varname' => 'use_dkim',
@ -40,7 +40,7 @@ return [
'save_method' => 'storeSettingFieldInsertBindTask',
'overview_option' => true
],
'dkim_prefix' => [
'dkim_dkim_prefix' => [
'label' => lng('dkim.dkim_prefix'),
'settinggroup' => 'dkim',
'varname' => 'dkim_prefix',
@ -59,7 +59,7 @@ return [
'save_method' => 'storeSettingField',
'advanced_mode' => true
],
'dkim_domains' => [
'dkim_dkim_domains' => [
'label' => lng('dkim.dkim_domains'),
'settinggroup' => 'dkim',
'varname' => 'dkim_domains',
@ -68,7 +68,7 @@ return [
'default' => 'domains',
'save_method' => 'storeSettingField'
],
'dkim_dkimkeys' => [
'dkim_dkim_dkimkeys' => [
'label' => lng('dkim.dkim_dkimkeys'),
'settinggroup' => 'dkim',
'varname' => 'dkim_dkimkeys',
@ -77,7 +77,7 @@ return [
'default' => 'dkim-keys.conf',
'save_method' => 'storeSettingField'
],
'dkim_algorithm' => [
'dkim_dkim_algorithm' => [
'label' => lng('dkim.dkim_algorithm'),
'settinggroup' => 'dkim',
'varname' => 'dkim_algorithm',
@ -92,7 +92,7 @@ return [
'save_method' => 'storeSettingFieldInsertBindTask',
'advanced_mode' => true
],
'dkim_servicetype' => [
'dkim_dkim_servicetype' => [
'label' => lng('dkim.dkim_servicetype'),
'settinggroup' => 'dkim',
'varname' => 'dkim_servicetype',
@ -105,7 +105,7 @@ return [
'save_method' => 'storeSettingFieldInsertBindTask',
'advanced_mode' => true
],
'dkim_keylength' => [
'dkim_dkim_keylength' => [
'label' => [
'title' => lng('dkim.dkim_keylength.title'),
'description' => lng('dkim.dkim_keylength.description', [Settings::Get('dkim.dkim_prefix')])
@ -120,7 +120,7 @@ return [
],
'save_method' => 'storeSettingFieldInsertBindTask'
],
'dkim_notes' => [
'dkim_dkim_notes' => [
'label' => lng('dkim.dkim_notes'),
'settinggroup' => 'dkim',
'varname' => 'dkim_notes',
@ -130,7 +130,7 @@ return [
'save_method' => 'storeSettingFieldInsertBindTask',
'advanced_mode' => true
],
'dkimrestart_command' => [
'dkim_dkimrestart_command' => [
'label' => lng('dkim.dkimrestart_command'),
'settinggroup' => 'dkim',
'varname' => 'dkimrestart_command',

4
actions/admin/settings/185.spf.php
View File

@ -29,7 +29,7 @@ return [
'title' => lng('admin.spfsettings'),
'icon' => 'fa-solid fa-clipboard-check',
'fields' => [
'use_spf' => [
'spf_use_spf' => [
'label' => lng('spf.use_spf'),
'settinggroup' => 'spf',
'varname' => 'use_spf',
@ -38,7 +38,7 @@ return [
'save_method' => 'storeSettingField',
'overview_option' => true
],
'spf_entry' => [
'spf_spf_entry' => [
'label' => lng('spf.spf_entry'),
'settinggroup' => 'spf',
'varname' => 'spf_entry',

8
actions/admin/settings/220.quota.php
View File

@ -30,7 +30,7 @@ return [
'icon' => 'fa-solid fa-sliders',
'advanced_mode' => true,
'fields' => [
'diskquota_enabled' => [
'system_diskquota_enabled' => [
'label' => lng('serversettings.diskquota_enabled'),
'settinggroup' => 'system',
'varname' => 'diskquota_enabled',
@ -39,7 +39,7 @@ return [
'save_method' => 'storeSettingField',
'overview_option' => true
],
'diskquota_repquota_path' => [
'system_diskquota_repquota_path' => [
'label' => lng('serversettings.diskquota_repquota_path.description'),
'settinggroup' => 'system',
'varname' => 'diskquota_repquota_path',
@ -47,7 +47,7 @@ return [
'default' => '/usr/sbin/repquota',
'save_method' => 'storeSettingField'
],
'diskquota_quotatool_path' => [
'system_diskquota_quotatool_path' => [
'label' => lng('serversettings.diskquota_quotatool_path.description'),
'settinggroup' => 'system',
'varname' => 'diskquota_quotatool_path',
@ -55,7 +55,7 @@ return [
'default' => '/usr/bin/quotatool',
'save_method' => 'storeSettingField'
],
'diskquota_customer_partition' => [
'system_diskquota_customer_partition' => [
'label' => lng('serversettings.diskquota_customer_partition.description'),
'settinggroup' => 'system',
'varname' => 'diskquota_customer_partition',

2
lib/Froxlor/SImExporter.php
View File

@ -150,7 +150,7 @@ class SImExporter
foreach ($current_settings as $setting_group => $setting) {
foreach ($setting as $varname => $value) {
// set all group/varname:values which are not in the import file
if (!isset($_data[$setting_group.'.'.$varname])) {
if (!array_key_exists($setting_group.'.'.$varname, $_data)) {
$_data[$setting_group.'.'.$varname] = $value;
}
}