diff --git a/data/web/admin.php b/data/web/admin.php index c15058a8a..ae22436ac 100644 --- a/data/web/admin.php +++ b/data/web/admin.php @@ -1186,7 +1186,7 @@ if (!isset($_SESSION['gal']) && $license_cache = $redis->Get('LICENSE_STATUS_CAC
- +
diff --git a/data/web/inc/functions.rspamd.inc.php b/data/web/inc/functions.rspamd.inc.php index a0312f49e..0753a009f 100644 --- a/data/web/inc/functions.rspamd.inc.php +++ b/data/web/inc/functions.rspamd.inc.php @@ -218,13 +218,15 @@ function rspamd($_action, $_data = null) { } $maps = (array)$_data['map']; foreach ($maps as $map) { - if (!in_array($map, $RSPAMD_MAPS)) { - $_SESSION['return'][] = array( - 'type' => 'danger', - 'log' => array(__FUNCTION__, $_action, $_data_log), - 'msg' => array('global_map_invalid', $map) - ); - continue; + foreach ($RSPAMD_MAPS as $rspamd_map_type) { + if (!in_array($map, $rspamd_map_type)) { + $_SESSION['return'][] = array( + 'type' => 'danger', + 'log' => array(__FUNCTION__, $_action, $_data_log), + 'msg' => array('global_map_invalid', $map) + ); + continue; + } } try { if (file_exists('/rspamd_custom_maps/' . $map)) { diff --git a/data/web/inc/vars.inc.php b/data/web/inc/vars.inc.php index 167f3c9a3..9b9705fd9 100644 --- a/data/web/inc/vars.inc.php +++ b/data/web/inc/vars.inc.php @@ -166,6 +166,7 @@ $RSPAMD_MAPS = array( 'Recipient Whitelist' => 'global_rcpt_whitelist.map', 'Fishy TLDS (only fired in combination with bad words)' => 'fishy_tlds.map', 'Bad Words (only fired in combination with fishy TLDs)' => 'bad_words.map', + 'Bad Words DE (only fired in combination with fishy TLDs)' => 'bad_words_de.map', 'Bad Languages' => 'bad_languages.map', ) );