|
@@ -145,17 +145,22 @@ function rspamd_maps($_action, $_data = null) {
|
|
$maps = (array)$_data['map'];
|
|
$maps = (array)$_data['map'];
|
|
$valid_maps = array();
|
|
$valid_maps = array();
|
|
foreach ($maps as $map) {
|
|
foreach ($maps as $map) {
|
|
|
|
+ $is_valid = false;
|
|
foreach ($RSPAMD_MAPS as $rspamd_map_type) {
|
|
foreach ($RSPAMD_MAPS as $rspamd_map_type) {
|
|
- if (!in_array($map, $rspamd_map_type)) {
|
|
|
|
- $_SESSION['return'][] = array(
|
|
|
|
- 'type' => 'danger',
|
|
|
|
- 'log' => array(__FUNCTION__, $_action, '-'),
|
|
|
|
- 'msg' => array('global_map_invalid', $map)
|
|
|
|
- );
|
|
|
|
- } else {
|
|
|
|
- array_push($valid_maps, $map);
|
|
|
|
|
|
+ if (in_array($map, $rspamd_map_type)) {
|
|
|
|
+ $is_valid = true;
|
|
|
|
+ break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if ($is_valid) {
|
|
|
|
+ array_push($valid_maps, $map);
|
|
|
|
+ } else {
|
|
|
|
+ $_SESSION['return'][] = array(
|
|
|
|
+ 'type' => 'danger',
|
|
|
|
+ 'log' => array(__FUNCTION__, $_action, '-'),
|
|
|
|
+ 'msg' => array('global_map_invalid', $map)
|
|
|
|
+ );
|
|
|
|
+ }
|
|
}
|
|
}
|
|
foreach ($valid_maps as $map) {
|
|
foreach ($valid_maps as $map) {
|
|
try {
|
|
try {
|