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

improve description of resources assignment in admins and customers

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-07-24 14:28:08 +02:00
parent 5f05478c76
commit e071365cd6
6 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,6 +120,7 @@ return [
], ],
'customers' => [ 'customers' => [
'label' => lng('admin.customers'), 'label' => lng('admin.customers'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -133,6 +134,7 @@ return [
], ],
'domains' => [ 'domains' => [
'label' => lng('admin.domains'), 'label' => lng('admin.domains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -146,6 +148,7 @@ return [
], ],
'diskspace' => [ 'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 6, 'maxlength' => 6,
@@ -153,6 +156,7 @@ return [
], ],
'traffic' => [ 'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')', 'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 4, 'maxlength' => 4,
@@ -160,6 +164,7 @@ return [
], ],
'subdomains' => [ 'subdomains' => [
'label' => lng('customer.subdomains'), 'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -167,6 +172,7 @@ return [
], ],
'emails' => [ 'emails' => [
'label' => lng('customer.emails'), 'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -174,6 +180,7 @@ return [
], ],
'email_accounts' => [ 'email_accounts' => [
'label' => lng('customer.accounts'), 'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -181,6 +188,7 @@ return [
], ],
'email_forwarders' => [ 'email_forwarders' => [
'label' => lng('customer.forwarders'), 'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -188,6 +196,7 @@ return [
], ],
'email_quota' => [ 'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -196,12 +205,14 @@ return [
], ],
'ftps' => [ 'ftps' => [
'label' => lng('customer.ftps'), 'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9 'maxlength' => 9
], ],
'mysqls' => [ 'mysqls' => [
'label' => lng('customer.mysqls'), 'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,

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

@@ -132,6 +132,7 @@ return [
], ],
'customers' => [ 'customers' => [
'label' => lng('admin.customers'), 'label' => lng('admin.customers'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['customers']) ? '0' : $result['customers'], 'value' => empty($result['customers']) ? '0' : $result['customers'],
'maxlength' => 9, 'maxlength' => 9,
@@ -145,6 +146,7 @@ return [
], ],
'domains' => [ 'domains' => [
'label' => lng('admin.domains'), 'label' => lng('admin.domains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['domains']) ? '0' : $result['domains'], 'value' => empty($result['domains']) ? '0' : $result['domains'],
'maxlength' => 9, 'maxlength' => 9,
@@ -158,6 +160,7 @@ return [
], ],
'diskspace' => [ 'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['diskspace']) ? '0' : $result['diskspace'], 'value' => empty($result['diskspace']) ? '0' : $result['diskspace'],
'maxlength' => 6, 'maxlength' => 6,
@@ -165,6 +168,7 @@ return [
], ],
'traffic' => [ 'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')', 'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['traffic']) ? '0' : $result['traffic'], 'value' => empty($result['traffic']) ? '0' : $result['traffic'],
'maxlength' => 4, 'maxlength' => 4,
@@ -172,6 +176,7 @@ return [
], ],
'subdomains' => [ 'subdomains' => [
'label' => lng('customer.subdomains'), 'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['subdomains']) ? '0' : $result['subdomains'], 'value' => empty($result['subdomains']) ? '0' : $result['subdomains'],
'maxlength' => 9, 'maxlength' => 9,
@@ -179,6 +184,7 @@ return [
], ],
'emails' => [ 'emails' => [
'label' => lng('customer.emails'), 'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['emails']) ? '0' : $result['emails'], 'value' => empty($result['emails']) ? '0' : $result['emails'],
'maxlength' => 9, 'maxlength' => 9,
@@ -186,6 +192,7 @@ return [
], ],
'email_accounts' => [ 'email_accounts' => [
'label' => lng('customer.accounts'), 'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['email_accounts']) ? '0' : $result['email_accounts'], 'value' => empty($result['email_accounts']) ? '0' : $result['email_accounts'],
'maxlength' => 9, 'maxlength' => 9,
@@ -193,6 +200,7 @@ return [
], ],
'email_forwarders' => [ 'email_forwarders' => [
'label' => lng('customer.forwarders'), 'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['email_forwarders']) ? '0' : $result['email_forwarders'], 'value' => empty($result['email_forwarders']) ? '0' : $result['email_forwarders'],
'maxlength' => 9, 'maxlength' => 9,
@@ -200,6 +208,7 @@ return [
], ],
'email_quota' => [ 'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['email_quota']) ? '0' : $result['email_quota'], 'value' => empty($result['email_quota']) ? '0' : $result['email_quota'],
'maxlength' => 9, 'maxlength' => 9,
@@ -208,12 +217,14 @@ return [
], ],
'ftps' => [ 'ftps' => [
'label' => lng('customer.ftps'), 'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['ftps']) ? '0' : $result['ftps'], 'value' => empty($result['ftps']) ? '0' : $result['ftps'],
'maxlength' => 9 'maxlength' => 9
], ],
'mysqls' => [ 'mysqls' => [
'label' => lng('customer.mysqls'), 'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['mysqls']) ? '0' : $result['mysqls'], 'value' => empty($result['mysqls']) ? '0' : $result['mysqls'],
'maxlength' => 9, 'maxlength' => 9,

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

@@ -187,6 +187,7 @@ return [
'fields' => [ 'fields' => [
'diskspace' => [ 'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 16, 'maxlength' => 16,
@@ -194,6 +195,7 @@ return [
], ],
'traffic' => [ 'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')', 'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 14, 'maxlength' => 14,
@@ -201,6 +203,7 @@ return [
], ],
'subdomains' => [ 'subdomains' => [
'label' => lng('customer.subdomains'), 'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -208,6 +211,7 @@ return [
], ],
'emails' => [ 'emails' => [
'label' => lng('customer.emails'), 'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -215,6 +219,7 @@ return [
], ],
'email_accounts' => [ 'email_accounts' => [
'label' => lng('customer.accounts'), 'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -222,6 +227,7 @@ return [
], ],
'email_forwarders' => [ 'email_forwarders' => [
'label' => lng('customer.forwarders'), 'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -229,6 +235,7 @@ return [
], ],
'email_quota' => [ 'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,
@@ -251,12 +258,14 @@ return [
], ],
'ftps' => [ 'ftps' => [
'label' => lng('customer.ftps'), 'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9 'maxlength' => 9
], ],
'mysqls' => [ 'mysqls' => [
'label' => lng('customer.mysqls'), 'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => 0, 'value' => 0,
'maxlength' => 9, 'maxlength' => 9,

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

@@ -198,6 +198,7 @@ return [
'fields' => [ 'fields' => [
'diskspace' => [ 'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['diskspace']) ? '0' : $result['diskspace'], 'value' => empty($result['diskspace']) ? '0' : $result['diskspace'],
'maxlength' => 16, 'maxlength' => 16,
@@ -205,6 +206,7 @@ return [
], ],
'traffic' => [ 'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')', 'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['traffic']) ? '0' : $result['traffic'], 'value' => empty($result['traffic']) ? '0' : $result['traffic'],
'maxlength' => 14, 'maxlength' => 14,
@@ -212,6 +214,7 @@ return [
], ],
'subdomains' => [ 'subdomains' => [
'label' => lng('customer.subdomains'), 'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['subdomains']) ? '0' : $result['subdomains'], 'value' => empty($result['subdomains']) ? '0' : $result['subdomains'],
'maxlength' => 9, 'maxlength' => 9,
@@ -219,6 +222,7 @@ return [
], ],
'emails' => [ 'emails' => [
'label' => lng('customer.emails'), 'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['emails']) ? '0' : $result['emails'], 'value' => empty($result['emails']) ? '0' : $result['emails'],
'maxlength' => 9, 'maxlength' => 9,
@@ -226,6 +230,7 @@ return [
], ],
'email_accounts' => [ 'email_accounts' => [
'label' => lng('customer.accounts'), 'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['email_accounts']) ? '0' : $result['email_accounts'], 'value' => empty($result['email_accounts']) ? '0' : $result['email_accounts'],
'maxlength' => 9, 'maxlength' => 9,
@@ -233,6 +238,7 @@ return [
], ],
'email_forwarders' => [ 'email_forwarders' => [
'label' => lng('customer.forwarders'), 'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['email_forwarders']) ? '0' : $result['email_forwarders'], 'value' => empty($result['email_forwarders']) ? '0' : $result['email_forwarders'],
'maxlength' => 9, 'maxlength' => 9,
@@ -240,6 +246,7 @@ return [
], ],
'email_quota' => [ 'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')', 'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['email_quota']) ? '0' : $result['email_quota'], 'value' => empty($result['email_quota']) ? '0' : $result['email_quota'],
'maxlength' => 9, 'maxlength' => 9,
@@ -262,6 +269,7 @@ return [
], ],
'ftps' => [ 'ftps' => [
'label' => lng('customer.ftps'), 'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['ftps']) ? '0' : $result['ftps'], 'value' => empty($result['ftps']) ? '0' : $result['ftps'],
'maxlength' => 9, 'maxlength' => 9,
@@ -269,6 +277,7 @@ return [
], ],
'mysqls' => [ 'mysqls' => [
'label' => lng('customer.mysqls'), 'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul', 'type' => 'textul',
'value' => empty($result['mysqls']) ? '0' : $result['mysqls'], 'value' => empty($result['mysqls']) ? '0' : $result['mysqls'],
'maxlength' => 9, 'maxlength' => 9,

1
lng/de.lng.php
View File

@@ -1242,6 +1242,7 @@ Vielen Dank, Ihr Administrator',
], ],
'upload_import' => 'Hochladen und importieren', 'upload_import' => 'Hochladen und importieren',
'profile' => 'Mein Profil', 'profile' => 'Mein Profil',
'use_checkbox_for_unlimited' => 'Der Wert "0" deaktiviert die Resource. Die Checkbox rechts erlaubt "unlimitierte" Nutzung.',
], ],
'phpfpm' => [ 'phpfpm' => [
'vhost_httpuser' => 'Lokaler Benutzer für PHP-FPM (Froxlor-Vhost)', 'vhost_httpuser' => 'Lokaler Benutzer für PHP-FPM (Froxlor-Vhost)',

1
lng/en.lng.php
View File

@@ -1355,6 +1355,7 @@ Yours sincerely, your administrator',
], ],
'upload_import' => 'Upload and import', 'upload_import' => 'Upload and import',
'profile' => 'My profile', 'profile' => 'My profile',
'use_checkbox_for_unlimited' => 'The value "0" deactivates this resource. The checkbox on the right allows "unlimited" usage.',
], ],
'phpfpm' => [ 'phpfpm' => [
'vhost_httpuser' => 'Local user to use for PHP-FPM (Froxlor vHost)', 'vhost_httpuser' => 'Local user to use for PHP-FPM (Froxlor vHost)',