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

Do not return empty map

master
andryyy 2017-03-03 17:31:50 +01:00
parent 83e02cbe4a
commit 579b5483ab
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/conf/rspamd/dynmaps/authoritative.php
View File

@ -1,7 +1,8 @@
<?php <?php
ini_set('error_reporting', 0);
header('Content-Type: text/plain');
require_once "vars.inc.php"; require_once "vars.inc.php";
ini_set('error_reporting', 0);
$has_object = 0;
header('Content-Type: text/plain');
$dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name; $dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name;
$opt = [ $opt = [
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
@ -12,11 +13,16 @@ $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
$stmt = $pdo->query("SELECT `domain` FROM `domain`"); $stmt = $pdo->query("SELECT `domain` FROM `domain`");
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) { while ($row = array_shift($rows)) {
$has_object = 1;
echo strtolower(trim($row['domain'])) . PHP_EOL; echo strtolower(trim($row['domain'])) . PHP_EOL;
} }
$stmt = $pdo->query("SELECT `alias_domain` FROM `alias_domain`"); $stmt = $pdo->query("SELECT `alias_domain` FROM `alias_domain`");
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) { while ($row = array_shift($rows)) {
$has_object = 1;
echo strtolower(trim($row['alias_domain'])) . PHP_EOL; echo strtolower(trim($row['alias_domain'])) . PHP_EOL;
} }
if ($has_object == 0) {
echo "dummy@domain.local";
}
?> ?>

10
data/conf/rspamd/dynmaps/tags.php
View File

@ -1,7 +1,8 @@
<?php <?php
ini_set('error_reporting', 0);
header('Content-Type: text/plain');
require_once "vars.inc.php"; require_once "vars.inc.php";
ini_set('error_reporting', 0);
$has_object = 0;
header('Content-Type: text/plain');
$dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name; $dsn = $database_type . ':host=' . $database_host . ';dbname=' . $database_name;
$opt = [ $opt = [
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
@ -12,11 +13,16 @@ $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
$stmt = $pdo->query("SELECT `username` FROM `mailbox` WHERE `wants_tagged_subject` = '1'"); $stmt = $pdo->query("SELECT `username` FROM `mailbox` WHERE `wants_tagged_subject` = '1'");
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) { while ($row = array_shift($rows)) {
$has_object = 1;
echo strtolower(trim($row['username'])) . PHP_EOL; echo strtolower(trim($row['username'])) . PHP_EOL;
} }
$stmt = $pdo->query("SELECT CONCAT(mailbox.local_part, '@', alias_domain.alias_domain) as `tag_ad` FROM `mailbox` INNER JOIN `alias_domain` ON mailbox.domain = alias_domain.target_domain WHERE mailbox.wants_tagged_subject='1';"); $stmt = $pdo->query("SELECT CONCAT(mailbox.local_part, '@', alias_domain.alias_domain) as `tag_ad` FROM `mailbox` INNER JOIN `alias_domain` ON mailbox.domain = alias_domain.target_domain WHERE mailbox.wants_tagged_subject='1';");
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
while ($row = array_shift($rows)) { while ($row = array_shift($rows)) {
$has_object = 1;
echo strtolower(trim($row['tag_ad'])) . PHP_EOL; echo strtolower(trim($row['tag_ad'])) . PHP_EOL;
} }
if ($has_object == 0) {
echo "dummy@domain.local";
}
?> ?>