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

Revert "refactor global array"

Browse Source 
This reverts commit 370ccbdb74.
This commit is contained in:
Michael Kaufmann
2018-12-22 08:15:31 +01:00
parent c800e89414
commit 7e39a7bc60
220 changed files with 2244 additions and 2227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
View File

@@ -16,66 +16,66 @@
*/
return array(
'phpconfig_edit' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'],
'title' => $lng['admin']['phpsettings']['editsettings'],
'image' => 'icons/phpsettings_edit.png',
'sections' => array(
'section_a' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'],
'title' => $lng['admin']['phpsettings']['editsettings'],
'image' => 'icons/phpsettings_edit.png',
'fields' => array(
'description' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'],
'label' => $lng['admin']['phpsettings']['description'],
'type' => 'text',
'maxlength' => 50,
'value' => $result['description']
),
'binary' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary'],
'label' => $lng['admin']['phpsettings']['binary'],
'type' => 'text',
'maxlength' => 255,
'value' => $result['binary']
),
'fpmconfig' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc'],
'label' => $lng['admin']['phpsettings']['fpmdesc'],
'type' => 'select',
'select_var' => $fpmconfigs
),
'file_extensions' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions_note'],
'label' => $lng['admin']['phpsettings']['file_extensions'],
'desc' => $lng['admin']['phpsettings']['file_extensions_note'],
'type' => 'text',
'maxlength' => 255,
'value' => $result['file_extensions']
),
'mod_fcgid_starter' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'],
'label' => $lng['admin']['mod_fcgid_starter']['title'],
'type' => 'text',
'value' => ((int) $result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '')
),
'mod_fcgid_maxrequests' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'],
'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
'type' => 'text',
'value' => ((int) $result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '')
),
'mod_fcgid_umask' => array(
'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_umask']['title'],
'label' => $lng['admin']['mod_fcgid_umask']['title'],
'type' => 'text',
'maxlength' => 3,
'value' => $result['mod_fcgid_umask']
),
'phpfpm_enable_slowlog' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['enable_slowlog'],
'label' => $lng['admin']['phpsettings']['enable_slowlog'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -85,25 +85,25 @@ return array(
),
'phpfpm_reqtermtimeout' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_terminate_timeout'],
'label' => $lng['admin']['phpsettings']['request_terminate_timeout'],
'type' => 'text',
'maxlength' => 10,
'value' => $result['fpm_reqterm']
),
'phpfpm_reqslowtimeout' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_slowlog_timeout'],
'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'],
'type' => 'text',
'maxlength' => 10,
'value' => $result['fpm_reqslow']
),
'phpfpm_pass_authorizationheader' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['pass_authorizationheader'],
'label' => $lng['admin']['phpsettings']['pass_authorizationheader'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -112,11 +112,11 @@ return array(
)
),
'override_fpmconfig' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig'],
'label' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -126,63 +126,63 @@ return array(
),
'pm' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['pm'],
'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'select',
'select_var' => $pm_select
),
'max_children' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'int',
'value' => $result['max_children']
),
'start_servers' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'int',
'value' => $result['start_servers']
),
'min_spare_servers' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'int',
'value' => $result['min_spare_servers']
),
'max_spare_servers' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'int',
'value' => $result['max_spare_servers']
),
'max_requests' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'int',
'value' => $result['max_requests']
),
'idle_timeout' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'int',
'value' => $result['idle_timeout']
),
'limit_extensions' => array(
'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
'type' => 'text',
'value' => $result['limit_extensions']
),
'phpsettings' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['phpinisettings'],
'label' => $lng['admin']['phpsettings']['phpinisettings'],
'type' => 'textarea',
'cols' => 80,
'rows' => 20,