From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 15 Feb 2021 13:58:50 +0000 (+0100)
Subject: Add subject to email log
X-Git-Tag: 5.4.0_Alpha_1~252^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cba897de89b67b01084f79d0169b7edef2a31068;p=GitHub%2FWoltLab%2FWCF.git

Add subject to email log
---

diff --git a/wcfsetup/install/files/acp/templates/emailLogList.tpl b/wcfsetup/install/files/acp/templates/emailLogList.tpl
index 51cc014cac..231ce7b907 100644
--- a/wcfsetup/install/files/acp/templates/emailLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/emailLogList.tpl
@@ -28,7 +28,7 @@
 			<thead>
 				<tr>
 					<th class="columnID columnEntryID{if $sortField == 'entryID'} active {@$sortOrder}{/if}"><a href="{link controller='EmailLogList'}pageNo={@$pageNo}&sortField=entryID&sortOrder={if $sortField == 'entryID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.global.objectID{/lang}</a></th>
-					<th class="columnTitle columnMessageID{if $sortField == 'messageID'} active {@$sortOrder}{/if}">{lang}wcf.acp.email.log.messageID{/lang}</th>
+					<th class="columnTitle columnSubject{if $sortField == 'subject'} active {@$sortOrder}{/if}">{lang}wcf.acp.email.log.subject{/lang}</th>
 					<th class="columnText columnRecipient{if $sortField == 'recipient'} active {@$sortOrder}{/if}">{lang}wcf.user.email{/lang}</th>
 					<th class="columnDate columnTime{if $sortField == 'time'} active {@$sortOrder}{/if}"><a href="{link controller='EmailLogList'}pageNo={@$pageNo}&sortField=time&sortOrder={if $sortField == 'execTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.email.log.time{/lang}</a></th>
 					<th class="columnText columnStatusMessage{if $sortField == 'status'} active {@$sortOrder}{/if}"><a href="{link controller='EmailLogList'}pageNo={@$pageNo}&sortField=status&sortOrder={if $sortField == 'success' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{/link}">{lang}wcf.acp.email.log.status{/lang}</a></th>
@@ -42,7 +42,8 @@
 					<tr class="jsEmailLogEntry">
 						<td class="columnID columnEntryID">{@$entry->entryID}</td>
 						<td class="columnTitle columnMessageID">
-							<kbd title="{$entry->messageID}">{$entry->getFormattedMessageId()|truncate:50}</kbd>
+							{$entry->subject}<br>
+							<small><kbd title="{$entry->messageID}">{$entry->getFormattedMessageId()|truncate:50}</kbd></small>
 						</td>
 						<td class="columnText columnRecipient">
 							{if $__wcf->session->getPermission('admin.user.canEditMailAddress')}
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
index 7809379b55..36a2784b88 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.4_db.php
@@ -35,6 +35,7 @@ $tables = [
             ObjectIdDatabaseTableColumn::create('entryID'),
             NotNullInt10DatabaseTableColumn::create('time'),
             NotNullVarchar255DatabaseTableColumn::create('messageID'),
+            NotNullVarchar255DatabaseTableColumn::create('subject'),
             NotNullVarchar255DatabaseTableColumn::create('recipient'),
             IntDatabaseTableColumn::create('recipientID')
                 ->length(10)
diff --git a/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php b/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php
index 4718361624..9307d1d5e9 100644
--- a/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php
+++ b/wcfsetup/install/files/lib/system/background/job/EmailDeliveryBackgroundJob.class.php
@@ -9,6 +9,7 @@ use wcf\system\email\Mailbox;
 use wcf\system\email\transport\exception\PermanentFailure;
 use wcf\system\email\transport\IStatusReportingEmailTransport;
 use wcf\system\email\UserMailbox;
+use wcf\util\StringUtil;
 
 /**
  * Delivers the given email to the given mailbox.
@@ -86,6 +87,7 @@ class EmailDeliveryBackgroundJob extends AbstractBackgroundJob
             'data' => [
                 'time' => \TIME_NOW,
                 'messageID' => $this->email->getMessageID(),
+                'subject' => StringUtil::truncate($this->email->getSubject(), 30),
                 'recipient' => $this->envelopeTo->getAddress(),
                 'recipientID' => ($this->envelopeTo instanceof UserMailbox) ? $this->envelopeTo->getUser()->userID : null,
                 'status' => EmailLogEntry::STATUS_NEW,
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 6d3fb2a99b..0cf67a0e0c 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -630,7 +630,7 @@
 		<item name="wcf.acp.email.smtp.test.error.notTlsSupport"><![CDATA[Der Server unterstützt keine Verschlüsselung.]]></item>
 		<item name="wcf.acp.email.smtp.test.error.tlsFailed"><![CDATA[Der Aufbau einer verschlüsselten Verbindung war nicht möglich.]]></item>
 		<item name="wcf.acp.email.log"><![CDATA[Versendete E-Mails]]></item>
-		<item name="wcf.acp.email.log.messageID"><![CDATA[Message-ID]]></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.status"><![CDATA[Status]]></item>
 		<item name="wcf.acp.email.log.status.success"><![CDATA[Erfolgreich versendet]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ae9b8b19be..71146eb68c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -606,7 +606,7 @@
 		<item name="wcf.acp.email.smtp.test.error.notTlsSupport"><![CDATA[The server does not support encryption.]]></item>
 		<item name="wcf.acp.email.smtp.test.error.tlsFailed"><![CDATA[Unable to establish a secure connection.]]></item>
 		<item name="wcf.acp.email.log"><![CDATA[Emails Sent]]></item>
-		<item name="wcf.acp.email.log.messageID"><![CDATA[Message-ID]]></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.status"><![CDATA[Status]]></item>
 		<item name="wcf.acp.email.log.status.success"><![CDATA[Successfully Sent]]></item>
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 9c4d5eae4f..5ae64deec4 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -556,6 +556,7 @@ CREATE TABLE wcf1_email_log_entry (
 	entryID INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
 	time INT(10) NOT NULL,
 	messageID VARCHAR(255) NOT NULL,
+	subject VARCHAR(255) NOT NULL,
 	recipient VARCHAR(255) NOT NULL,
 	recipientID INT(10) DEFAULT NULL,
 	status VARCHAR(255) NOT NULL,