From 579b5483ab7878b0436f3347d16886c83008995b Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 3 Mar 2017 17:31:50 +0100
Subject: [PATCH] Do not return empty map

---
 data/conf/rspamd/dynmaps/authoritative.php | 10 ++++++++--
 data/conf/rspamd/dynmaps/tags.php          | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/data/conf/rspamd/dynmaps/authoritative.php b/data/conf/rspamd/dynmaps/authoritative.php
index b2c101f7..bfd0b76e 100644
--- a/data/conf/rspamd/dynmaps/authoritative.php
+++ b/data/conf/rspamd/dynmaps/authoritative.php
@@ -1,7 +1,8 @@
 <?php
-ini_set('error_reporting', 0);
-header('Content-Type: text/plain');
 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;
 $opt = [
     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`");
 $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 while ($row = array_shift($rows)) {
+  $has_object = 1;
   echo strtolower(trim($row['domain'])) . PHP_EOL;
 }
 $stmt = $pdo->query("SELECT `alias_domain` FROM `alias_domain`");
 $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 while ($row = array_shift($rows)) {
+  $has_object = 1;
   echo strtolower(trim($row['alias_domain'])) . PHP_EOL;
 }
+if ($has_object == 0) {
+  echo "dummy@domain.local";
+}
 ?>
\ No newline at end of file
diff --git a/data/conf/rspamd/dynmaps/tags.php b/data/conf/rspamd/dynmaps/tags.php
index a084d141..7b955da4 100644
--- a/data/conf/rspamd/dynmaps/tags.php
+++ b/data/conf/rspamd/dynmaps/tags.php
@@ -1,7 +1,8 @@
 <?php
-ini_set('error_reporting', 0);
-header('Content-Type: text/plain');
 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;
 $opt = [
     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'");
 $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 while ($row = array_shift($rows)) {
+  $has_object = 1;
   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';");
 $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 while ($row = array_shift($rows)) {
+  $has_object = 1;
   echo strtolower(trim($row['tag_ad'])) . PHP_EOL;
 }
+if ($has_object == 0) {
+  echo "dummy@domain.local";
+}
 ?>