IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed final mails for #461

Browse Source
This commit is contained in:
James Cole 2016-12-13 20:51:10 +01:00
parent 0335a64a21
commit 947e82fa0f
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Handlers/Events/UserEventHandler.php
View File

@ -90,6 +90,7 @@ class UserEventHandler
public function reportBadLogin(BlockedBadLogin $event) public function reportBadLogin(BlockedBadLogin $event)
{ {
$email = $event->email; $email = $event->email;
$owner = env('SITE_OWNER');
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
/** @var Configuration $sendmail */ /** @var Configuration $sendmail */
$sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login')); $sendmail = FireflyConfig::get('mail_for_bad_login', config('firefly.configuration.mail_for_bad_login'));
@ -103,8 +104,8 @@ class UserEventHandler
try { try {
Mail::send( Mail::send(
['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress], ['emails.blocked-bad-creds-html', 'emails.blocked-bad-creds-text'], ['email' => $email, 'ip' => $ipAddress],
function (Message $message) use ($email) { function (Message $message) use ($owner) {
$message->to($email, $email)->subject('Blocked login attempt with bad credentials'); $message->to($owner, $owner)->subject('Blocked login attempt with bad credentials');
} }
); );
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
@ -122,6 +123,7 @@ class UserEventHandler
public function reportBlockedUser(BlockedUserLogin $event): bool public function reportBlockedUser(BlockedUserLogin $event): bool
{ {
$user = $event->user; $user = $event->user;
$owner = env('SITE_OWNER');
$email = $user->email; $email = $user->email;
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
/** @var Configuration $sendmail */ /** @var Configuration $sendmail */
@ -141,8 +143,8 @@ class UserEventHandler
'user_address' => $email, 'user_address' => $email,
'ip' => $ipAddress, 'ip' => $ipAddress,
'code' => $user->blocked_code, 'code' => $user->blocked_code,
], function (Message $message) use ($email, $user) { ], function (Message $message) use ($owner, $user) {
$message->to($email, $email)->subject('Blocked login attempt of blocked user'); $message->to($owner, $owner)->subject('Blocked login attempt of blocked user');
} }
); );
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
@ -160,6 +162,7 @@ class UserEventHandler
public function reportLockout(LockedOutUser $event): bool public function reportLockout(LockedOutUser $event): bool
{ {
$email = $event->email; $email = $event->email;
$owner = env('SITE_OWNER');
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
/** @var Configuration $sendmail */ /** @var Configuration $sendmail */
$sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout')); $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout'));
@ -172,8 +175,8 @@ class UserEventHandler
// send email message: // send email message:
try { try {
Mail::send( Mail::send(
['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($email) { ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($owner) {
$message->to($email, $email)->subject('User was locked out'); $message->to($owner, $owner)->subject('User was locked out');
} }
); );
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
@ -191,6 +194,7 @@ class UserEventHandler
public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool
{ {
$email = $event->email; $email = $event->email;
$owner = env('SITE_OWNER');
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
$parts = explode('@', $email); $parts = explode('@', $email);
/** @var Configuration $sendmail */ /** @var Configuration $sendmail */
@ -204,12 +208,13 @@ class UserEventHandler
// send email message: // send email message:
try { try {
Mail::send( Mail::send(
['emails.blocked-domain-html', 'emails.blocked-domain-text'], ['emails.blocked-registration-html', 'emails.blocked-registration-text'],
[ [
'user_address' => $email, 'email_address' => $email,
'ip' => $ipAddress, 'blocked_domain' => $parts[1],
], function (Message $message) use ($email) { 'ip' => $ipAddress,
$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 domain');
} }
); );
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
@ -227,6 +232,7 @@ class UserEventHandler
public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool
{ {
$email = $event->email; $email = $event->email;
$owner = env('SITE_OWNER');
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
/** @var Configuration $sendmail */ /** @var Configuration $sendmail */
$sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email')); $sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email'));
@ -243,8 +249,8 @@ class UserEventHandler
[ [
'user_address' => $email, 'user_address' => $email,
'ip' => $ipAddress, 'ip' => $ipAddress,
], function (Message $message) use ($email) { ], function (Message $message) use ($owner) {
$message->to($email, $email)->subject('Blocked registration attempt with blocked email address'); $message->to($owner, $owner)->subject('Blocked registration attempt with blocked email address');
} }
); );
} catch (Swift_TransportException $e) { } catch (Swift_TransportException $e) {
@ -357,7 +363,7 @@ class UserEventHandler
try { try {
Mail::send( Mail::send(
['emails.registered-html', 'emails.registered-text'], ['address' => $address, 'ip' => $ipAddress], function (Message $message) use ($email) { ['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) { } catch (Swift_TransportException $e) {

5
resources/views/emails/blocked-email-html.twig Normal file
View File

@ -0,0 +1,5 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Firefly III has just blocked a registration for email addres "{{ email_address }}". It was used before.
</p>
{% include 'emails.footer-html' %}

3
resources/views/emails/blocked-email-text.twig Normal file
View File

@ -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' %}