From 1e2bcfb946e93a4096068da7a582a78f84b988d0 Mon Sep 17 00:00:00 2001 From: Kristian Feldsam Date: Fri, 3 Apr 2020 12:31:00 +0200 Subject: [PATCH] Quarantine release - fix when sender is empty (#3445) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kristián Feldsam --- data/web/inc/functions.quarantine.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/inc/functions.quarantine.inc.php b/data/web/inc/functions.quarantine.inc.php index bb9b4eaa..69fd4e01 100644 --- a/data/web/inc/functions.quarantine.inc.php +++ b/data/web/inc/functions.quarantine.inc.php @@ -81,7 +81,7 @@ function quarantine($_action, $_data = null) { $stmt = $pdo->prepare('SELECT `msg`, `qid`, `sender`, `rcpt` FROM `quarantine` WHERE `id` = :id'); $stmt->execute(array(':id' => $row['id'])); $detail_row = $stmt->fetch(PDO::FETCH_ASSOC); - $sender = (isset($detail_row['sender'])) ? $detail_row['sender'] : 'sender-unknown@rspamd'; + $sender = !empty($detail_row['sender']) ? $detail_row['sender'] : 'sender-unknown@rspamd'; if (!empty(gethostbynamel('postfix-mailcow'))) { $postfix = 'postfix-mailcow'; } @@ -368,7 +368,7 @@ function quarantine($_action, $_data = null) { ); continue; } - $sender = (isset($row['sender'])) ? $row['sender'] : 'sender-unknown@rspamd'; + $sender = !empty($row['sender']) ? $row['sender'] : 'sender-unknown@rspamd'; if (!empty(gethostbynamel('postfix-mailcow'))) { $postfix = 'postfix-mailcow'; }