Use setTemplate()

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Sep 15, 2017 · 1f843e6 · 1f843e6
1 parent 0fa4858
commit 1f843e6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -427,9 +427,7 @@ protected function sendMailNotification($filename,
 			$emailTemplate->addFooter();
 		}
 
-		$message->setSubject($emailTemplate->renderSubject());
-		$message->setPlainBody($emailTemplate->renderText());
-		$message->setHtmlBody($emailTemplate->renderHtml());
+		$message->setTemplate($emailTemplate);
 		$this->mailer->send($message);
 	}
 
@@ -491,9 +489,7 @@ protected function sendPassword(IShare $share, $password) {
 		}
 
 		$message->setTo([$shareWith]);
-		$message->setSubject($emailTemplate->renderSubject());
-		$message->setBody($emailTemplate->renderText(), 'text/plain');
-		$message->setHtmlBody($emailTemplate->renderHtml());
+		$message->setTemplate($emailTemplate);
 		$this->mailer->send($message);
 
 		$this->createPasswordSendActivity($share, $shareWith, false);
@@ -547,9 +543,7 @@ protected function sendPasswordToOwner(IShare $share, $password) {
 			$message->setFrom([$initiatorEMailAddress => $initiatorDisplayName]);
 		}
 		$message->setTo([$initiatorEMailAddress => $initiatorDisplayName]);
-		$message->setSubject($emailTemplate->renderSubject());
-		$message->setBody($emailTemplate->renderText(), 'text/plain');
-		$message->setHtmlBody($emailTemplate->renderHtml());
+		$message->setTemplate($emailTemplate);
 		$this->mailer->send($message);
 
 		$this->createPasswordSendActivity($share, $shareWith, true);

diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
@@ -328,10 +328,8 @@ protected function sendEmail($input) {
 		try {
 			$message = $this->mailer->createMessage();
 			$message->setTo([$email => $user->getUID()]);
-			$message->setSubject($emailTemplate->renderSubject());
-			$message->setPlainBody($emailTemplate->renderText());
-			$message->setHtmlBody($emailTemplate->renderHtml());
 			$message->setFrom([$this->from => $this->defaults->getName()]);
+			$message->setTemplate($emailTemplate);
 			$this->mailer->send($message);
 		} catch (\Exception $e) {
 			throw new \Exception($this->l10n->t(

diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
@@ -750,9 +750,7 @@ protected function sendMailNotification(IL10N $l,
 			$emailTemplate->addFooter();
 		}
 
-		$message->setSubject($emailTemplate->renderSubject());
-		$message->setPlainBody($emailTemplate->renderText());
-		$message->setHtmlBody($emailTemplate->renderHtml());
+		$message->setTemplate($emailTemplate);
 		$this->mailer->send($message);
 	}
 

diff --git a/settings/Controller/MailSettingsController.php b/settings/Controller/MailSettingsController.php
@@ -159,9 +159,7 @@ public function sendTestMail() {
 
 				$message = $this->mailer->createMessage();
 				$message->setTo([$email => $displayName]);
-				$message->setSubject($template->renderSubject());
-				$message->setHtmlBody($template->renderHtml());
-				$message->setPlainBody($template->renderText());
+				$message->setTemplate($template);
 				$errors = $this->mailer->send($message);
 				if (!empty($errors)) {
 					throw new \RuntimeException($this->l10n->t('Email could not be sent. Check your mail server log'));

diff --git a/settings/Hooks.php b/settings/Hooks.php
@@ -132,10 +132,7 @@ public function onChangePassword($uid) {
 
 			$message = $this->mailer->createMessage();
 			$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-			$message->setSubject($template->renderSubject());
-			$message->setBody($template->renderText(), 'text/plain');
-			$message->setHtmlBody($template->renderHtml());
-
+			$message->setTemplate($template);
 			$this->mailer->send($message);
 		}
 	}
@@ -208,10 +205,7 @@ public function onChangeEmail(IUser $user, $oldMailAddress) {
 
 			$message = $this->mailer->createMessage();
 			$message->setTo([$oldMailAddress => $user->getDisplayName()]);
-			$message->setSubject($template->renderSubject());
-			$message->setBody($template->renderText(), 'text/plain');
-			$message->setHtmlBody($template->renderHtml());
-
+			$message->setTemplate($template);
 			$this->mailer->send($message);
 		}
 	}

diff --git a/settings/Mailer/NewUserMailHelper.php b/settings/Mailer/NewUserMailHelper.php
@@ -160,10 +160,8 @@ public function sendMail(IUser $user,
 							 IEMailTemplate $emailTemplate) {
 		$message = $this->mailer->createMessage();
 		$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-		$message->setSubject($emailTemplate->renderSubject());
-		$message->setHtmlBody($emailTemplate->renderHtml());
-		$message->setPlainBody($emailTemplate->renderText());
 		$message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
+		$message->setTemplate($emailTemplate);
 		$this->mailer->send($message);
 	}
 }