Fixes #5410 rspamd mail aliases don't get updated when policy is changed

Author: Till Brehm

interface/lib/plugins/mail_mail_domain_plugin.inc.php

@@ -116,6 +116,16 @@ function mail_mail_domain_edit($event_name, $page_form) {
 			$app->db->query("UPDATE spamfilter_users SET email=REPLACE(email, ?, ?), sys_userid = ?, sys_groupid = ? WHERE email LIKE ?", $page_form->oldDataRecord['domain'], $domain, $client_user_id, $sys_groupid, "%@" . $page_form->oldDataRecord['domain']);
 
 		} // end if domain name changed
+		
+		//* Force-update the aliases (required for spamfilter changes)
+		$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source LIKE ? OR destination LIKE ?", "%@" . $domain, "%@" . $domain);
+		
+		if(is_array($forwardings)) {
+			foreach($forwardings as $rec) {
+				$app->db->datalogUpdate('mail_forwarding', array("source" => $rec['source']), 'forwarding_id', $rec['forwarding_id'],true);
+			}
+		}
+		
 	}
 
 }

interface/web/mail/spamfilter_policy_edit.php

@@ -105,6 +105,20 @@ function onAfterUpdate() {
 			if(is_array($spamfilter_users) && !empty($spamfilter_users)){
 				foreach($spamfilter_users as $spamfilter_user){
 					$app->db->datalogUpdate('spamfilter_users', $spamfilter_user, 'id', $spamfilter_user["id"], true);
+					
+					// check if this is an email domain
+					if(substr($spamfilter_user['email'],0,1) == '@') {
+						$domain = substr($spamfilter_user['email'],1);
+						$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source LIKE ? OR destination LIKE ?", "%@" . $domain, "%@" . $domain);
+						
+						// Force-update aliases and forwards
+						if(is_array($forwardings)) {
+							foreach($forwardings as $rec) {
+								$app->db->datalogUpdate('mail_forwarding', array("source" => $rec['source']), 'forwarding_id', $rec['forwarding_id'],true);
+							}
+						}
+					}
+					
 				}
 			}
 		}