Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
root 2017-03-16 13:44:08 +01:00
commit e66f566e86
2 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/conf/rspamd/lua/rspamd.local.lua
View File

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

2
data/web/inc/functions.inc.php
View File

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