Add Message-ID filter to email log

diff --git a/wcfsetup/install/files/acp/templates/emailLogList.tpl b/wcfsetup/install/files/acp/templates/emailLogList.tpl
index d230f763a0310d125c0eaf839855acc9ff5a1fac..e41b7a49608657a2f12244815ce7968a22bff0a4 100644 (file)
--- 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 47d53540c77b58630911c8f80abec67caa1bc610..56433ccca6ee06c9e4e448d95c8a0e7cd2b66e93 100644 (file)
--- 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 7e6d72609be88f78e8983c3c399129f93bf9ee15..cd9d92a4f9e4c8c9e0b2048847c86cb50ef46e6b 100644 (file)
--- 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 05dd51ca64e097dcd753a7fa77e284bc838edc3c..90ec1b6219faa2343f3b182cbd3a367169e20c0a 100644 (file)
--- 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>