From 33aee30fcf867885627865682c5c0bfabd6d0e2e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Fri, 13 Aug 2021 15:52:11 +0200
Subject: [PATCH] Add Message-ID filter to email log

---
 .../install/files/acp/templates/emailLogList.tpl  | 15 +++++++++++++++
 .../files/lib/acp/page/EmailLogListPage.class.php |  7 +++++++
 wcfsetup/install/lang/de.xml                      |  1 +
 wcfsetup/install/lang/en.xml                      |  1 +
 4 files changed, 24 insertions(+)

diff --git a/wcfsetup/install/files/acp/templates/emailLogList.tpl b/wcfsetup/install/files/acp/templates/emailLogList.tpl
index d230f763a0..e41b7a4960 100644
--- a/wcfsetup/install/files/acp/templates/emailLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/emailLogList.tpl
@@ -70,6 +70,21 @@
 			</dl>
 		</div>
 
+		<div class="row rowColGap formGrid">
+			<dl class="col-xs-12 col-md-8">
+				<dt></dt>
+				<dd>
+					<input
+						class="long"
+						name="filter[messageId]"
+						placeholder="{lang}wcf.acp.email.log.messageId{/lang}"
+						type="text"
+						value="{$filter[messageId]}"
+					>
+				</dd>
+			</dl>
+		</div>
+
 		<div class="formSubmit">
 			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		</div>
diff --git a/wcfsetup/install/files/lib/acp/page/EmailLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/EmailLogListPage.class.php
index 47d53540c7..56433ccca6 100644
--- a/wcfsetup/install/files/lib/acp/page/EmailLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/EmailLogListPage.class.php
@@ -63,6 +63,7 @@ class EmailLogListPage extends SortablePage
         'username' => null,
         'status' => null,
         'email' => null,
+        'messageId' => null,
     ];
 
     /**
@@ -112,6 +113,12 @@ class EmailLogListPage extends SortablePage
                 $this->objectList->getConditionBuilder()->add('recipient = ?', [$this->filter['email']]);
             }
         }
+        if (!empty($this->filter['messageId'])) {
+            $this->objectList->getConditionBuilder()->add(
+                'messageID LIKE ?',
+                ['%' . $this->filter['messageId'] . '%']
+            );
+        }
     }
 
     /**
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 7e6d72609b..cd9d92a4f9 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -637,6 +637,7 @@
 		<item name="wcf.acp.email.log"><![CDATA[Versendete E-Mails]]></item>
 		<item name="wcf.acp.email.log.subject"><![CDATA[Betreff]]></item>
 		<item name="wcf.acp.email.log.time"><![CDATA[Erzeugt]]></item>
+		<item name="wcf.acp.email.log.messageId"><![CDATA[Message-ID]]></item>
 		<item name="wcf.acp.email.log.status"><![CDATA[Status]]></item>
 		<item name="wcf.acp.email.log.status.success"><![CDATA[Versand erfolgt]]></item>
 		<item name="wcf.acp.email.log.status.transient_failure"><![CDATA[Vorübergehendes Problem]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 05dd51ca64..90ec1b6219 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -614,6 +614,7 @@
 		<item name="wcf.acp.email.log"><![CDATA[Emails Sent]]></item>
 		<item name="wcf.acp.email.log.subject"><![CDATA[Subject]]></item>
 		<item name="wcf.acp.email.log.time"><![CDATA[Created]]></item>
+		<item name="wcf.acp.email.log.messageId"><![CDATA[Message-ID]]></item>
 		<item name="wcf.acp.email.log.status"><![CDATA[Status]]></item>
 		<item name="wcf.acp.email.log.status.success"><![CDATA[Sent]]></item>
 		<item name="wcf.acp.email.log.status.transient_failure"><![CDATA[Transient Failure]]></item>
-- 
2.20.1