diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 22f3302c6c4213c5d822280c67d6386707a11e4e..279ccbaf95f8a9cdd4e3981d43efe2681aceab2d 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -211,6 +211,11 @@ class page_action extends tform_actions { unset($global_config); unset($dbname_prefix); } + + //* ensure that quota value is not 0 when quota is set for client + if($client['limit_database_quota'] > 0 && isset($_POST["database_quota"]) && $_POST["database_quota"] == 0) { + $app->tform->errorMessage .= $app->tform->lng("limit_database_quota_not_0_txt")."
"; + } if($client['parent_client_id'] > 0) { // Get the limits of the reseller @@ -357,7 +362,7 @@ class page_action extends tform_actions { if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) { // we need remote access rights for this server, so get it's ip address $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server'); - + // Add default remote_ips from Main Configuration. $remote_ips = explode(",", $global_config['default_remote_dbserver']); if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; } @@ -380,7 +385,7 @@ class page_action extends tform_actions { } } } - + if ($app->tform->errorMessage == '') { // force update of the used database user if($this->dataRecord['database_user_id']) { @@ -442,7 +447,7 @@ class page_action extends tform_actions { if($tmp['server_id'] && $tmp['server_id'] != $this->dataRecord['server_id']) { // we need remote access rights for this server, so get it's ip address $server_config = $app->getconf->get_server_config($tmp['server_id'], 'server'); - + // Add default remote_ips from Main Configuration. $remote_ips = explode(",", $global_config['default_remote_dbserver']); if (!in_array($server_config['ip_address'], $default_remote_db)) { $remote_ips[] = $server_config['ip_address']; } diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng index bfd17a693cc73bd5ddf2cd8168941cce072376c2..f081f1dce8802b654dee732b91d31f32a860f249 100644 --- a/interface/web/sites/lib/lang/ar_database.lng +++ b/interface/web/sites/lib/lang/ar_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng index a6afea58baee1ccf407b399b9e5e27eff58cc0b6..675bbdd8c9aa01a3e339bc75da61208ddb0549e5 100644 --- a/interface/web/sites/lib/lang/bg_database.lng +++ b/interface/web/sites/lib/lang/bg_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng index 3690ee9cf8a30305958b91402b42bf32df78a404..2e5fcd72e59954b4929c8931ba866722cd2b646d 100644 --- a/interface/web/sites/lib/lang/br_database.lng +++ b/interface/web/sites/lib/lang/br_database.lng @@ -46,4 +46,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Sugestões'; $wb['limit_database_quota_txt'] = 'Cota do banco de dados'; $wb['limit_database_quota_error_notint'] = 'O limite da cota do banco de dados deve ser um número.'; $wb['limit_database_quota_free_txt'] = 'Limite da cota do banco de dados disponível'; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/ca_database.lng b/interface/web/sites/lib/lang/ca_database.lng index 9905e65d00a72e5c2355fb1ece7d51ea71beebb8..5a49db5f7500e33d5c11e22c73993a610b93e057 100644 --- a/interface/web/sites/lib/lang/ca_database.lng +++ b/interface/web/sites/lib/lang/ca_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng index edb031a1d30b7a9b85d47e89141eff532a064e78..931360d8ca7cb8e8a6165f3aa95d4a7ccdfd7881 100644 --- a/interface/web/sites/lib/lang/cz_database.lng +++ b/interface/web/sites/lib/lang/cz_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Prosím vyberte uživatele databáze pro tut $wb['limit_database_quota_txt'] = 'Kvóta databáze'; $wb['limit_database_quota_error_notint'] = 'Limit databázové kvóty musí být číslo.'; $wb['limit_database_quota_free_txt'] = 'Max. dostupná DB kvóta je '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng index 891306c48534a7172ca50715d6ad3b91bbd2892c..9f7a102ca3113af670c18d287d8da92b29d60096 100644 --- a/interface/web/sites/lib/lang/de_database.lng +++ b/interface/web/sites/lib/lang/de_database.lng @@ -46,4 +46,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge'; $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/dk_database.lng b/interface/web/sites/lib/lang/dk_database.lng index e788a05687ea114665c5d8b829a7907e1bb7ec37..70ac3b45dd540be592c49c0b9f8499f3f3293b5e 100644 --- a/interface/web/sites/lib/lang/dk_database.lng +++ b/interface/web/sites/lib/lang/dk_database.lng @@ -46,4 +46,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Forslag'; $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng index d64c1944129a411421de722b1f21d1b2835d4caa..d3c1555a7c6ce30dd81c51cc04f589fe3963ff71 100644 --- a/interface/web/sites/lib/lang/el_database.lng +++ b/interface/web/sites/lib/lang/el_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng index b094d45ade29f102879db46db72f663dfc289991..4c3e65387398062c9ec75433cd52302c20b402b2 100644 --- a/interface/web/sites/lib/lang/en_database.lng +++ b/interface/web/sites/lib/lang/en_database.lng @@ -46,4 +46,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions'; $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt']='Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng index 95c021c1578153cbb200447a887a5b96cad4ef5e..512d297da0fc47b887629a3d4442711227703ae5 100644 --- a/interface/web/sites/lib/lang/es_database.lng +++ b/interface/web/sites/lib/lang/es_database.lng @@ -46,4 +46,5 @@ $wb['select_dbuser_txt'] = 'Seleccionar usuario de base de datos'; $wb['select_site_txt'] = '- Seleccionar sitio -'; $wb['server_id_txt'] = 'Servidor'; $wb['type_txt'] = 'Tipo'; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng index 846bb40f41769165e1260b49d830c81c8fb95796..397cdbf03144fca54003da1aaf292baeda666963 100644 --- a/interface/web/sites/lib/lang/fi_database.lng +++ b/interface/web/sites/lib/lang/fi_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng index 50dc4851e0b49fbc944e7ee78e5ce2c31039cc6a..77e1d561cb1f3df02d7b30f4565b1f86e9b81726 100644 --- a/interface/web/sites/lib/lang/fr_database.lng +++ b/interface/web/sites/lib/lang/fr_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng index 1afaa78e87b3b445cd0b97b37a67f4372c26566e..f1c7d0db2e14301107af5f8c302b16615b0cba48 100644 --- a/interface/web/sites/lib/lang/hr_database.lng +++ b/interface/web/sites/lib/lang/hr_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng index 9cbb6398d01d49d153bea1fa41137b2f984cd6f0..cb27357b9736f6ffc9dc027d0cd9ecb61148b655 100644 --- a/interface/web/sites/lib/lang/hu_database.lng +++ b/interface/web/sites/lib/lang/hu_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng index bea0128d05dded56efb4ee0b9c3bab20197d23a3..90d38332179d6b6d3079dea3b232871f40cdd6f6 100644 --- a/interface/web/sites/lib/lang/id_database.lng +++ b/interface/web/sites/lib/lang/id_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng index 7ee6a1e21669cb95bd45e2c981ed15466eefad8f..007daaa00235c329cb627d15acb61dfb60e8a7ce 100644 --- a/interface/web/sites/lib/lang/it_database.lng +++ b/interface/web/sites/lib/lang/it_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Per favore selezionare un utente per questo $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng index bfd17a693cc73bd5ddf2cd8168941cce072376c2..f081f1dce8802b654dee732b91d31f32a860f249 100644 --- a/interface/web/sites/lib/lang/ja_database.lng +++ b/interface/web/sites/lib/lang/ja_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index 9cbf52692cf5c3524f359a5254a9e96fb4c3c2ed..d9bbfb0693f46f5abf9ac680f37febffb629d3c9 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index b38029e7f9d9f13fda197e14d97e399678c163cb..57294f0a4050ab754379c710b092268458944350 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -46,4 +46,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Sugestie'; $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng index e43e7f6b3116649d86f636c43b543d3ea0549592..9da316d039ca4c8f6a4d827afb0e936f3ecf9d5d 100644 --- a/interface/web/sites/lib/lang/pt_database.lng +++ b/interface/web/sites/lib/lang/pt_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng index 48acc975c2ea6a598af50a26abfbb29a10dd99a1..73f2b3eb6347a99d22f0c0f2c3642a39924e428c 100644 --- a/interface/web/sites/lib/lang/ro_database.lng +++ b/interface/web/sites/lib/lang/ro_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng index 0f5eaf31807d666eff99aa8e32d71d585bcfbcc1..478be40597d40c8de3b48c2bb9e1d7d41176894b 100644 --- a/interface/web/sites/lib/lang/ru_database.lng +++ b/interface/web/sites/lib/lang/ru_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Пожалуйста, выберите по $wb['limit_database_quota_txt'] = 'Квота базы данных'; $wb['limit_database_quota_error_notint'] = 'Лимит квоты базы данных должен быть числом.'; $wb['limit_database_quota_free_txt'] = 'Макс. доступная квота базы данных.'; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng index e93c07cfc74edf545d89b16a095b026c725e46de..bf3f3fabfe8b1dbf698a0bc8fc84382a1e9847a2 100644 --- a/interface/web/sites/lib/lang/se_database.lng +++ b/interface/web/sites/lib/lang/se_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Vänligen välj en databasanvändare för de $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng index 7776a5b460dc5d66c1f6090ea7944363886b7c21..7b8b53f2abd134510526f6e3e19288724046fffb 100644 --- a/interface/web/sites/lib/lang/sk_database.lng +++ b/interface/web/sites/lib/lang/sk_database.lng @@ -46,4 +46,5 @@ $wb['database_user_missing_txt'] = 'Please select a database user for this datab $wb['limit_database_quota_txt'] = 'Database quota'; $wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.'; $wb['limit_database_quota_free_txt'] = 'Max. available DB quota '; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?> diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng index f443bbb620a22a8298212b9abff6cd6e4c752899..9f8d200e436770f599663ba2db3b1215af3fa9d0 100644 --- a/interface/web/sites/lib/lang/tr_database.lng +++ b/interface/web/sites/lib/lang/tr_database.lng @@ -46,4 +46,5 @@ $wb['globalsearch_suggestions_text_txt'] = 'Öneriler'; $wb['limit_database_quota_txt'] = 'Veritabanı Kotası'; $wb['limit_database_quota_error_notint'] = 'Veritabanı kotası bir sayı olmalıdır'; $wb['limit_database_quota_free_txt'] = 'Kullanılabilecek en fazla veritabanı kotası'; +$wb['limit_database_quota_not_0_txt']= 'Database quota can not be 0'; ?>