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

68
lib/formfields/admin/admin/formfield.admin_add.php
View File

@@ -16,65 +16,65 @@
*/
return array(
'admin_add' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['admin_add'],
'title' => $lng['admin']['admin_add'],
'image' => 'icons/user_add.png',
'sections' => array(
'section_a' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'],
'title' => $lng['admin']['accountdata'],
'image' => 'icons/user_add.png',
'fields' => array(
'new_loginname' => array(
'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
'label' => $lng['login']['username'],
'type' => 'text',
'mandatory' => true
),
'admin_password' => array(
'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
'label' => $lng['login']['password'],
'type' => 'password',
'mandatory' => true,
'autocomplete' => 'off'
),
'admin_password_suggestion' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword()
),
'def_language' => array(
'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
'label' => $lng['login']['language'],
'type' => 'select',
'select_var' => $language_options
)
)
),
'section_b' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'],
'title' => $lng['admin']['contactdata'],
'image' => 'icons/user_add.png',
'fields' => array(
'name' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'],
'label' => $lng['customer']['name'],
'type' => 'text',
'mandatory' => true
),
'email' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'],
'label' => $lng['customer']['email'],
'type' => 'text',
'mandatory' => true
),
'custom_notes' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'],
'label' => $lng['usersettings']['custom_notes']['title'],
'desc' => $lng['usersettings']['custom_notes']['description'],
'type' => 'textarea',
'cols' => 60,
'rows' => 12
),
'custom_notes_show' => array(
'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'],
'label' => $lng['usersettings']['custom_notes']['show'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -83,27 +83,27 @@ return array(
)
),
'section_c' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'],
'title' => $lng['admin']['servicedata'],
'image' => 'icons/user_add.png',
'fields' => array(
'ipaddress' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress']['title'],
'label' => $lng['serversettings']['ipaddress']['title'],
'type' => 'select',
'select_var' => $ipaddress
),
'change_serversettings' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['change_serversettings'],
'label' => $lng['admin']['change_serversettings'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
),
'customers' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'],
'label' => $lng['admin']['customers'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -111,18 +111,18 @@ return array(
'ul_field' => $customers_ul
),
'customers_see_all' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers_see_all'],
'label' => $lng['admin']['customers_see_all'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
),
'domains' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'],
'label' => $lng['admin']['domains'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -130,29 +130,29 @@ return array(
'ul_field' => $domains_ul
),
'domains_see_all' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains_see_all'],
'label' => $lng['admin']['domains_see_all'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
),
'caneditphpsettings' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['caneditphpsettings'],
'label' => $lng['admin']['caneditphpsettings'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
'value' => array()
),
'diskspace' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'],
'label' => $lng['customer']['diskspace'],
'type' => 'textul',
'value' => 0,
'maxlength' => 6,
@@ -160,7 +160,7 @@ return array(
'ul_field' => $diskspace_ul
),
'traffic' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'],
'label' => $lng['customer']['traffic'],
'type' => 'textul',
'value' => 0,
'maxlength' => 4,
@@ -168,7 +168,7 @@ return array(
'ul_field' => $traffic_ul
),
'subdomains' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'],
'label' => $lng['customer']['subdomains'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -176,7 +176,7 @@ return array(
'ul_field' => $subdomains_ul
),
'emails' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'],
'label' => $lng['customer']['emails'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -184,7 +184,7 @@ return array(
'ul_field' => $emails_ul
),
'email_accounts' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'],
'label' => $lng['customer']['accounts'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -192,7 +192,7 @@ return array(
'ul_field' => $email_accounts_ul
),
'email_forwarders' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'],
'label' => $lng['customer']['forwarders'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -200,7 +200,7 @@ return array(
'ul_field' => $email_forwarders_ul
),
'email_quota' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
'label' => $lng['customer']['email_quota'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -209,14 +209,14 @@ return array(
'ul_field' => $email_quota_ul
),
'ftps' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'],
'label' => $lng['customer']['ftps'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'ul_field' => $ftps_ul
),
'mysqls' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'],
'label' => $lng['customer']['mysqls'],
'type' => 'textul',
'value' => 0,
'maxlength' => 9,

72
lib/formfields/admin/admin/formfield.admin_edit.php
View File

@@ -16,24 +16,24 @@
*/
return array(
'admin_edit' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['admin_edit'],
'title' => $lng['admin']['admin_edit'],
'image' => 'icons/user_edit.png',
'sections' => array(
'section_a' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'],
'title' => $lng['admin']['accountdata'],
'image' => 'icons/user_edit.png',
'fields' => array(
'loginname' => array(
'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
'label' => $lng['login']['username'],
'type' => 'label',
'value' => $result['loginname']
),
'deactivated' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['deactivated_user'],
'label' => $lng['admin']['deactivated_user'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -43,20 +43,20 @@ return array(
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
),
'admin_password' => array(
'label' => \Froxlor\I18N\Lang::getAll()['login']['password'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['emptyfornochanges'] . ')',
'label' => $lng['login']['password'] . ' (' . $lng['panel']['emptyfornochanges'] . ')',
'type' => 'password',
'autocomplete' => 'off',
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
),
'admin_password_suggestion' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword(),
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
),
'def_language' => array(
'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
'label' => $lng['login']['language'],
'type' => 'select',
'select_var' => $language_options,
'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
@@ -64,36 +64,36 @@ return array(
)
),
'section_b' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'],
'title' => $lng['admin']['contactdata'],
'image' => 'icons/user_edit.png',
'fields' => array(
'name' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'],
'label' => $lng['customer']['name'],
'type' => 'text',
'mandatory' => true,
'value' => $result['name']
),
'email' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'],
'label' => $lng['customer']['email'],
'type' => 'text',
'mandatory' => true,
'value' => $result['email']
),
'custom_notes' => array(
'style' => 'align-top',
'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'],
'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'],
'label' => $lng['usersettings']['custom_notes']['title'],
'desc' => $lng['usersettings']['custom_notes']['description'],
'type' => 'textarea',
'cols' => 60,
'rows' => 12,
'value' => $result['custom_notes']
),
'custom_notes_show' => array(
'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'],
'label' => $lng['usersettings']['custom_notes']['show'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -104,21 +104,21 @@ return array(
)
),
'section_c' => array(
'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'],
'title' => $lng['admin']['servicedata'],
'image' => 'icons/user_add.png',
'visible' => ($result['adminid'] != \Froxlor\User::getAll()['userid'] ? true : false),
'fields' => array(
'ipaddress' => array(
'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress']['title'],
'label' => $lng['serversettings']['ipaddress']['title'],
'type' => 'select',
'select_var' => $ipaddress
),
'change_serversettings' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['change_serversettings'],
'label' => $lng['admin']['change_serversettings'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -127,7 +127,7 @@ return array(
)
),
'customers' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'],
'label' => $lng['admin']['customers'],
'type' => 'textul',
'value' => $result['customers'],
'maxlength' => 9,
@@ -135,11 +135,11 @@ return array(
'ul_field' => $customers_ul
),
'customers_see_all' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers_see_all'],
'label' => $lng['admin']['customers_see_all'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -148,7 +148,7 @@ return array(
)
),
'domains' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'],
'label' => $lng['admin']['domains'],
'type' => 'textul',
'value' => $result['domains'],
'maxlength' => 9,
@@ -156,11 +156,11 @@ return array(
'ul_field' => $domains_ul
),
'domains_see_all' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains_see_all'],
'label' => $lng['admin']['domains_see_all'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -169,11 +169,11 @@ return array(
)
),
'caneditphpsettings' => array(
'label' => \Froxlor\I18N\Lang::getAll()['admin']['caneditphpsettings'],
'label' => $lng['admin']['caneditphpsettings'],
'type' => 'checkbox',
'values' => array(
array(
'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
'label' => $lng['panel']['yes'],
'value' => '1'
)
),
@@ -182,7 +182,7 @@ return array(
)
),
'diskspace' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'],
'label' => $lng['customer']['diskspace'],
'type' => 'textul',
'value' => $result['diskspace'],
'maxlength' => 6,
@@ -190,7 +190,7 @@ return array(
'ul_field' => $diskspace_ul
),
'traffic' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'],
'label' => $lng['customer']['traffic'],
'type' => 'textul',
'value' => $result['traffic'],
'maxlength' => 4,
@@ -198,7 +198,7 @@ return array(
'ul_field' => $traffic_ul
),
'subdomains' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'],
'label' => $lng['customer']['subdomains'],
'type' => 'textul',
'value' => $result['subdomains'],
'maxlength' => 9,
@@ -206,7 +206,7 @@ return array(
'ul_field' => $subdomains_ul
),
'emails' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'],
'label' => $lng['customer']['emails'],
'type' => 'textul',
'value' => $result['emails'],
'maxlength' => 9,
@@ -214,7 +214,7 @@ return array(
'ul_field' => $emails_ul
),
'email_accounts' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'],
'label' => $lng['customer']['accounts'],
'type' => 'textul',
'value' => $result['email_accounts'],
'maxlength' => 9,
@@ -222,7 +222,7 @@ return array(
'ul_field' => $email_accounts_ul
),
'email_forwarders' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'],
'label' => $lng['customer']['forwarders'],
'type' => 'textul',
'value' => $result['email_forwarders'],
'maxlength' => 9,
@@ -230,7 +230,7 @@ return array(
'ul_field' => $email_forwarders_ul
),
'email_quota' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
'label' => $lng['customer']['email_quota'],
'type' => 'textul',
'value' => $result['email_quota'],
'maxlength' => 9,
@@ -239,14 +239,14 @@ return array(
'ul_field' => $email_quota_ul
),
'ftps' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'],
'label' => $lng['customer']['ftps'],
'type' => 'textul',
'value' => $result['ftps'],
'maxlength' => 9,
'ul_field' => $ftps_ul
),
'mysqls' => array(
'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'],
'label' => $lng['customer']['mysqls'],
'type' => 'textul',
'value' => $result['mysqls'],
'maxlength' => 9,