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

update some more formfields; improved formfields with wrapper fieldrow()-macro to reduce duplicate markup; enable next_to functionality for some fields

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-02-20 12:50:29 +01:00
parent 23ecc40b1a
commit e6d12be7b3
25 changed files with 473 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/formfields/admin/customer/formfield.customer_add.php
View File

@@ -43,14 +43,16 @@ return array(
'new_customer_password' => array(
'label' => $lng['login']['password'],
'type' => 'password',
'autocomplete' => 'off'
),
'new_customer_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword(),
'readonly' => true
'autocomplete' => 'off',
'next_to' => [
'new_customer_password_suggestion' => array(
'next_to_prefix' => $lng['customer']['generated_pwd'].':',
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword(),
'readonly' => true
)
]
),
'sendpassword' => array(
'label' => $lng['admin']['sendpassword'],
@@ -107,12 +109,14 @@ return array(
'type' => 'text'
),
'zipcode' => array(
'label' => $lng['customer']['zipcode'],
'type' => 'text'
),
'city' => array(
'label' => $lng['customer']['city'],
'type' => 'text'
'label' => $lng['customer']['zipcode'] . ' / ' . $lng['customer']['city'],
'type' => 'text',
'next_to' => [
'city' => array(
'next_to_prefix' => ' / ',
'type' => 'text'
)
]
),
'phone' => array(
'label' => $lng['customer']['phone'],
@@ -147,7 +151,7 @@ return array(
)
),
'section_cpre' => array(
'visible' => ! empty($hosting_plans),
'visible' => !empty($hosting_plans),
'title' => $lng['admin']['plans']['use_plan'],
'image' => 'icons/user_add.png',
'fields' => array(
@@ -205,7 +209,7 @@ return array(
'mandatory' => true
),
'email_quota' => array(
'label' => $lng['customer']['email_quota']. ' (' . $lng['customer']['mib'] . ')',
'label' => $lng['customer']['email_quota'] . ' (' . $lng['customer']['mib'] . ')',
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
@@ -252,9 +256,9 @@ return array(
'values' => $phpconfigs,
'value' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ?
[\Froxlor\Settings::Get('system.mod_fcgid_defaultini')]
: ((int) \Froxlor\Settings::Get('phpfpm.enabled') == 1 ?
[\Froxlor\Settings::Get('phpfpm.defaultini')]
: null)),
: ((int) \Froxlor\Settings::Get('phpfpm.enabled') == 1 ?
[\Froxlor\Settings::Get('phpfpm.defaultini')]
: null)),
'is_array' => 1
),
'perlenabled' => array(

37
lib/formfields/admin/customer/formfield.customer_edit.php
View File

@@ -48,13 +48,16 @@ return array(
'new_customer_password' => array(
'label' => $lng['login']['password'] . '&nbsp;(' . $lng['panel']['emptyfornochanges'] . ')',
'type' => 'password',
'autocomplete' => 'off'
),
'new_customer_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword()
'autocomplete' => 'off',
'next_to' => [
'new_customer_password_suggestion' => array(
'next_to_prefix' => $lng['customer']['generated_pwd'] . ':',
'type' => 'text',
'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
'value' => \Froxlor\System\Crypt::generatePassword(),
'readonly' => true
)
]
),
'def_language' => array(
'label' => $lng['login']['language'],
@@ -110,14 +113,16 @@ return array(
'value' => $result['street']
),
'zipcode' => array(
'label' => $lng['customer']['zipcode'],
'label' => $lng['customer']['zipcode'] . ' / ' . $lng['customer']['city'],
'type' => 'text',
'value' => $result['zipcode']
),
'city' => array(
'label' => $lng['customer']['city'],
'type' => 'text',
'value' => $result['city']
'value' => $result['zipcode'],
'next_to' => [
'city' => array(
'next_to_prefix' => ' / ',
'type' => 'text',
'value' => $result['city']
)
]
),
'phone' => array(
'label' => $lng['customer']['phone'],
@@ -158,7 +163,7 @@ return array(
)
),
'section_cpre' => array(
'visible' => ! empty($hosting_plans),
'visible' => !empty($hosting_plans),
'title' => $lng['admin']['plans']['use_plan'],
'image' => 'icons/user_add.png',
'fields' => array(
@@ -261,7 +266,7 @@ return array(
'label' => $lng['admin']['phpsettings']['title'],
'type' => 'checkbox',
'values' => $phpconfigs,
'value' => isset($result['allowed_phpconfigs']) && ! empty($result['allowed_phpconfigs']) ? json_decode($result['allowed_phpconfigs'], JSON_OBJECT_AS_ARRAY) : array(),
'value' => isset($result['allowed_phpconfigs']) && !empty($result['allowed_phpconfigs']) ? json_decode($result['allowed_phpconfigs'], JSON_OBJECT_AS_ARRAY) : array(),
'is_array' => 1
),
'perlenabled' => array(