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

18
lib/formfields/customer/domains/formfield.domain_ssleditor.php
View File

@@ -16,7 +16,7 @@
*/
return array(
'domain_ssleditor' => array(
'title' => \Froxlor\I18N\Lang::getAll()['panel']['ssleditor'],
'title' => $lng['panel']['ssleditor'],
'image' => 'icons/ssl.png',
'sections' => array(
'section_a' => array(
@@ -25,8 +25,8 @@ return array(
'fields' => array(
'ssl_cert_file' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file_content'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'],
'label' => $lng['admin']['ipsandports']['ssl_cert_file_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
'type' => 'textarea',
'cols' => 100,
'rows' => 15,
@@ -34,8 +34,8 @@ return array(
),
'ssl_key_file' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file_content'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'],
'label' => $lng['admin']['ipsandports']['ssl_key_file_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
'type' => 'textarea',
'cols' => 100,
'rows' => 15,
@@ -43,8 +43,8 @@ return array(
),
'ssl_cert_chainfile' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile_content'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'] . \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile_content_desc'],
'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'] . $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'],
'type' => 'textarea',
'cols' => 100,
'rows' => 15,
@@ -52,8 +52,8 @@ return array(
),
'ssl_ca_file' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file_content'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'] . \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file_content_desc'],
'label' => $lng['admin']['ipsandports']['ssl_ca_file_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'] . $lng['admin']['ipsandports']['ssl_ca_file_content_desc'],
'type' => 'textarea',
'cols' => 100,
'rows' => 15,

58
lib/formfields/customer/domains/formfield.domains_add.php
View File

@@ -16,15 +16,15 @@
*/
return array(
'domain_add' => array(
'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_add'],
'title' => $lng['domains']['subdomain_add'],
'image' => 'icons/domain_add.png',
'sections' => array(
'section_a' => array(
'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_add'],
'title' => $lng['domains']['subdomain_add'],
'image' => 'icons/domain_add.png',
'fields' => array(
'subdomain' => array(
'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'],
'label' => $lng['domains']['domainname'],
'type' => 'textul',
'ul_field' => '',
'has_nextto' => true
@@ -36,60 +36,60 @@ return array(
'select_var' => $domains
),
'alias' => array(
'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'],
'label' => $lng['domains']['aliasdomain'],
'type' => 'select',
'select_var' => $aliasdomains
),
'path' => array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? $pathSelect['note'] . '<br />' . $pathSelect['value'] : ''),
'label' => $lng['panel']['path'],
'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? $pathSelect['note'] . '<br />' . $pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
),
'url' => array(
'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['panel']['urloverridespath'],
'label' => $lng['panel']['urloverridespath'],
'type' => 'text'
),
'redirectcode' => array(
'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurl'],
'desc' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurlinfo'],
'label' => $lng['domains']['redirectifpathisurl'],
'desc' => $lng['domains']['redirectifpathisurlinfo'],
'type' => 'select',
'select_var' => isset($redirectcode) ? $redirectcode : null
),
'selectserveralias' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'],
'label' => $lng['admin']['selectserveralias'],
'desc' => $lng['admin']['selectserveralias_desc'],
'type' => 'label',
'value' => \Froxlor\I18N\Lang::getAll()['customer']['selectserveralias_addinfo']
'value' => $lng['customer']['selectserveralias_addinfo']
),
'openbasedir_path' => array(
'label' => \Froxlor\I18N\Lang::getAll()['domain']['openbasedirpath'],
'label' => $lng['domain']['openbasedirpath'],
'type' => 'select',
'select_var' => $openbasedir
),
'phpsettingid' => array(
'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) && $has_phpconfigs ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
'label' => $lng['admin']['phpsettings']['title'],
'type' => 'select',
'select_var' => $phpconfigs
)
)
),
'section_bssl' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'],
'title' => $lng['admin']['webserversettings_ssl'],
'image' => 'icons/domain_add.png',
'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports != '' ? true : false) : false,
'fields' => array(
'ssl_redirect' => array(
'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'],
'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -97,44 +97,44 @@ return array(
),
'letsencrypt' => array(
'visible' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['description'],
'label' => $lng['customer']['letsencrypt']['title'],
'desc' => $lng['customer']['letsencrypt']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
),
'hsts_maxage' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'],
'label' => $lng['admin']['domain_hsts_maxage']['title'],
'desc' => $lng['admin']['domain_hsts_maxage']['description'],
'type' => 'int',
'int_min' => 0,
'int_max' => 94608000, // 3-years
'value' => 0
),
'hsts_sub' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'],
'label' => $lng['admin']['domain_hsts_incsub']['title'],
'desc' => $lng['admin']['domain_hsts_incsub']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
),
'hsts_preload' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'],
'label' => $lng['admin']['domain_hsts_preload']['title'],
'desc' => $lng['admin']['domain_hsts_preload']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),

