Fixed: FS#3534 - Check if mail quota check is working correctly

Till Brehm · Till Brehm · commit ede489dea61c · 2014-07-27T15:43:31.000+02:00
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
@@ -166,7 +166,7 @@ function onSubmit() {
 			}
 
 			// Check the quota and adjust
-			if(isset($_POST["quota"]) && $client["limit_mailquota"] >= 0 && $app->functions->intval($this->dataRecord["quota"]) * 1024 * 1024 != $this->oldDataRecord['quota']) {
+			if(isset($_POST["quota"]) && $client["limit_mailquota"] >= 0 && (($app->functions->intval($this->dataRecord["quota"]) * 1024 * 1024 != $this->oldDataRecord['quota']) || ($_POST["quota"] <= 0))) {
 				$tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));
 				$mailquota = $tmp["mailquota"] / 1024 / 1024;
 				$new_mailbox_quota = $app->functions->intval($this->dataRecord["quota"]);
@@ -179,6 +179,7 @@ function onSubmit() {
 				unset($tmp);
 				unset($tmp_quota);
 			}
+			
 		} // end if user is not admin
 
 

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ function onSubmit() {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`// Check the quota and adjust`
`169`		`- if(isset($_POST["quota"]) && $client["limit_mailquota"] >= 0 && $app->functions->intval($this->dataRecord["quota"]) * 1024 * 1024 != $this->oldDataRecord['quota']) {`
	`169`	`+ if(isset($_POST["quota"]) && $client["limit_mailquota"] >= 0 && (($app->functions->intval($this->dataRecord["quota"]) * 1024 * 1024 != $this->oldDataRecord['quota']) \|\| ($_POST["quota"] <= 0))) {`
`170`	`170`	`$tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".$app->functions->intval($this->id)." AND ".$app->tform->getAuthSQL('u'));`
`171`	`171`	`$mailquota = $tmp["mailquota"] / 1024 / 1024;`
`172`	`172`	`$new_mailbox_quota = $app->functions->intval($this->dataRecord["quota"]);`
`@@ -179,6 +179,7 @@ function onSubmit() {`
`179`	`179`	`unset($tmp);`
`180`	`180`	`unset($tmp_quota);`
`181`	`181`	`}`
	`182`	`+`
`182`	`183`	`} // end if user is not admin`
`183`	`184`
`184`	`185`