Merge branch '6286-deactivate-e-mail-doman-policy-dont-work' into 'develop'

Marius Burkard · Marius Burkard · commit c69903f45832 · 2022-02-28T09:29:06.000Z
Resolve "Deactivate e-mail doman policy dont work"

Closes #6286

See merge request ispconfig/ispconfig3!1561
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
@@ -440,7 +440,7 @@ function onAfterUpdate() {
 			}
 		}
 
-		$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = ?", '@' . $domain);
+		$tmp_user = $app->db->queryOneRecord("SELECT id, policy_id FROM spamfilter_users WHERE email = ?", '@' . $domain);
 		if($tmp_user["id"] > 0) {
 			// There is already a record that we will update
 			if((! $skip_spamfilter_users_update) && ($policy_id != $tmp_user['policy_id'])) {

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ function onAfterUpdate() {`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
`443`		`- $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = ?", '@' . $domain);`
	`443`	`+ $tmp_user = $app->db->queryOneRecord("SELECT id, policy_id FROM spamfilter_users WHERE email = ?", '@' . $domain);`
`444`	`444`	`if($tmp_user["id"] > 0) {`
`445`	`445`	`// There is already a record that we will update`
`446`	`446`	`if((! $skip_spamfilter_users_update) && ($policy_id != $tmp_user['policy_id'])) {`