From f6c06c4470a7293df572eefdf83eabf4ad74332a Mon Sep 17 00:00:00 2001
From: Varakh <varakh@varakh.de>
Date: Tue, 15 May 2018 21:51:24 +0200
Subject: [PATCH] Dont send password via mail, rename nickname to username
 again

---
 data/locale/messages.en.yml                | 5 ++---
 src/Control/Actions/VerificationAction.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/locale/messages.en.yml b/data/locale/messages.en.yml
index 14d899d..07de6b6 100644
--- a/data/locale/messages.en.yml
+++ b/data/locale/messages.en.yml
@@ -11,8 +11,8 @@ sign.up.flash.already_in_use_email_and_username: "%username%/%email% is already
 sign.up.flash.already_in_use_email: "%email% is already in use."
 sign.up.flash.already_in_use_username: "%username% is already in use."
 sign.up.form.button: Sign up
-sign.up.form.username: Nickname:
-sign.up.form.username.placeholder: nickname
+sign.up.form.username: Username:
+sign.up.form.username.placeholder: username
 sign.up.form.email: Email (only used for one time email verification, not persisted further):
 sign.up.form.email.placeholder: xyz@domain.tld
 sign.up.form.password: Password:
@@ -52,7 +52,6 @@ verification.mail.success.subject: "%server%: jabber account information"
 verification.mail.success.body: |
   Hello %username%,
   you've verified your email address successfully and your jabber account on %server% has been created.
-  Your password is "%password%".
   If you wish to delete your account, use %deleteCode% on the website.
   Keep this mail safe!
 verification.mail.success.notify.subject: "%server%: user verified their account"
diff --git a/src/Control/Actions/VerificationAction.php b/src/Control/Actions/VerificationAction.php
index d0adf73..10cde40 100644
--- a/src/Control/Actions/VerificationAction.php
+++ b/src/Control/Actions/VerificationAction.php
@@ -90,7 +90,7 @@ final class VerificationAction
             $mailer->FromName = getenv('mail_from_name');
             $mailer->addAddress($userAwaiting->email);
             $mailer->Subject = $this->translator->trans('verification.mail.success.subject', ['%server%' => getenv('site_xmpp_server_displayname')]);
-            $mailer->Body = $this->translator->trans('verification.mail.success.body', ['%username%' => $userAwaiting->username, '%server%' => getenv('site_xmpp_server_displayname'), '%password%' => $userAwaiting->password, '%deleteCode%' => $userRegistered->delete_code]);
+            $mailer->Body = $this->translator->trans('verification.mail.success.body', ['%username%' => $userAwaiting->username, '%server%' => getenv('site_xmpp_server_displayname'), '%deleteCode%' => $userRegistered->delete_code]);
             $mailer->send();
 
             $userAwaiting->delete();