From 7e2a3fa28cf3edf250a627386e7199f14cad6cf0 Mon Sep 17 00:00:00 2001 From: Florian Schaal Date: Sun, 21 Feb 2016 12:58:09 +0100 Subject: [PATCH] Add DB-User limit (Issue #2586) --- install/sql/incremental/upd_dev_collection.sql | 4 ++++ install/sql/ispconfig3.sql | 2 ++ interface/web/client/form/client.tform.php | 14 ++++++++++++++ .../web/client/form/client_template.tform.php | 14 ++++++++++++++ interface/web/client/form/reseller.tform.php | 14 ++++++++++++++ interface/web/client/lib/lang/ar_client.lng | 2 ++ interface/web/client/lib/lang/ar_reseller.lng | 4 ++++ interface/web/client/lib/lang/bg_client.lng | 2 ++ interface/web/client/lib/lang/bg_reseller.lng | 4 ++++ interface/web/client/lib/lang/br_client.lng | 2 ++ interface/web/client/lib/lang/br_reseller.lng | 4 ++++ interface/web/client/lib/lang/ca_client.lng | 2 ++ interface/web/client/lib/lang/ca_reseller.lng | 4 ++++ interface/web/client/lib/lang/cz_client.lng | 2 ++ interface/web/client/lib/lang/cz_reseller.lng | 4 ++++ interface/web/client/lib/lang/de_client.lng | 2 ++ interface/web/client/lib/lang/de_reseller.lng | 4 ++++ interface/web/client/lib/lang/el_client.lng | 2 ++ interface/web/client/lib/lang/el_reseller.lng | 4 ++++ interface/web/client/lib/lang/en_client.lng | 3 +++ interface/web/client/lib/lang/en_reseller.lng | 5 +++++ interface/web/client/lib/lang/es_client.lng | 2 ++ interface/web/client/lib/lang/es_reseller.lng | 4 ++++ interface/web/client/lib/lang/fi_client.lng | 2 ++ interface/web/client/lib/lang/fi_reseller.lng | 4 ++++ interface/web/client/lib/lang/fr_client.lng | 2 ++ interface/web/client/lib/lang/fr_reseller.lng | 4 ++++ interface/web/client/lib/lang/hr_client.lng | 2 ++ interface/web/client/lib/lang/hr_reseller.lng | 4 ++++ interface/web/client/lib/lang/hu_client.lng | 2 ++ interface/web/client/lib/lang/hu_reseller.lng | 4 ++++ interface/web/client/lib/lang/id_client.lng | 2 ++ interface/web/client/lib/lang/id_reseller.lng | 4 ++++ interface/web/client/lib/lang/it_client.lng | 2 ++ interface/web/client/lib/lang/it_reseller.lng | 4 ++++ interface/web/client/lib/lang/ja_client.lng | 2 ++ interface/web/client/lib/lang/ja_reseller.lng | 4 ++++ interface/web/client/lib/lang/nl_client.lng | 2 ++ interface/web/client/lib/lang/nl_reseller.lng | 4 ++++ interface/web/client/lib/lang/pl_client.lng | 2 ++ interface/web/client/lib/lang/pl_reseller.lng | 4 ++++ interface/web/client/lib/lang/pt_client.lng | 2 ++ interface/web/client/lib/lang/pt_reseller.lng | 4 ++++ interface/web/client/lib/lang/ro_client.lng | 2 ++ interface/web/client/lib/lang/ro_reseller.lng | 4 ++++ interface/web/client/lib/lang/ru_client.lng | 2 ++ interface/web/client/lib/lang/ru_reseller.lng | 4 ++++ interface/web/client/lib/lang/se_client.lng | 2 ++ interface/web/client/lib/lang/se_reseller.lng | 4 ++++ interface/web/client/lib/lang/sk_client.lng | 2 ++ interface/web/client/lib/lang/sk_reseller.lng | 4 ++++ interface/web/client/lib/lang/tr_client.lng | 2 ++ interface/web/client/lib/lang/tr_reseller.lng | 4 ++++ .../web/client/templates/client_edit_limits.htm | 3 +++ .../templates/client_template_edit_limits.htm | 3 +++ .../client/templates/reseller_edit_limits.htm | 3 +++ interface/web/sites/database_user_edit.php | 16 ++++++++++++++++ .../web/sites/lib/lang/ar_database_user.lng | 1 + .../web/sites/lib/lang/bg_database_user.lng | 1 + .../web/sites/lib/lang/br_database_user.lng | 1 + .../web/sites/lib/lang/ca_database_user.lng | 1 + .../web/sites/lib/lang/cz_database_user.lng | 1 + .../web/sites/lib/lang/de_database_user.lng | 1 + .../web/sites/lib/lang/el_database_user.lng | 1 + .../web/sites/lib/lang/en_database_user.lng | 1 + .../web/sites/lib/lang/es_database_user.lng | 1 + .../web/sites/lib/lang/fi_database_user.lng | 1 + .../web/sites/lib/lang/fr_database_user.lng | 1 + .../web/sites/lib/lang/hr_database_user.lng | 1 + .../web/sites/lib/lang/hu_database_user.lng | 1 + .../web/sites/lib/lang/id_database_user.lng | 1 + .../web/sites/lib/lang/it_database_user.lng | 1 + .../web/sites/lib/lang/ja_database_user.lng | 1 + .../web/sites/lib/lang/nl_database_user.lng | 1 + .../web/sites/lib/lang/pl_database_user.lng | 1 + .../web/sites/lib/lang/pt_database_user.lng | 1 + .../web/sites/lib/lang/ro_database_user.lng | 1 + .../web/sites/lib/lang/ru_database_user.lng | 1 + .../web/sites/lib/lang/se_database_user.lng | 1 + .../web/sites/lib/lang/sk_database_user.lng | 1 + .../web/sites/lib/lang/tr_database_user.lng | 1 + 81 files changed, 243 insertions(+) diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql index d834f98af6..07c5391b08 100644 --- a/install/sql/incremental/upd_dev_collection.sql +++ b/install/sql/incremental/upd_dev_collection.sql @@ -222,3 +222,7 @@ ALTER TABLE `sys_user` ADD COLUMN `lost_password_reqtime` DATETIME NULL default NULL; ALTER TABLE `web_database` ADD COLUMN `quota_exceeded` enum('n','y') NOT NULL DEFAULT 'n' AFTER `database_quota`; + +ALTER TABLE `client` ADD COLUMN `limit_database_users` int(11) NOT NULL DEFAULT '-1' after limit_database; +ALTER TABLE `client_template` ADD COLUMN `limit_database_users` int(11) NOT NULL DEFAULT '-1' after limit_database; + diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 945b30fecc..7e706f9fd5 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -230,6 +230,7 @@ CREATE TABLE `client` ( `default_dbserver` int(11) NOT NULL DEFAULT '1', `dns_servers` blob, `limit_database` int(11) NOT NULL DEFAULT '-1', + `limit_database_users` int(11) NOT NULL DEFAULT '-1', `limit_database_quota` int(11) NOT NULL default '-1', `limit_cron` int(11) NOT NULL DEFAULT '0', `limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url', @@ -351,6 +352,7 @@ CREATE TABLE `client_template` ( `limit_dns_slave_zone` int(11) NOT NULL default '-1', `limit_dns_record` int(11) NOT NULL default '-1', `limit_database` int(11) NOT NULL default '-1', + `limit_database_users` int(11) NOT NULL DEFAULT '-1', `limit_database_quota` int(11) NOT NULL default '-1', `limit_cron` int(11) NOT NULL default '0', `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url', diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 4e972b9228..34cdd2eae5 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -1262,6 +1262,20 @@ $form["tabs"]['limits'] = array ( 'rows' => '', 'cols' => '' ), + 'limit_database_user' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_database_user_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), 'limit_database_quota' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/client/form/client_template.tform.php b/interface/web/client/form/client_template.tform.php index 2da539c737..a16d21ff8e 100644 --- a/interface/web/client/form/client_template.tform.php +++ b/interface/web/client/form/client_template.tform.php @@ -729,6 +729,20 @@ $form["tabs"]['limits'] = array ( 'rows' => '', 'cols' => '' ), + 'limit_database_user' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_database_user_error_notint'), + ), + 'default' => '0', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), 'limit_database_quota' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php index 50d5e7438a..b41cd5382e 100644 --- a/interface/web/client/form/reseller.tform.php +++ b/interface/web/client/form/reseller.tform.php @@ -1261,6 +1261,20 @@ $form["tabs"]['limits'] = array ( 'rows' => '', 'cols' => '' ), + 'limit_database_user' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_database_user_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), 'limit_cron' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng index 1fd05521e4..b9735d8768 100644 --- a/interface/web/client/lib/lang/ar_client.lng +++ b/interface/web/client/lib/lang/ar_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng index adabf8daa5..e3a764e3a8 100644 --- a/interface/web/client/lib/lang/ar_reseller.lng +++ b/interface/web/client/lib/lang/ar_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng index cb61f56211..f81b81aacf 100644 --- a/interface/web/client/lib/lang/bg_client.lng +++ b/interface/web/client/lib/lang/bg_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng index c27de728d1..a17b3f9887 100644 --- a/interface/web/client/lib/lang/bg_reseller.lng +++ b/interface/web/client/lib/lang/bg_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng index a1f399ecab..84fc0cb1f9 100644 --- a/interface/web/client/lib/lang/br_client.lng +++ b/interface/web/client/lib/lang/br_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng index 1fa842aeff..0813b79a11 100644 --- a/interface/web/client/lib/lang/br_reseller.lng +++ b/interface/web/client/lib/lang/br_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng index 1b7662344c..21f3778bdf 100644 --- a/interface/web/client/lib/lang/ca_client.lng +++ b/interface/web/client/lib/lang/ca_client.lng @@ -194,4 +194,6 @@ $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng index 62da031ea8..9f3a816568 100644 --- a/interface/web/client/lib/lang/ca_reseller.lng +++ b/interface/web/client/lib/lang/ca_reseller.lng @@ -196,4 +196,8 @@ $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng index d7ec73d34b..65e8affe84 100644 --- a/interface/web/client/lib/lang/cz_client.lng +++ b/interface/web/client/lib/lang/cz_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng index 1e0e479b67..4a4c11121d 100644 --- a/interface/web/client/lib/lang/cz_reseller.lng +++ b/interface/web/client/lib/lang/cz_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 70368421ce..d24447548e 100644 --- a/interface/web/client/lib/lang/de_client.lng +++ b/interface/web/client/lib/lang/de_client.lng @@ -196,4 +196,6 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng index 137d206e9f..057a675184 100644 --- a/interface/web/client/lib/lang/de_reseller.lng +++ b/interface/web/client/lib/lang/de_reseller.lng @@ -198,4 +198,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['limit_directive_snippets_txt'] = 'Webserver-Konfigurationsauswahl sichtbar'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng index 6e4adbfcce..00dfe60875 100644 --- a/interface/web/client/lib/lang/el_client.lng +++ b/interface/web/client/lib/lang/el_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng index f1c1cb8f98..00302e8b6c 100644 --- a/interface/web/client/lib/lang/el_reseller.lng +++ b/interface/web/client/lib/lang/el_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index ac3336da84..05cf0f4729 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -196,6 +196,9 @@ $wb['parent_client_id_txt'] = 'Client of reseller'; $wb['none_txt'] = 'none'; $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; +$wb['limit_database_user_txt'] = "Max. Database users"; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; + $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = "Save"; $wb['btn_cancel_txt'] = "Cancel"; diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index 1cc3e5e8fe..b40219f2b2 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -42,6 +42,7 @@ $wb["limit_domain_txt"] = 'limit_domain'; $wb["limit_subdomain_txt"] = 'limit_subdomain'; $wb["limit_webquota_txt"] = 'limit_webquota'; $wb["limit_database_txt"] = 'limit_database'; +$wb["limit_database_user_txt"] = "Max. Database users"; $wb["limit_cron_txt"] = 'Max. number of cron jobs'; $wb["limit_cron_type_txt"] = 'Max. type of cron jobs (chrooted and full implies url)'; $wb["limit_cron_frequency_txt"] = 'Min. delay between executions'; @@ -203,4 +204,8 @@ $wb["btn_cancel_txt"] = "Cancel"; $wb["email_error_empty"] = "Email is empty"; $wb['limit_directive_snippets_txt'] = 'Show web server config selection'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng index 10bf55272f..a4f8a3102d 100644 --- a/interface/web/client/lib/lang/es_client.lng +++ b/interface/web/client/lib/lang/es_client.lng @@ -194,4 +194,6 @@ $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng index 523c2754a1..cc36835573 100644 --- a/interface/web/client/lib/lang/es_reseller.lng +++ b/interface/web/client/lib/lang/es_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng index 0eedd41840..e8b826669b 100755 --- a/interface/web/client/lib/lang/fi_client.lng +++ b/interface/web/client/lib/lang/fi_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng index 588cd6bf2b..2c99b68639 100644 --- a/interface/web/client/lib/lang/fi_reseller.lng +++ b/interface/web/client/lib/lang/fi_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng index 1c09968445..2fd6e803f6 100644 --- a/interface/web/client/lib/lang/fr_client.lng +++ b/interface/web/client/lib/lang/fr_client.lng @@ -194,4 +194,6 @@ $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng index 349f321d92..5b8784f908 100644 --- a/interface/web/client/lib/lang/fr_reseller.lng +++ b/interface/web/client/lib/lang/fr_reseller.lng @@ -196,4 +196,8 @@ $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng index 73f7f8fd93..168c3d37eb 100644 --- a/interface/web/client/lib/lang/hr_client.lng +++ b/interface/web/client/lib/lang/hr_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng index 9b164737de..0b094edd9e 100644 --- a/interface/web/client/lib/lang/hr_reseller.lng +++ b/interface/web/client/lib/lang/hr_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng index bc815739ef..a29b59dfa2 100644 --- a/interface/web/client/lib/lang/hu_client.lng +++ b/interface/web/client/lib/lang/hu_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng index 1de852e6a0..66956f8fa5 100644 --- a/interface/web/client/lib/lang/hu_reseller.lng +++ b/interface/web/client/lib/lang/hu_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng index 1b5170f70f..be5d7d0f6b 100644 --- a/interface/web/client/lib/lang/id_client.lng +++ b/interface/web/client/lib/lang/id_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng index 443c585ed1..3c29130a2d 100644 --- a/interface/web/client/lib/lang/id_reseller.lng +++ b/interface/web/client/lib/lang/id_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng index 67db0e8475..54ee0818a0 100644 --- a/interface/web/client/lib/lang/it_client.lng +++ b/interface/web/client/lib/lang/it_client.lng @@ -194,4 +194,6 @@ $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng index eb6ad2972d..5d343c131f 100644 --- a/interface/web/client/lib/lang/it_reseller.lng +++ b/interface/web/client/lib/lang/it_reseller.lng @@ -196,4 +196,8 @@ $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng index fcad2c8af7..64fdc3396b 100644 --- a/interface/web/client/lib/lang/ja_client.lng +++ b/interface/web/client/lib/lang/ja_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng index 3ae09d4d0c..570f841f26 100644 --- a/interface/web/client/lib/lang/ja_reseller.lng +++ b/interface/web/client/lib/lang/ja_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 85a8da4a41..6273b3b511 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index 75fe763c83..d01967b077 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 3070af7a42..9429cb958e 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 37e64c81e7..a4559dd67c 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng index a77746ead6..4dcc6494a8 100644 --- a/interface/web/client/lib/lang/pt_client.lng +++ b/interface/web/client/lib/lang/pt_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng index 1c7ffc35c0..46bc4a26fa 100644 --- a/interface/web/client/lib/lang/pt_reseller.lng +++ b/interface/web/client/lib/lang/pt_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng index a059dec405..947bac17b1 100644 --- a/interface/web/client/lib/lang/ro_client.lng +++ b/interface/web/client/lib/lang/ro_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng index adabf8daa5..e3a764e3a8 100644 --- a/interface/web/client/lib/lang/ro_reseller.lng +++ b/interface/web/client/lib/lang/ro_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng index 3f5de65e90..f4ca515a2f 100644 --- a/interface/web/client/lib/lang/ru_client.lng +++ b/interface/web/client/lib/lang/ru_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng index 66835b9d4f..43286120e6 100644 --- a/interface/web/client/lib/lang/ru_reseller.lng +++ b/interface/web/client/lib/lang/ru_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng index 118adcfe2a..4d86df0ef2 100644 --- a/interface/web/client/lib/lang/se_client.lng +++ b/interface/web/client/lib/lang/se_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng index adabf8daa5..e3a764e3a8 100644 --- a/interface/web/client/lib/lang/se_reseller.lng +++ b/interface/web/client/lib/lang/se_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng index 3311f1bf9e..00e217e1ab 100644 --- a/interface/web/client/lib/lang/sk_client.lng +++ b/interface/web/client/lib/lang/sk_client.lng @@ -194,4 +194,6 @@ $wb['reseller_txt'] = 'Reseller'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng index 25a1910480..977893bad4 100644 --- a/interface/web/client/lib/lang/sk_reseller.lng +++ b/interface/web/client/lib/lang/sk_reseller.lng @@ -196,4 +196,8 @@ $wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available'; $wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available'; $wb['limit_xmpp_status_txt'] = 'Status host available'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng index c071c74c93..4c306aca22 100644 --- a/interface/web/client/lib/lang/tr_client.lng +++ b/interface/web/client/lib/lang/tr_client.lng @@ -194,4 +194,6 @@ $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; ?> diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng index 5d3debf377..5a72161b26 100644 --- a/interface/web/client/lib/lang/tr_reseller.lng +++ b/interface/web/client/lib/lang/tr_reseller.lng @@ -196,4 +196,8 @@ $wb['invalid_vat_id'] = 'The VAT ID is invalid.'; $wb['btn_save_txt'] = 'Save'; $wb['btn_cancel_txt'] = 'Cancel'; $wb['email_error_empty'] = 'Email is empty'; +$wb['limit_database_user_txt'] = 'Max. Database users'; +$wb['limit_database_user_error_notint'] = 'The database user limit must be a number.'; +$wb['limit_database_quota_txt'] = 'Database quota'; +$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; ?> diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 01b1b8b28d..139694697c 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -333,6 +333,9 @@
+
+ +
 MB diff --git a/interface/web/client/templates/client_template_edit_limits.htm b/interface/web/client/templates/client_template_edit_limits.htm index 09bcce2471..5e0abb9796 100644 --- a/interface/web/client/templates/client_template_edit_limits.htm +++ b/interface/web/client/templates/client_template_edit_limits.htm @@ -266,6 +266,9 @@
+
+ +
 MB diff --git a/interface/web/client/templates/reseller_edit_limits.htm b/interface/web/client/templates/reseller_edit_limits.htm index 8dc587eb23..b68fff968d 100644 --- a/interface/web/client/templates/reseller_edit_limits.htm +++ b/interface/web/client/templates/reseller_edit_limits.htm @@ -335,6 +335,9 @@
+
+ +
 MB diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php index 90b28ef6e2..88e05d616f 100644 --- a/interface/web/sites/database_user_edit.php +++ b/interface/web/sites/database_user_edit.php @@ -50,6 +50,22 @@ $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app; + + // we will check only users, not admins + if($_SESSION['s']['user']['typ'] == 'user') { + if(!$app->tform->checkClientLimit('limit_database_users')) { + $app->error($app->tform->wordbook["limit_database_user_txt"]); + } + if(!$app->tform->checkResellerLimit('limit_database_users')) { + $app->error('Reseller: '.$app->tform->wordbook["limit_database_user_txt"]); + } + } + + parent::onShowNew(); + } + function onShowEnd() { global $app, $conf, $interfaceConf; diff --git a/interface/web/sites/lib/lang/ar_database_user.lng b/interface/web/sites/lib/lang/ar_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/ar_database_user.lng +++ b/interface/web/sites/lib/lang/ar_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/bg_database_user.lng b/interface/web/sites/lib/lang/bg_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/bg_database_user.lng +++ b/interface/web/sites/lib/lang/bg_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/br_database_user.lng b/interface/web/sites/lib/lang/br_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/br_database_user.lng +++ b/interface/web/sites/lib/lang/br_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/ca_database_user.lng b/interface/web/sites/lib/lang/ca_database_user.lng index eca59800ec..ed143d572c 100644 --- a/interface/web/sites/lib/lang/ca_database_user.lng +++ b/interface/web/sites/lib/lang/ca_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Pas de résultat.'; $wb['globalsearch_noresults_limit_txt'] = '0 resultat'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng index 13b87822c0..81c77a1a80 100644 --- a/interface/web/sites/lib/lang/cz_database_user.lng +++ b/interface/web/sites/lib/lang/cz_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Žádné výsledky.'; $wb['globalsearch_noresults_limit_txt'] = '0 výsledků'; $wb['globalsearch_searchfield_watermark_txt'] = 'Hledat'; $wb['globalsearch_suggestions_text_txt'] = 'Návrhy'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/de_database_user.lng b/interface/web/sites/lib/lang/de_database_user.lng index dc175f1a40..3c14f2723a 100644 --- a/interface/web/sites/lib/lang/de_database_user.lng +++ b/interface/web/sites/lib/lang/de_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Keine Treffer.'; $wb['globalsearch_noresults_limit_txt'] = '0 Treffer'; $wb['globalsearch_searchfield_watermark_txt'] = 'Suche'; $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/el_database_user.lng b/interface/web/sites/lib/lang/el_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/el_database_user.lng +++ b/interface/web/sites/lib/lang/el_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/en_database_user.lng b/interface/web/sites/lib/lang/en_database_user.lng index 6c4ee7c696..3f478f1a35 100644 --- a/interface/web/sites/lib/lang/en_database_user.lng +++ b/interface/web/sites/lib/lang/en_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = "No results."; $wb['globalsearch_noresults_limit_txt'] = "0 results"; $wb['globalsearch_searchfield_watermark_txt'] = "Search"; $wb['globalsearch_suggestions_text_txt'] = "Suggestions"; +$wb['limit_database_user_txt'] = "The max. number of database users is reached."; ?> diff --git a/interface/web/sites/lib/lang/es_database_user.lng b/interface/web/sites/lib/lang/es_database_user.lng index 258e5717f3..eeea4bcabd 100644 --- a/interface/web/sites/lib/lang/es_database_user.lng +++ b/interface/web/sites/lib/lang/es_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Sin resultados.'; $wb['globalsearch_noresults_limit_txt'] = '0 resultados'; $wb['globalsearch_searchfield_watermark_txt'] = 'Buscar'; $wb['globalsearch_suggestions_text_txt'] = 'Sugerencias'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/fi_database_user.lng b/interface/web/sites/lib/lang/fi_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/fi_database_user.lng +++ b/interface/web/sites/lib/lang/fi_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/fr_database_user.lng b/interface/web/sites/lib/lang/fr_database_user.lng index a904ad4bae..95903514d7 100644 --- a/interface/web/sites/lib/lang/fr_database_user.lng +++ b/interface/web/sites/lib/lang/fr_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/hr_database_user.lng b/interface/web/sites/lib/lang/hr_database_user.lng index c4d033956b..93f20936c5 100644 --- a/interface/web/sites/lib/lang/hr_database_user.lng +++ b/interface/web/sites/lib/lang/hr_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Nema rezultata.'; $wb['globalsearch_noresults_limit_txt'] = '0 rezultata'; $wb['globalsearch_searchfield_watermark_txt'] = 'Traži'; $wb['globalsearch_suggestions_text_txt'] = 'Sugestija'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/hu_database_user.lng b/interface/web/sites/lib/lang/hu_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/hu_database_user.lng +++ b/interface/web/sites/lib/lang/hu_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/id_database_user.lng b/interface/web/sites/lib/lang/id_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/id_database_user.lng +++ b/interface/web/sites/lib/lang/id_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/it_database_user.lng b/interface/web/sites/lib/lang/it_database_user.lng index bb4da9dc92..82051d944d 100644 --- a/interface/web/sites/lib/lang/it_database_user.lng +++ b/interface/web/sites/lib/lang/it_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Nessun results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Cerca'; $wb['globalsearch_suggestions_text_txt'] = 'Suggerimenti'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/ja_database_user.lng b/interface/web/sites/lib/lang/ja_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/ja_database_user.lng +++ b/interface/web/sites/lib/lang/ja_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/nl_database_user.lng b/interface/web/sites/lib/lang/nl_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/nl_database_user.lng +++ b/interface/web/sites/lib/lang/nl_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/pl_database_user.lng b/interface/web/sites/lib/lang/pl_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/pl_database_user.lng +++ b/interface/web/sites/lib/lang/pl_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/pt_database_user.lng b/interface/web/sites/lib/lang/pt_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/pt_database_user.lng +++ b/interface/web/sites/lib/lang/pt_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/ro_database_user.lng b/interface/web/sites/lib/lang/ro_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/ro_database_user.lng +++ b/interface/web/sites/lib/lang/ro_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/ru_database_user.lng b/interface/web/sites/lib/lang/ru_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/ru_database_user.lng +++ b/interface/web/sites/lib/lang/ru_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/se_database_user.lng b/interface/web/sites/lib/lang/se_database_user.lng index 2cf9a1a8cb..1b2620f070 100644 --- a/interface/web/sites/lib/lang/se_database_user.lng +++ b/interface/web/sites/lib/lang/se_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Inga resultat'; $wb['globalsearch_noresults_limit_txt'] = '0 resultat'; $wb['globalsearch_searchfield_watermark_txt'] = 'Sök'; $wb['globalsearch_suggestions_text_txt'] = 'Förslag'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/sk_database_user.lng b/interface/web/sites/lib/lang/sk_database_user.lng index 66a0718349..d00aefe1f3 100644 --- a/interface/web/sites/lib/lang/sk_database_user.lng +++ b/interface/web/sites/lib/lang/sk_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'No results.'; $wb['globalsearch_noresults_limit_txt'] = '0 results'; $wb['globalsearch_searchfield_watermark_txt'] = 'Search'; $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> diff --git a/interface/web/sites/lib/lang/tr_database_user.lng b/interface/web/sites/lib/lang/tr_database_user.lng index de46731b6c..2c03022973 100644 --- a/interface/web/sites/lib/lang/tr_database_user.lng +++ b/interface/web/sites/lib/lang/tr_database_user.lng @@ -20,4 +20,5 @@ $wb['globalsearch_noresults_text_txt'] = 'Sonuç yok.'; $wb['globalsearch_noresults_limit_txt'] = '0 sonuç'; $wb['globalsearch_searchfield_watermark_txt'] = 'Arama'; $wb['globalsearch_suggestions_text_txt'] = 'Öneriler'; +$wb['limit_database_user_txt'] = 'The max. number of database users is reached.'; ?> -- GitLab