From 85bde79fd180ce8d14a6724c71bf666420dfffc9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 2 Jan 2024 07:08:15 +0100 Subject: [PATCH] Fix issue validating budget amounts. --- .../Controllers/Account/CreateController.php | 1 - app/Http/Controllers/Account/EditController.php | 1 - app/Http/Controllers/Bill/CreateController.php | 1 - app/Http/Controllers/Bill/EditController.php | 1 - .../Controllers/Budget/CreateController.php | 1 - app/Http/Controllers/Budget/EditController.php | 1 - .../Controllers/Category/CreateController.php | 1 - .../Controllers/Category/EditController.php | 1 - app/Http/Controllers/Controller.php | 17 ----------------- .../Controllers/PiggyBank/CreateController.php | 1 - .../Controllers/PiggyBank/EditController.php | 1 - .../Controllers/Recurring/CreateController.php | 1 - .../Controllers/Recurring/EditController.php | 1 - app/Http/Controllers/TagController.php | 2 -- .../AutoBudget/ValidatesAutoBudgetRequest.php | 6 +++++- 15 files changed, 5 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 41fadc8e30..5e06f5aa29 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -157,7 +157,6 @@ class CreateController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index f04729e108..91f1e6715c 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -182,7 +182,6 @@ class EditController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string) trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php index 5402231636..443d3eb444 100644 --- a/app/Http/Controllers/Bill/CreateController.php +++ b/app/Http/Controllers/Bill/CreateController.php @@ -117,7 +117,6 @@ class CreateController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php index 78155a9367..821d54fde9 100644 --- a/app/Http/Controllers/Bill/EditController.php +++ b/app/Http/Controllers/Bill/EditController.php @@ -129,7 +129,6 @@ class EditController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string) trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 151dea0ddf..68b3847b62 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -128,7 +128,6 @@ class CreateController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index 9588688691..ec0fe37d26 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -138,7 +138,6 @@ class EditController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php index 638d751aee..e7115c063b 100644 --- a/app/Http/Controllers/Category/CreateController.php +++ b/app/Http/Controllers/Category/CreateController.php @@ -101,7 +101,6 @@ class CreateController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php index 70b054d228..265ee53095 100644 --- a/app/Http/Controllers/Category/EditController.php +++ b/app/Http/Controllers/Category/EditController.php @@ -105,7 +105,6 @@ class EditController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 0367f849b1..e5c7056abc 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -121,21 +121,4 @@ abstract class Controller extends BaseController } ); } - - final protected function auditLogAttachmentInfo(?array $files): void - { - if (null === $files) { - Log::channel('audit')->info('No files found'); - - return; - } - - /** - * @var int $index - * @var UploadedFile $file - */ - foreach ($files as $index => $file) { - Log::channel('audit')->info(sprintf('File [%d/%d] upload attachment "%s", mime is: "%s".', $index + 1, count($files), $file->getClientOriginalName(), $file->getMimeType())); - } - } } diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index f6dc6534cf..55d1a8acfe 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -108,7 +108,6 @@ class CreateController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index 9cfee639cc..61e729d64c 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -128,7 +128,6 @@ class EditController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index f546197e92..759669936c 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -243,7 +243,6 @@ class CreateController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index a808d432a2..676d8f206b 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -181,7 +181,6 @@ class EditController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index dbff364173..0b6a39b884 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -306,7 +306,6 @@ class TagController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } @@ -342,7 +341,6 @@ class TagController extends Controller } if (null !== $files && auth()->user()->hasRole('demo')) { Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__)); - $this->auditLogAttachmentInfo($files); session()->flash('info', (string)trans('firefly.no_att_demo_user')); } diff --git a/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php b/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php index 146f25cf1b..4c159d9f93 100644 --- a/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php +++ b/app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php @@ -47,8 +47,12 @@ trait ValidatesAutoBudgetRequest if ('' === $type || 0 === $type) { return; } + // TODO should be present at more places, stop scientific notification + if (str_contains(strtoupper($amount), 'E')) { + $amount = ''; + } // basic float check: - if (!is_numeric($amount)) { + if (!is_numeric($amount) || '' === $amount) { $validator->errors()->add('auto_budget_amount', (string) trans('validation.amount_required_for_auto_budget')); return;