Implement metadata for email templates of remaining emails

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

3 files changed, 24 insertions, 0 deletions

diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php
index de10c077ede..44cece1d658 100644
--- a/settings/Controller/MailSettingsController.php
+++ b/settings/Controller/MailSettingsController.php
@@ -148,6 +148,11 @@ class MailSettingsController extends Controller {
 				$displayName = $this->userSession->getUser()->getDisplayName();
 
 				$template = $this->mailer->createEMailTemplate();
+
+				$template->setMetaData('settings.TestEmail', [
+					'displayname' => $displayName,
+				]);
+
 				$template->addHeader();
 				$template->addHeading($this->l10n->t('Well done, %s!', [$displayName]));
 				$template->addBodyText($this->l10n->t('If you received this email, the email configuration seems to be correct.'));
diff --git a/settings/Hooks.php b/settings/Hooks.php
index 115f62a9a2a..f97145da0c0 100644
--- a/settings/Hooks.php
+++ b/settings/Hooks.php
@@ -118,6 +118,11 @@ class Hooks {
 
 		if ($user->getEMailAddress() !== null) {
 			$template = $this->mailer->createEMailTemplate();
+			$template->setMetaData('settings.PasswordChanged', [
+				'displayname' => $user->getDisplayName(),
+				'emailAddress' => $user->getEMailAddress(),
+				'instanceUrl' => $instanceUrl,
+			]);
 			$template->addHeader();
 			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
 			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
@@ -184,6 +189,12 @@ class Hooks {
 
 		if ($oldMailAddress !== null) {
 			$template = $this->mailer->createEMailTemplate();
+			$template->setMetaData('settings.EmailChanged', [
+				'displayname' => $user->getDisplayName(),
+				'newEMailAddress' => $user->getEMailAddress(),
+				'oldEMailAddress' => $oldMailAddress,
+				'instanceUrl' => $instanceUrl,
+			]);
 			$template->addHeader();
 			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
 			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
diff --git a/settings/Mailer/NewUserMailHelper.php b/settings/Mailer/NewUserMailHelper.php
index cd6d6ee67f5..1571cfdcb49 100644
--- a/settings/Mailer/NewUserMailHelper.php
+++ b/settings/Mailer/NewUserMailHelper.php
@@ -139,6 +139,14 @@ class NewUserMailHelper {
 		);
 		$emailTemplate->addFooter();
 
+		$emailTemplate->setMetaData('settings.Welcome', [
+			'link' => $link,
+			'displayname' => $displayName,
+			'username' => $userName,
+			'instancename' => $this->themingDefaults->getName(),
+			'resetTokenGenerated' => $generatePasswordResetToken,
+		]);
+
 		return $emailTemplate;
 	}