From 947e82fa0fffcf05593e618773c7b2864f6cf61f Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 13 Dec 2016 20:51:10 +0100 Subject: [PATCH] Fixed final mails for #461 --- app/Handlers/Events/UserEventHandler.php | 34 +++++++++++-------- .../views/emails/blocked-email-html.twig | 5 +++ .../views/emails/blocked-email-text.twig | 3 ++ 3 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 resources/views/emails/blocked-email-html.twig create mode 100644 resources/views/emails/blocked-email-text.twig diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 502add60c4..0481dd516f 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -90,6 +90,7 @@ class UserEventHandler public function reportBadLogin(BlockedBadLogin $event) { $email = $event->email; + $owner = env('SITE_OWNER'); $ipAddress = $event->ipAddress; /** @var Configuration $sendmail */ $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login')); @@ -103,8 +104,8 @@ class UserEventHandler try { Mail::send( ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress], - function (Message $message) use ($email) { - $message->to($email, $email)->subject('Blocked login attempt with bad credentials'); + function (Message $message) use ($owner) { + $message->to($owner, $owner)->subject('Blocked login attempt with bad credentials'); } ); } catch (Swift_TransportException $e) { @@ -122,6 +123,7 @@ class UserEventHandler public function reportBlockedUser(BlockedUserLogin $event): bool { $user = $event->user; + $owner = env('SITE_OWNER'); $email = $user->email; $ipAddress = $event->ipAddress; /** @var Configuration $sendmail */ @@ -141,8 +143,8 @@ class UserEventHandler 'user_address' => $email, 'ip' => $ipAddress, 'code' => $user->blocked_code, - ], function (Message $message) use ($email, $user) { - $message->to($email, $email)->subject('Blocked login attempt of blocked user'); + ], function (Message $message) use ($owner, $user) { + $message->to($owner, $owner)->subject('Blocked login attempt of blocked user'); } ); } catch (Swift_TransportException $e) { @@ -160,6 +162,7 @@ class UserEventHandler public function reportLockout(LockedOutUser $event): bool { $email = $event->email; + $owner = env('SITE_OWNER'); $ipAddress = $event->ipAddress; /** @var Configuration $sendmail */ $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout')); @@ -172,8 +175,8 @@ class UserEventHandler // send email message: try { Mail::send( - ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($email) { - $message->to($email, $email)->subject('User was locked out'); + ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($owner) { + $message->to($owner, $owner)->subject('User was locked out'); } ); } catch (Swift_TransportException $e) { @@ -191,6 +194,7 @@ class UserEventHandler public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool { $email = $event->email; + $owner = env('SITE_OWNER'); $ipAddress = $event->ipAddress; $parts = explode('@', $email); /** @var Configuration $sendmail */ @@ -204,12 +208,13 @@ class UserEventHandler // send email message: try { Mail::send( - ['emails.blocked-domain-html', 'emails.blocked-domain-text'], + ['emails.blocked-registration-html', 'emails.blocked-registration-text'], [ - 'user_address' => $email, - 'ip' => $ipAddress, - ], function (Message $message) use ($email) { - $message->to($email, $email)->subject('Blocked registration attempt with blocked email address'); + 'email_address' => $email, + 'blocked_domain' => $parts[1], + 'ip' => $ipAddress, + ], function (Message $message) use ($owner) { + $message->to($owner, $owner)->subject('Blocked registration attempt with blocked domain'); } ); } catch (Swift_TransportException $e) { @@ -227,6 +232,7 @@ class UserEventHandler public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool { $email = $event->email; + $owner = env('SITE_OWNER'); $ipAddress = $event->ipAddress; /** @var Configuration $sendmail */ $sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email')); @@ -243,8 +249,8 @@ class UserEventHandler [ 'user_address' => $email, 'ip' => $ipAddress, - ], function (Message $message) use ($email) { - $message->to($email, $email)->subject('Blocked registration attempt with blocked email address'); + ], function (Message $message) use ($owner) { + $message->to($owner, $owner)->subject('Blocked registration attempt with blocked email address'); } ); } catch (Swift_TransportException $e) { @@ -357,7 +363,7 @@ class UserEventHandler try { Mail::send( ['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) { - $message->to($email, $email)->subject('Welcome to Firefly III! '); + $message->to($email, $email)->subject('Welcome to Firefly III!'); } ); } catch (Swift_TransportException $e) { diff --git a/resources/views/emails/blocked-email-html.twig b/resources/views/emails/blocked-email-html.twig new file mode 100644 index 0000000000..a7f67fdd0a --- /dev/null +++ b/resources/views/emails/blocked-email-html.twig @@ -0,0 +1,5 @@ +{% include 'emails.header-html' %} +

+ Firefly III has just blocked a registration for email addres "{{ email_address }}". It was used before. +

+{% include 'emails.footer-html' %} diff --git a/resources/views/emails/blocked-email-text.twig b/resources/views/emails/blocked-email-text.twig new file mode 100644 index 0000000000..7bfdf9c032 --- /dev/null +++ b/resources/views/emails/blocked-email-text.twig @@ -0,0 +1,3 @@ +{% include 'emails.header-text' %} +Firefly III has just blocked a registration for email addres "{{ user_address }}". It was used before. +{% include 'emails.footer-text' %}