mirror of
https://github.com/anope/anope.git
synced 2026-06-28 13:56:39 +02:00
SendConfirmMail: Replace %E with new email
The old mailer message said the user is changing email "to %e", which is changing TO the OLD email. But instead, the user is actually changing the email to the new email. We could change %e to be the new email, but maybe some users of Anope have already configured their messages to assume %e is the old email. So instead, add a new %E that is replaced with the new email.
This commit is contained in:
+1
-1
@@ -1018,7 +1018,7 @@ mail
|
||||
emailchange_subject = "Email confirmation"
|
||||
emailchange_message = "Hi,
|
||||
|
||||
You have requested to change your email address to %e.
|
||||
You have requested to change your email address from %e to %E.
|
||||
Please type \" /msg NickServ CONFIRM %c \" to confirm this change.
|
||||
|
||||
If you don't know why this mail was sent to you, please ignore it silently.
|
||||
|
||||
@@ -414,10 +414,12 @@ class CommandNSSetEmail : public Command
|
||||
message = Config->GetBlock("mail")->Get<const Anope::string>("emailchange_message");
|
||||
|
||||
subject = subject.replace_all_cs("%e", u->Account()->email);
|
||||
subject = subject.replace_all_cs("%E", new_email);
|
||||
subject = subject.replace_all_cs("%N", Config->GetBlock("networkinfo")->Get<const Anope::string>("networkname"));
|
||||
subject = subject.replace_all_cs("%c", code);
|
||||
|
||||
message = message.replace_all_cs("%e", u->Account()->email);
|
||||
message = message.replace_all_cs("%E", new_email);
|
||||
message = message.replace_all_cs("%N", Config->GetBlock("networkinfo")->Get<const Anope::string>("networkname"));
|
||||
message = message.replace_all_cs("%c", code);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user