public
nobgit
read
NobMail
Based on mailcow: dockerized
Languages
Repository composition by tracked source files.
PHP
49%
JavaScript
35%
HTML
9%
CSS
4%
Shell
2%
Python
1%
Lua
0%
Perl
0%
Ruby
0%
SCSS
0%
Create file
Wiki Documentation
Clone
https://nobgit.com/orgs/nobgit/nobmail.git
ssh://[email protected]:2222/orgs/nobgit/nobmail.git
Commit
Rspamd user settings: don't print all email addresses of a domain
The ucl_rcpts function can already deal with domains, so lets use this capability.
fcd8cfa4
data/conf/rspamd/dynmaps/settings.php | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)Diff
diff --git a/data/conf/rspamd/dynmaps/settings.php b/data/conf/rspamd/dynmaps/settings.php
index 56481e5e..9291a014 100644
--- a/data/conf/rspamd/dynmaps/settings.php
+++ b/data/conf/rspamd/dynmaps/settings.php
@@ -83,7 +83,7 @@ function ucl_rcpts($object, $type) {
$rcpt[] = '/.*@' . $object . '/i';
$stmt = $pdo->prepare("SELECT `alias_domain` FROM `alias_domain`
WHERE `target_domain` = :object");
- $stmt->execute(array(':object' => $row['object']));
+ $stmt->execute(array(':object' => $object));
$alias_domains = $stmt->fetchAll(PDO::FETCH_ASSOC);
array_filter($alias_domains);
while ($row = array_shift($alias_domains)) {
@@ -112,7 +112,7 @@ while ($row = array_shift($rows)) {
score_<?=$username_sane;?> {
priority = 4;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -158,7 +158,7 @@ while ($row = array_shift($rows)) {
?>
priority = 5;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -168,7 +168,7 @@ while ($row = array_shift($rows)) {
?>
priority = 6;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -199,7 +199,7 @@ while ($row = array_shift($rows)) {
?>
priority = 5;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -209,7 +209,7 @@ while ($row = array_shift($rows)) {
?>
priority = 6;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -250,7 +250,7 @@ while ($row = array_shift($rows)) {
?>
priority = 5;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -260,7 +260,7 @@ while ($row = array_shift($rows)) {
?>
priority = 6;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -291,7 +291,7 @@ while ($row = array_shift($rows)) {
?>
priority = 5;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php
@@ -301,7 +301,7 @@ while ($row = array_shift($rows)) {
?>
priority = 6;
<?php
- foreach (ucl_rcpts($row['object'], 'mailbox') as $rcpt) {
+ foreach (ucl_rcpts($row['object'], strpos($row['object'], '@') === FALSE ? 'domain' : 'mailbox') as $rcpt) {
?>
rcpt = "<?=$rcpt;?>";
<?php