kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix #5961

Browse Source
This commit is contained in:
James Cole
2022-04-04 05:40:29 +02:00
parent b8f2f0a73f
commit e854c1b8ae
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Events/RegisteredUser.php
View File

@@ -36,20 +36,14 @@ class RegisteredUser extends Event
{ {
use SerializesModels; use SerializesModels;
/** @var string The users IP address */ public User $user;
public $ipAddress;
/** @var User The user */
public $user;
/** /**
* Create a new event instance. This event is triggered when a new user registers. * Create a new event instance. This event is triggered when a new user registers.
* * @param User $user
* @param User $user
* @param string $ipAddress
*/ */
public function __construct(User $user, string $ipAddress) public function __construct(User $user)
{ {
$this->user = $user; $this->user = $user;
$this->ipAddress = $ipAddress;
} }
} }

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

@@ -309,7 +309,6 @@ class UserEventHandler
// get the email address // get the email address
$email = $event->user->email; $email = $event->user->email;
$uri = route('index'); $uri = route('index');
$ipAddress = $event->ipAddress;
// see if user has alternative email address: // see if user has alternative email address:
$pref = app('preferences')->getForUser($event->user, 'remote_guard_alt_email'); $pref = app('preferences')->getForUser($event->user, 'remote_guard_alt_email');
@@ -319,7 +318,7 @@ class UserEventHandler
// send email. // send email.
try { try {
Mail::to($email)->send(new RegisteredUserMail($uri, $ipAddress)); Mail::to($email)->send(new RegisteredUserMail($uri));
} catch (Exception $e) { // @phpstan-ignore-line } catch (Exception $e) { // @phpstan-ignore-line
Log::error($e->getMessage()); Log::error($e->getMessage());