Replace reference.

This commit is contained in:
James Cole
2025-11-02 14:42:34 +01:00
parent 69b816d957
commit b49575db8b
3 changed files with 40 additions and 38 deletions

View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use Illuminate\Support\Facades\Log;
/** /**
* Class PiggyBankEventHandler * Class PiggyBankEventHandler
@@ -70,7 +71,7 @@ class PiggyBankEventHandler
->exists() ->exists()
; ;
if ($exists) { if ($exists) {
app('log')->warning('Already have event for this journal and piggy, will not create another.'); Log::warning('Already have event for this journal and piggy, will not create another.');
return; return;
} }

View File

@@ -47,7 +47,7 @@ class RuleHandler
if (false === $preference) { if (false === $preference) {
return; return;
} }
app('log')->debug('Now in ruleActionFailedOnArray'); Log::debug('Now in ruleActionFailedOnArray');
$journal = $event->journal; $journal = $event->journal;
$error = $event->error; $error = $event->error;
$user = $ruleAction->rule->user; $user = $ruleAction->rule->user;
@@ -76,7 +76,7 @@ class RuleHandler
if (false === $preference) { if (false === $preference) {
return; return;
} }
app('log')->debug('Now in ruleActionFailedOnObject'); Log::debug('Now in ruleActionFailedOnObject');
$journal = $event->journal; $journal = $event->journal;
$error = $event->error; $error = $event->error;
$user = $ruleAction->rule->user; $user = $ruleAction->rule->user;

View File

@@ -40,12 +40,13 @@ use FireflyIII\Notifications\Security\MFAManyFailedAttemptsNotification;
use FireflyIII\Notifications\Security\MFAUsedBackupCodeNotification; use FireflyIII\Notifications\Security\MFAUsedBackupCodeNotification;
use FireflyIII\Notifications\Security\NewBackupCodesNotification; use FireflyIII\Notifications\Security\NewBackupCodesNotification;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Facades\Log;
class MFAHandler class MFAHandler
{ {
public function sendBackupFewLeftMail(MFABackupFewLeft $event): void public function sendBackupFewLeftMail(MFABackupFewLeft $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
$count = $event->count; $count = $event->count;
@@ -55,23 +56,23 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
public function sendBackupNoLeftMail(MFABackupNoLeft $event): void public function sendBackupNoLeftMail(MFABackupNoLeft $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
@@ -80,23 +81,23 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
public function sendMFADisabledMail(DisabledMFA $event): void public function sendMFADisabledMail(DisabledMFA $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
@@ -105,23 +106,23 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
public function sendMFAEnabledMail(EnabledMFA $event): void public function sendMFAEnabledMail(EnabledMFA $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
@@ -130,23 +131,23 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
public function sendMFAFailedAttemptsMail(MFAManyFailedAttempts $event): void public function sendMFAFailedAttemptsMail(MFAManyFailedAttempts $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
$count = $event->count; $count = $event->count;
@@ -156,23 +157,23 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
public function sendNewMFABackupCodesMail(MFANewBackupCodes $event): void public function sendNewMFABackupCodesMail(MFANewBackupCodes $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
@@ -181,23 +182,23 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
public function sendUsedBackupCodeMail(MFAUsedBackupCode $event): void public function sendUsedBackupCodeMail(MFAUsedBackupCode $event): void
{ {
app('log')->debug(sprintf('Now in %s', __METHOD__)); Log::debug(sprintf('Now in %s', __METHOD__));
$user = $event->user; $user = $event->user;
@@ -206,17 +207,17 @@ class MFAHandler
} catch (Exception $e) { } catch (Exception $e) {
$message = $e->getMessage(); $message = $e->getMessage();
if (str_contains($message, 'Bcc')) { if (str_contains($message, 'Bcc')) {
app('log')->warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[Bcc] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
if (str_contains($message, 'RFC 2822')) { if (str_contains($message, 'RFC 2822')) {
app('log')->warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.'); Log::warning('[RFC] Could not send notification. Please validate your email settings, use the .env.example file as a guide.');
return; return;
} }
app('log')->error($e->getMessage()); Log::error($e->getMessage());
app('log')->error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
} }
} }