From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 31 Jul 2016 12:08:51 +0000 (+0200)
Subject: Convert EmailNewActivationCodeForm to new email API
X-Git-Tag: 3.0.0_Beta_1~844
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3cd6ab58891285a6b645c17c1ba6a30fd0b72834;p=GitHub%2FWoltLab%2FWCF.git

Convert EmailNewActivationCodeForm to new email API
---

diff --git a/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php b/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php
index 19ff112aeb..06cc47dfa7 100644
--- a/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php
+++ b/wcfsetup/install/files/lib/form/EmailNewActivationCodeForm.class.php
@@ -2,8 +2,11 @@
 namespace wcf\form;
 use wcf\data\user\User;
 use wcf\data\user\UserAction;
+use wcf\system\email\mime\MimePartFacade;
+use wcf\system\email\mime\RecipientAwareTextMimePart;
+use wcf\system\email\Email;
+use wcf\system\email\UserMailbox;
 use wcf\system\exception\UserInputException;
-use wcf\system\mail\Mail;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
@@ -64,14 +67,19 @@ class EmailNewActivationCodeForm extends RegisterNewActivationCodeForm {
 		]);
 		$this->objectAction->executeAction();
 		
+		// reload user object
+		$this->user = new User($this->user->userID);
+		
 		// send activation mail
-		$messageData = [
-			'username' => $this->user->username,
-			'userID' => $this->user->userID,
-			'activationCode' => $activationCode
-		];
-		$mail = new Mail([$this->user->username => $this->user->newEmail], WCF::getLanguage()->getDynamicVariable('wcf.user.changeEmail.needReactivation.mail.subject'), WCF::getLanguage()->getDynamicVariable('wcf.user.changeEmail.needReactivation.mail', $messageData));
-		$mail->send();
+		$email = new Email();
+		$email->addRecipient(new UserMailbox($this->user));
+		$email->setSubject($this->user->getLanguage()->getDynamicVariable('wcf.user.changeEmail.needReactivation.mail.subject'));
+		$email->setBody(new MimePartFacade([
+			new RecipientAwareTextMimePart('text/html', 'email_changeEmailNeedReactivation'),
+			new RecipientAwareTextMimePart('text/plain', 'email_changeEmailNeedReactivation')
+		]));
+		$email->send();
+		
 		$this->saved();
 		
 		// forward to index page