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

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

@@ -19,10 +19,10 @@
return array(
'groups' => array(
'webserver' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings'],
'title' => $lng['admin']['webserversettings'],
'fields' => array(
'system_webserver' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['webserver'],
'label' => $lng['admin']['webserver'],
'settinggroup' => 'system',
'varname' => 'webserver',
'type' => 'option',
@@ -41,7 +41,7 @@ return array(
'overview_option' => true
),
'system_apache_24' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apache_24'],
'label' => $lng['serversettings']['apache_24'],
'settinggroup' => 'system',
'varname' => 'apache24',
'type' => 'bool',
@@ -52,7 +52,7 @@ return array(
)
),
'system_apache_itksupport' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apache_itksupport'],
'label' => $lng['serversettings']['apache_itksupport'],
'settinggroup' => 'system',
'varname' => 'apacheitksupport',
'type' => 'bool',
@@ -64,7 +64,7 @@ return array(
)
),
'system_http2_support' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['http2_support'],
'label' => $lng['serversettings']['http2_support'],
'settinggroup' => 'system',
'varname' => 'http2_support',
'type' => 'bool',
@@ -77,7 +77,7 @@ return array(
'visible' => \Froxlor\Settings::Get('system.use_ssl')
),
'system_dhparams_file' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['dhparams_file'],
'label' => $lng['serversettings']['dhparams_file'],
'settinggroup' => 'system',
'varname' => 'dhparams_file',
'type' => 'string',
@@ -88,7 +88,7 @@ return array(
'visible' => \Froxlor\Settings::Get('system.use_ssl')
),
'system_httpuser' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['webserver_user'],
'label' => $lng['admin']['webserver_user'],
'settinggroup' => 'system',
'varname' => 'httpuser',
'type' => 'string',
@@ -96,7 +96,7 @@ return array(
'save_method' => 'storeSettingWebserverFcgidFpmUser'
),
'system_httpgroup' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['webserver_group'],
'label' => $lng['admin']['webserver_group'],
'settinggroup' => 'system',
'varname' => 'httpgroup',
'type' => 'string',
@@ -104,7 +104,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_apacheconf_vhost' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apacheconf_vhost'],
'label' => $lng['serversettings']['apacheconf_vhost'],
'settinggroup' => 'system',
'varname' => 'apacheconf_vhost',
'type' => 'string',
@@ -113,7 +113,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_apacheconf_diroptions' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apacheconf_diroptions'],
'label' => $lng['serversettings']['apacheconf_diroptions'],
'settinggroup' => 'system',
'varname' => 'apacheconf_diroptions',
'type' => 'string',
@@ -122,7 +122,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_apacheconf_htpasswddir' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apacheconf_htpasswddir'],
'label' => $lng['serversettings']['apacheconf_htpasswddir'],
'settinggroup' => 'system',
'varname' => 'apacheconf_htpasswddir',
'type' => 'string',
@@ -131,7 +131,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_logfiles_directory' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_directory'],
'label' => $lng['serversettings']['logfiles_directory'],
'settinggroup' => 'system',
'varname' => 'logfiles_directory',
'type' => 'string',
@@ -140,7 +140,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_logfiles_script' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_script'],
'label' => $lng['serversettings']['logfiles_script'],
'settinggroup' => 'system',
'varname' => 'logfiles_script',
'type' => 'string',
@@ -152,7 +152,7 @@ return array(
)
),
'system_logfiles_piped' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_piped'],
'label' => $lng['serversettings']['logfiles_piped'],
'settinggroup' => 'system',
'varname' => 'logfiles_piped',
'type' => 'bool',
@@ -163,7 +163,7 @@ return array(
)
),
'system_logfiles_format' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_format'],
'label' => $lng['serversettings']['logfiles_format'],
'settinggroup' => 'system',
'varname' => 'logfiles_format',
'type' => 'string',
@@ -176,7 +176,7 @@ return array(
)
),
'system_logfiles_type' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_type'],
'label' => $lng['serversettings']['logfiles_type'],
'settinggroup' => 'system',
'varname' => 'logfiles_type',
'type' => 'option',
@@ -192,7 +192,7 @@ return array(
)
),
'system_customersslpath' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['customerssl_directory'],
'label' => $lng['serversettings']['customerssl_directory'],
'settinggroup' => 'system',
'varname' => 'customer_ssl_path',
'type' => 'string',
@@ -201,7 +201,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_phpappendopenbasedir' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpappendopenbasedir'],
'label' => $lng['serversettings']['phpappendopenbasedir'],
'settinggroup' => 'system',
'varname' => 'phpappendopenbasedir',
'type' => 'string',
@@ -210,7 +210,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_deactivateddocroot' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['deactivateddocroot'],
'label' => $lng['serversettings']['deactivateddocroot'],
'settinggroup' => 'system',
'varname' => 'deactivateddocroot',
'type' => 'string',
@@ -220,7 +220,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_default_vhostconf' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf'],
'label' => $lng['serversettings']['default_vhostconf'],
'settinggroup' => 'system',
'varname' => 'default_vhostconf',
'type' => 'text',
@@ -228,7 +228,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_apache_globaldiropt' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apache_globaldiropt'],
'label' => $lng['serversettings']['apache_globaldiropt'],
'settinggroup' => 'system',
'varname' => 'apacheglobaldiropt',
'type' => 'text',
@@ -240,7 +240,7 @@ return array(
)
),
'system_apachereload_command' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apachereload_command'],
'label' => $lng['serversettings']['apachereload_command'],
'settinggroup' => 'system',
'varname' => 'apachereload_command',
'type' => 'string',
@@ -248,7 +248,7 @@ return array(
'save_method' => 'storeSettingField'
),
'system_phpreload_command' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpreload_command'],
'label' => $lng['serversettings']['phpreload_command'],
'settinggroup' => 'system',
'varname' => 'phpreload_command',
'type' => 'string',
@@ -259,7 +259,7 @@ return array(
)
),
'system_nginx_php_backend' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['nginx_php_backend'],
'label' => $lng['serversettings']['nginx_php_backend'],
'settinggroup' => 'system',
'varname' => 'nginx_php_backend',
'type' => 'string',
@@ -270,7 +270,7 @@ return array(
)
),
'nginx_fastcgiparams' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['nginx_fastcgiparams'],
'label' => $lng['serversettings']['nginx_fastcgiparams'],
'settinggroup' => 'nginx',
'varname' => 'fastcgiparams',
'type' => 'string',
@@ -282,7 +282,7 @@ return array(
)
),
'defaultwebsrverrhandler_enabled' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_enabled'],
'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
'settinggroup' => 'defaultwebsrverrhandler',
'varname' => 'enabled',
'type' => 'bool',
@@ -290,7 +290,7 @@ return array(
'save_method' => 'storeSettingField'
),
'defaultwebsrverrhandler_err401' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err401'],
'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'],
'settinggroup' => 'defaultwebsrverrhandler',
'varname' => 'err401',
'type' => 'string',
@@ -302,7 +302,7 @@ return array(
)
),
'defaultwebsrverrhandler_err403' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err403'],
'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
'settinggroup' => 'defaultwebsrverrhandler',
'varname' => 'err403',
'type' => 'string',
@@ -314,7 +314,7 @@ return array(
)
),
'defaultwebsrverrhandler_err404' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err404'],
'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
'settinggroup' => 'defaultwebsrverrhandler',
'varname' => 'err404',
'type' => 'string',
@@ -322,7 +322,7 @@ return array(
'save_method' => 'storeSettingField'
),
'defaultwebsrverrhandler_err500' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err500'],
'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'],
'settinggroup' => 'defaultwebsrverrhandler',
'varname' => 'err500',
'type' => 'string',
@@ -334,7 +334,7 @@ return array(
)
),
'customredirect_enabled' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['customredirect_enabled'],
'label' => $lng['serversettings']['customredirect_enabled'],
'settinggroup' => 'customredirect',
'varname' => 'enabled',
'type' => 'bool',
@@ -342,7 +342,7 @@ return array(
'save_method' => 'storeSettingField'
),
'customredirect_default' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['customredirect_default'],
'label' => $lng['serversettings']['customredirect_default'],
'settinggroup' => 'customredirect',
'varname' => 'default',
'type' => 'option',