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

Fix settings

master
andryyy 2017-01-29 13:56:24 +01:00
parent 6e196eeb6e
commit 5e39bcf5e4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/conf/rspamd/dynmaps/settings.php
View File

@ -4,7 +4,7 @@ The match section performs AND operation on different matches: for example, if y
then the rule matches only when from AND rcpt match. For similar matches, the OR rule applies: if you have multiple rcpt matches, then the rule matches only when from AND rcpt match. For similar matches, the OR rule applies: if you have multiple rcpt matches,
then any of these will trigger the rule. If a rule is triggered then no more rules are matched. then any of these will trigger the rule. If a rule is triggered then no more rules are matched.
*/ */
ini_set('error_reporting', 'E_ALL'); ini_set('error_reporting', '0');
header('Content-Type: text/plain'); header('Content-Type: text/plain');
require_once "vars.inc.php"; require_once "vars.inc.php";
@ -35,9 +35,9 @@ while ($row = array_shift($rows)) {
$spamscore = $stmt->fetchAll(PDO::FETCH_COLUMN|PDO::FETCH_GROUP); $spamscore = $stmt->fetchAll(PDO::FETCH_COLUMN|PDO::FETCH_GROUP);
$stmt = $pdo->prepare("SELECT GROUP_CONCAT(REPLACE(`value`, '*', '.*') SEPARATOR '|') AS `value` FROM `filterconf` $stmt = $pdo->prepare("SELECT GROUP_CONCAT(REPLACE(`value`, '*', '.*') SEPARATOR '|') AS `value` FROM `filterconf`
WHERE `object`= :object WHERE (`object`= :object OR `object`= :object_domain)
AND (`option` = 'blacklist_from' OR `option` = 'whitelist_from')"); AND (`option` = 'blacklist_from' OR `option` = 'whitelist_from')");
$stmt->execute(array(':object' => $row['object'])); $stmt->execute(array(':object' => $row['object'], ':object_domain' => substr(strrchr($row['object'], "@"), 1)));
$grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN); $grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN);
$value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0]))); $value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0])));
?> ?>
@ -59,10 +59,12 @@ while ($row = array_shift($rows)) {
$rows_aliases_2 = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows_aliases_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
array_filter($rows_aliases_2); array_filter($rows_aliases_2);
while ($row_aliases_2 = array_shift($rows_aliases_2)) { while ($row_aliases_2 = array_shift($rows_aliases_2)) {
if (!empty($row_aliases_2['aliases'])) {
?> ?>
rcpt = "<?=$row_aliases_2['aliases'];?>"; rcpt = "<?=$row_aliases_2['aliases'];?>";
<?php <?php
} }
}
?> ?>
apply "default" { apply "default" {
actions { actions {
@ -71,6 +73,7 @@ while ($row = array_shift($rows)) {
"add header" = <?=$spamscore['lowspamlevel'][0];?>; "add header" = <?=$spamscore['lowspamlevel'][0];?>;
} }
} }
}
<?php <?php
} }
@ -132,10 +135,12 @@ while ($row = array_shift($rows)) {
$rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows_aliases_wl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
array_filter($rows_aliases_wl_2); array_filter($rows_aliases_wl_2);
while ($row_aliases_wl_2 = array_shift($rows_aliases_wl_2)) { while ($row_aliases_wl_2 = array_shift($rows_aliases_wl_2)) {
if (!empty($row_aliases_wl_2['aliases'])) {
?> ?>
rcpt = "<?=$row_aliases_wl_2['aliases'];?>"; rcpt = "<?=$row_aliases_wl_2['aliases'];?>";
<?php <?php
} }
}
?> ?>
apply "default" { apply "default" {
MAILCOW_MOO = -999.0; MAILCOW_MOO = -999.0;
@ -202,10 +207,12 @@ while ($row = array_shift($rows)) {
$rows_aliases_bl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows_aliases_bl_2 = $stmt->fetchAll(PDO::FETCH_ASSOC);
array_filter($rows_aliases_bl_2); array_filter($rows_aliases_bl_2);
while ($row_aliases_bl_2 = array_shift($rows_aliases_bl_2)) { while ($row_aliases_bl_2 = array_shift($rows_aliases_bl_2)) {
if (!empty($row_aliases_bl_2['aliases'])) {
?> ?>
rcpt = "<?=$row_aliases_bl_2['aliases'];?>"; rcpt = "<?=$row_aliases_bl_2['aliases'];?>";
<?php <?php
} }
}
?> ?>
apply "default" { apply "default" {
MAILCOW_MOO = 999.0; MAILCOW_MOO = 999.0;