Merge branch 'dev' of https://github.com/andryyy/mailcow-dockerized

data/conf/rspamd/lua/rspamd.local.lua

@@ -23,7 +23,10 @@ auth_domain_map = rspamd_config:add_map({
   description = 'Map of domains we are authoritative for'
 })
 
-rspamd_config:register_post_filter(function(task)
+rspamd_config:register_symbol({
+  name = 'TAG_MOO',
+  type = 'postfilter',
+  callback = function(task)
     local util = require("rspamd_util")
     local rspamd_logger = require "rspamd_logger"
 
@@ -41,7 +44,7 @@ rspamd_config:register_post_filter(function(task)
 
       if action ~= 'no action' and action ~= 'greylist' then
         rspamd_logger.infox("skipping tag handler for action: %s", action)
-      return false
+        task:set_metric_action('default', action)
       end
 
       if authdomain then
@@ -67,7 +70,9 @@ rspamd_config:register_post_filter(function(task)
       end
       return false
     end
-end)
+  end,
+  priority = 10
+})
 
 rspamd_config.MRAPTOR = {
   callback = function(task)

data/web/inc/functions.inc.php

@@ -3320,7 +3320,7 @@ function mailbox_edit_alias_domain($postarray) {
 		$stmt = $pdo->prepare("UPDATE `alias_domain` SET
       `alias_domain` = :alias_domain,
       `active` = :active,
-      `modified` = :modified,
+      `modified` = :modified
         WHERE `alias_domain` = :alias_domain_now");
 		$stmt->execute(array(
 			':alias_domain' => $alias_domain,