60
lib/formfields/customer/domains/formfield.domains_edit.php
View File

@@ -16,53 +16,53 @@
*/
return array(
'domain_edit' => array(
'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_edit'],
'title' => $lng['domains']['subdomain_edit'],
'image' => 'icons/domain_edit.png',
'sections' => array(
'section_a' => array(
'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_edit'],
'title' => $lng['domains']['subdomain_edit'],
'image' => 'icons/domain_edit.png',
'fields' => array(
'domain' => array(
'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'],
'label' => $lng['domains']['domainname'],
'type' => 'label',
'value' => $result['domain']
),
'dns' => array(
'label' => \Froxlor\I18N\Lang::getAll()['dns']['destinationip'],
'label' => $lng['dns']['destinationip'],
'type' => 'label',
'value' => $domainip
),
'alias' => array(
'visible' => ($alias_check == '0' ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'],
'label' => $lng['domains']['aliasdomain'],
'type' => 'select',
'select_var' => $domains
),
'path' => array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
'label' => $lng['panel']['path'],
'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
'type' => $pathSelect['type'],
'select_var' => $pathSelect['value'],
'value' => $pathSelect['value']
),
'url' => array(
'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['panel']['urloverridespath'],
'label' => $lng['panel']['urloverridespath'],
'type' => 'text',
'value' => $urlvalue
),
'redirectcode' => array(
'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurl'],
'desc' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurlinfo'],
'label' => $lng['domains']['redirectifpathisurl'],
'desc' => $lng['domains']['redirectifpathisurlinfo'],
'type' => 'select',
'select_var' => $redirectcode
),
'selectserveralias' => array(
'visible' => ((($result['parentdomainid'] == '0' && \Froxlor\User::getAll()['subdomains'] != '0') || $result['parentdomainid'] != '0') ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'],
'label' => $lng['admin']['selectserveralias'],
'desc' => $lng['admin']['selectserveralias_desc'],
'type' => 'select',
'select_var' => $serveraliasoptions
),
@@ -72,7 +72,7 @@ return array(
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -82,30 +82,30 @@ return array(
),
'openbasedir_path' => array(
'visible' => ($result['openbasedir'] == '1') ? true : false,
'label' => \Froxlor\I18N\Lang::getAll()['domain']['openbasedirpath'],
'label' => $lng['domain']['openbasedirpath'],
'type' => 'select',
'select_var' => $openbasedir
),
'phpsettingid' => array(
'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) && $has_phpconfigs ? true : false),
'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
'label' => $lng['admin']['phpsettings']['title'],
'type' => 'select',
'select_var' => $phpconfigs
)
)
),
'section_bssl' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'],
'title' => $lng['admin']['webserversettings_ssl'],
'image' => 'icons/domain_edit.png',
'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports != '' ? (\Froxlor\Domain\Domain::domainHasSslIpPort($result['id']) ? true : false) : false) : false,
'fields' => array(
'ssl_redirect' => array(
'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect_temporarilydisabled'] : ''),
'label' => $lng['domains']['ssl_redirect']['title'],
'desc' => $lng['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? $lng['domains']['ssl_redirect_temporarilydisabled'] : ''),
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -115,12 +115,12 @@ return array(
),
'letsencrypt' => array(
'visible' => \Froxlor\Settings::Get('system.leenabled') == '1' ? true : false,
'label' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['description'],
'label' => $lng['customer']['letsencrypt']['title'],
'desc' => $lng['customer']['letsencrypt']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -129,20 +129,20 @@ return array(
)
),
'hsts_maxage' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'],
'label' => $lng['admin']['domain_hsts_maxage']['title'],
'desc' => $lng['admin']['domain_hsts_maxage']['description'],
'type' => 'int',
'int_min' => 0,
'int_max' => 94608000, // 3-years
'value' => $result['hsts']
),
'hsts_sub' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'],
'label' => $lng['admin']['domain_hsts_incsub']['title'],
'desc' => $lng['admin']['domain_hsts_incsub']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -151,12 +151,12 @@ return array(
)
),
'hsts_preload' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'],
'label' => $lng['admin']['domain_hsts_preload']['title'],
'desc' => $lng['admin']['domain_hsts_preload']['description'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),