kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole
2020-11-04 19:06:18 +01:00
parent 5b70f70aa7 80ef6fcb04
commit ebd9b30f55
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Handlers/Events/APIEventHandler.php
View File

@@ -52,6 +52,12 @@ class APIEventHandler
$user = $repository->findNull((int) $event->userId); $user = $repository->findNull((int) $event->userId);
if (null !== $user) { if (null !== $user) {
$email = $user->email; $email = $user->email;
// if user is demo user, send to owner:
if($user->hasRole('demo')) {
$email = config('firefly.site_owner');
}
$ipAddress = Request::ip(); $ipAddress = Request::ip();
// see if user has alternative email address: // see if user has alternative email address:

5
app/Handlers/Events/AdminEventHandler.php
View File

@@ -52,6 +52,11 @@ class AdminEventHandler
$email = $event->user->email; $email = $event->user->email;
$ipAddress = $event->ipAddress; $ipAddress = $event->ipAddress;
// if user is demo user, send to owner:
if($event->user->hasRole('demo')) {
$email = config('firefly.site_owner');
}
// see if user has alternative email address: // see if user has alternative email address:
$pref = app('preferences')->getForUser($event->user, 'remote_guard_alt_email', null); $pref = app('preferences')->getForUser($event->user, 'remote_guard_alt_email', null);
if (null !== $pref) { if (null !== $pref) {

4
app/Handlers/Events/AutomationHandler.php
View File

@@ -65,6 +65,10 @@ class AutomationHandler
$email = $pref->data; $email = $pref->data;
} }
// if user is demo user, send to owner:
if($user->hasRole('demo')) {
$email = config('firefly.site_owner');
}
try { try {
Log::debug('Trying to mail...'); Log::debug('Trying to mail...');