Merge branch '4355-db-quota' into 'develop'

Do not allow DB quota = 0 when db quota client limit > 0 (#4355)

Closes #4355

See merge request ispconfig/ispconfig3!1246

Author: Marius Burkard

interface/web/sites/database_edit.php

@@ -211,6 +211,11 @@ function onSubmit() {
 					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")."<br>";
+				}
 
 				if($client['parent_client_id'] > 0) {
 					// Get the limits of the reseller
@@ -357,7 +362,7 @@ function onBeforeUpdate() {
 		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 @@ function onBeforeUpdate() {
 				}
 			}
 		}
-		
+
 		if ($app->tform->errorMessage == '') {
 			// force update of the used database user
 			if($this->dataRecord['database_user_id']) {
@@ -442,7 +447,7 @@ function onBeforeInsert() {
 		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']; }

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';
 ?>

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';
 ?>

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';
 ?>

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';
 ?>

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';
 ?>

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';
 ?>

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';
 ?>

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';
 ?>

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';
 ?>