Skip to content

Commit

Permalink
improve description of resources assignment in admins and customers
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Kaufmann <[email protected]>
  • Loading branch information
d00p committed Jul 24, 2023
1 parent 5f05478 commit e071365
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 0 deletions.
11 changes: 11 additions & 0 deletions lib/formfields/admin/admin/formfield.admin_add.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
],
'customers' => [
'label' => lng('admin.customers'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
Expand All @@ -133,6 +134,7 @@
],
'domains' => [
'label' => lng('admin.domains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
Expand All @@ -146,48 +148,55 @@
],
'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 6,
'mandatory' => true
],
'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 4,
'mandatory' => true
],
'subdomains' => [
'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'emails' => [
'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'email_accounts' => [
'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'email_forwarders' => [
'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
Expand All @@ -196,12 +205,14 @@
],
'ftps' => [
'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9
],
'mysqls' => [
'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
Expand Down
11 changes: 11 additions & 0 deletions lib/formfields/admin/admin/formfield.admin_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
],
'customers' => [
'label' => lng('admin.customers'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['customers']) ? '0' : $result['customers'],
'maxlength' => 9,
Expand All @@ -145,6 +146,7 @@
],
'domains' => [
'label' => lng('admin.domains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['domains']) ? '0' : $result['domains'],
'maxlength' => 9,
Expand All @@ -158,48 +160,55 @@
],
'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['diskspace']) ? '0' : $result['diskspace'],
'maxlength' => 6,
'mandatory' => true
],
'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['traffic']) ? '0' : $result['traffic'],
'maxlength' => 4,
'mandatory' => true
],
'subdomains' => [
'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['subdomains']) ? '0' : $result['subdomains'],
'maxlength' => 9,
'mandatory' => true
],
'emails' => [
'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['emails']) ? '0' : $result['emails'],
'maxlength' => 9,
'mandatory' => true
],
'email_accounts' => [
'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['email_accounts']) ? '0' : $result['email_accounts'],
'maxlength' => 9,
'mandatory' => true
],
'email_forwarders' => [
'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['email_forwarders']) ? '0' : $result['email_forwarders'],
'maxlength' => 9,
'mandatory' => true
],
'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['email_quota']) ? '0' : $result['email_quota'],
'maxlength' => 9,
Expand All @@ -208,12 +217,14 @@
],
'ftps' => [
'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['ftps']) ? '0' : $result['ftps'],
'maxlength' => 9
],
'mysqls' => [
'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['mysqls']) ? '0' : $result['mysqls'],
'maxlength' => 9,
Expand Down
9 changes: 9 additions & 0 deletions lib/formfields/admin/customer/formfield.customer_add.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,48 +187,55 @@
'fields' => [
'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 16,
'mandatory' => true
],
'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 14,
'mandatory' => true
],
'subdomains' => [
'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'emails' => [
'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'email_accounts' => [
'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'email_forwarders' => [
'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
'mandatory' => true
],
'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
Expand All @@ -251,12 +258,14 @@
],
'ftps' => [
'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9
],
'mysqls' => [
'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => 0,
'maxlength' => 9,
Expand Down
9 changes: 9 additions & 0 deletions lib/formfields/admin/customer/formfield.customer_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,48 +198,55 @@
'fields' => [
'diskspace' => [
'label' => lng('customer.diskspace') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['diskspace']) ? '0' : $result['diskspace'],
'maxlength' => 16,
'mandatory' => true
],
'traffic' => [
'label' => lng('customer.traffic') . ' (' . lng('customer.gib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['traffic']) ? '0' : $result['traffic'],
'maxlength' => 14,
'mandatory' => true
],
'subdomains' => [
'label' => lng('customer.subdomains'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['subdomains']) ? '0' : $result['subdomains'],
'maxlength' => 9,
'mandatory' => true
],
'emails' => [
'label' => lng('customer.emails'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['emails']) ? '0' : $result['emails'],
'maxlength' => 9,
'mandatory' => true
],
'email_accounts' => [
'label' => lng('customer.accounts'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['email_accounts']) ? '0' : $result['email_accounts'],
'maxlength' => 9,
'mandatory' => true
],
'email_forwarders' => [
'label' => lng('customer.forwarders'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['email_forwarders']) ? '0' : $result['email_forwarders'],
'maxlength' => 9,
'mandatory' => true
],
'email_quota' => [
'label' => lng('customer.email_quota') . ' (' . lng('customer.mib') . ')',
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['email_quota']) ? '0' : $result['email_quota'],
'maxlength' => 9,
Expand All @@ -262,13 +269,15 @@
],
'ftps' => [
'label' => lng('customer.ftps'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['ftps']) ? '0' : $result['ftps'],
'maxlength' => 9,
'mandatory' => true
],
'mysqls' => [
'label' => lng('customer.mysqls'),
'desc' => lng('panel.use_checkbox_for_unlimited'),
'type' => 'textul',
'value' => empty($result['mysqls']) ? '0' : $result['mysqls'],
'maxlength' => 9,
Expand Down
1 change: 1 addition & 0 deletions lng/de.lng.php
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,7 @@
],
'upload_import' => 'Hochladen und importieren',
'profile' => 'Mein Profil',
'use_checkbox_for_unlimited' => 'Der Wert "0" deaktiviert die Resource. Die Checkbox rechts erlaubt "unlimitierte" Nutzung.',
],
'phpfpm' => [
'vhost_httpuser' => 'Lokaler Benutzer für PHP-FPM (Froxlor-Vhost)',
Expand Down
1 change: 1 addition & 0 deletions lng/en.lng.php
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,7 @@
],
'upload_import' => 'Upload and import',
'profile' => 'My profile',
'use_checkbox_for_unlimited' => 'The value "0" deactivates this resource. The checkbox on the right allows "unlimited" usage.',
],
'phpfpm' => [
'vhost_httpuser' => 'Local user to use for PHP-FPM (Froxlor vHost)',
Expand Down

0 comments on commit e071365

Please sign in to comment.