7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andryyy
2019-11-11 08:21:20 +01:00
parent 038a740acc fbc7b7dce5
commit fe1e9f3d15
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/conf/rspamd/local.d/composites.conf
View File

@@ -11,7 +11,7 @@ SPF_FAIL_NO_DKIM {
score = 10;
}
SOGO_CONTACT_EXCLUDE_FWD_HOST {
expression = "WHITELISTED_FWD_HOST & ~SOGO_CONTACT";
expression = "-WHITELISTED_FWD_HOST & ~SOGO_CONTACT";
}
SOGO_CONTACT_SPOOFED {
expression = "(R_SPF_PERMFAIL | R_SPF_SOFTFAIL | R_SPF_FAIL) & ~SOGO_CONTACT";

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

@@ -23,7 +23,7 @@ function admin($_action, $_data = null) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => 'username_invalid'
'msg' => array('username_invalid', $username)
);
return false;
}

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

@@ -35,7 +35,7 @@ function domain_admin($_action, $_data = null) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => 'username_invalid'
'msg' => array('username_invalid', $username)
);
return false;
}