Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix variables
James Cole0524afaf9316
diff --git a/app/Api/V1/Controllers/Models/Budget/ListController.php b/app/Api/V1/Controllers/Models/Budget/ListController.phpindex 9505ff4ea2..8182e94924 100644--- a/app/Api/V1/Controllers/Models/Budget/ListController.php+++ b/app/Api/V1/Controllers/Models/Budget/ListController.php@@ -137,7 +137,7 @@ final class ListController extends Controller{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));@@ -197,7 +197,7 @@ final class ListController extends Controller{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.phpindex f5ebeb7ee0..b5aa78ba74 100644--- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php+++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php@@ -52,7 +52,7 @@ final class ListController extends Controllerpublic function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/Category/ListController.php b/app/Api/V1/Controllers/Models/Category/ListController.phpindex 384e5ea013..13752ccaf0 100644--- a/app/Api/V1/Controllers/Models/Category/ListController.php+++ b/app/Api/V1/Controllers/Models/Category/ListController.php@@ -98,7 +98,7 @@ final class ListController extends Controllerpublic function transactions(Request $request, Category $category): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/Recurrence/ListController.php b/app/Api/V1/Controllers/Models/Recurrence/ListController.phpindex db7599498e..151019fae6 100644--- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php+++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php@@ -69,7 +69,7 @@ final class ListController extends Controllerpublic function transactions(Request $request, Recurrence $recurrence): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/Tag/ListController.php b/app/Api/V1/Controllers/Models/Tag/ListController.phpindex d729601f06..fb3b8c98df 100644--- a/app/Api/V1/Controllers/Models/Tag/ListController.php+++ b/app/Api/V1/Controllers/Models/Tag/ListController.php@@ -101,7 +101,7 @@ final class ListController extends Controllerpublic function transactions(Request $request, Tag $tag): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/Transaction/ShowController.php b/app/Api/V1/Controllers/Models/Transaction/ShowController.phpindex dd7c84ee64..cd96be0605 100644--- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php+++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php@@ -55,7 +55,7 @@ final class ShowController extends Controllerpublic function index(Request $request): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.phpindex 8d67a2bced..92dddd2ca5 100644--- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php+++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php@@ -76,7 +76,7 @@ final class ListController extends Controller$manager = $this->getManager();// read type from URL- $type = $request->get('type') ?? 'all';+ $type = $request->input('type') ?? 'all';$this->parameters->set('type', $type);// types to get, page size:@@ -343,7 +343,7 @@ final class ListController extends Controllerpublic function transactions(Request $request, TransactionCurrency $currency): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.phpindex 792e073b64..1d2fdafb25 100644--- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php+++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php@@ -72,7 +72,7 @@ final class ShowController extends Controller// create some objects:$manager = $this->getManager();// read type from URL- $name = $request->get('name');+ $name = $request->input('name');// types to get, page size:$pageSize = $this->parameters->get('limit');diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.phpindex ef6d5abc34..93809f73bb 100644--- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php+++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php@@ -69,7 +69,7 @@ final class ListController extends Controllerpublic function transactions(Request $request, LinkType $linkType): JsonResponse{$pageSize = $this->parameters->get('limit');- $type = $request->get('type') ?? 'default';+ $type = $request->input('type') ?? 'default';$this->parameters->set('type', $type);$types = $this->mapTransactionTypes($this->parameters->get('type'));diff --git a/app/Api/V1/Controllers/Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.phpindex 4ece03c429..a3b1370b90 100644--- a/app/Api/V1/Controllers/Search/AccountController.php+++ b/app/Api/V1/Controllers/Search/AccountController.php@@ -60,9 +60,9 @@ final class AccountController extends Controllerpublic function search(Request $request): JsonResponse|Response{$manager = $this->getManager();- $query = trim((string) $request->get('query'));- $field = trim((string) $request->get('field'));- $type = $request->get('type') ?? 'all';+ $query = trim((string) $request->input('query'));+ $field = trim((string) $request->input('field'));+ $type = $request->input('type') ?? 'all';if ('' === $query || !in_array($field, $this->validFields, strict: true)) {return response(null, 422);}diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.phpindex bec9400bec..fe7fc48898 100644--- a/app/Http/Controllers/Account/CreateController.php+++ b/app/Http/Controllers/Account/CreateController.php@@ -161,7 +161,7 @@ final class CreateController extends Controller// redirect to previous URL.$redirect = redirect($this->getPreviousUrl('accounts.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {// set value so create routine will not overwrite URL:$request->session()->put('accounts.create.fromStore', true);diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.phpindex 7250456812..5e13b797d6 100644--- a/app/Http/Controllers/Account/DeleteController.php+++ b/app/Http/Controllers/Account/DeleteController.php@@ -95,7 +95,7 @@ final class DeleteController extends Controller$type = $account->accountType->type;$typeName = config(sprintf('firefly.shortNamesByFullName.%s', $type));$name = $account->name;- $moveTo = $this->repository->find((int) $request->get('move_account_before_delete'));+ $moveTo = $this->repository->find((int) $request->input('move_account_before_delete'));$this->repository->destroy($account, $moveTo);diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.phpindex 9345db5dfc..04feabe670 100644--- a/app/Http/Controllers/Account/EditController.php+++ b/app/Http/Controllers/Account/EditController.php@@ -213,7 +213,7 @@ final class EditController extends Controller// redirect$redirect = redirect($this->getPreviousUrl('accounts.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {// set value so edit routine will not overwrite URL:$request->session()->put('accounts.edit.fromUpdate', true);diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex 4efe3eee2f..cc50471ef0 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -79,7 +79,8 @@ final class IndexController extends Controller$types = config(sprintf('firefly.accountTypesByIdentifier.%s', $objectType));$collection = $this->repository->getInactiveAccountsByType($types);$total = $collection->count();- $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);$inactiveCount = $this->repository->getInactiveAccountsByType($types)->count();@@ -145,7 +146,8 @@ final class IndexController extends Controller$collection = $this->repository->getActiveAccountsByType($types);$total = $collection->count();- $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);$inactiveCount = $this->repository->getInactiveAccountsByType($types)->count();diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.phpindex 2d926cbd9d..fa04aee5c8 100644--- a/app/Http/Controllers/Account/ShowController.php+++ b/app/Http/Controllers/Account/ShowController.php@@ -214,7 +214,8 @@ final class ShowController extends Controller$this->repository->getAccountCurrency($account);$start = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth();$subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type);- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$currency = $this->repository->getAccountCurrency($account) ?? $this->primaryCurrency;$subTitle = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]);diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.phpindex 34b2a278c4..2bafa6e09c 100644--- a/app/Http/Controllers/Admin/LinkController.php+++ b/app/Http/Controllers/Admin/LinkController.php@@ -120,7 +120,7 @@ final class LinkController extends Controller{Log::channel('audit')->info(sprintf('User destroyed link type #%d', $linkType->id));$name = $linkType->name;- $moveTo = $this->repository->find((int) $request->get('move_link_type_before_delete'));+ $moveTo = $this->repository->find((int) $request->input('move_link_type_before_delete'));$this->repository->destroy($linkType, $moveTo);$request->session()->flash('success', (string) trans('firefly.deleted_link_type', ['name' => $name]));@@ -213,7 +213,7 @@ final class LinkController extends Controller$request->session()->flash('success', (string) trans('firefly.stored_new_link_type', ['name' => $linkType->name]));$redirect = redirect($this->getPreviousUrl('link-types.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {// set value so create routine will not overwrite URL:$request->session()->put('link-types.create.fromStore', true);@@ -245,7 +245,7 @@ final class LinkController extends Controller$request->session()->flash('success', (string) trans('firefly.updated_link_type', ['name' => $linkType->name]));Preferences::mark();$redirect = redirect($this->getPreviousUrl('link-types.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {// set value so edit routine will not overwrite URL:$request->session()->put('link-types.edit.fromUpdate', true);diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.phpindex 65f6375b5e..acc8249ab0 100644--- a/app/Http/Controllers/Admin/UpdateController.php+++ b/app/Http/Controllers/Admin/UpdateController.php@@ -95,8 +95,8 @@ final class UpdateController extends Controller*/public function post(Request $request): RedirectResponse{- $checkForUpdates = (int) $request->get('check_for_updates');- $channel = $request->get('update_channel');+ $checkForUpdates = (int) $request->input('check_for_updates');+ $channel = $request->input('update_channel');$channel = in_array($channel, ['stable', 'beta', 'alpha'], true) ? $channel : 'stable';AppConfiguration::set('permission_update_check', $checkForUpdates);diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.phpindex 601fa62333..4200d93089 100644--- a/app/Http/Controllers/Admin/UserController.php+++ b/app/Http/Controllers/Admin/UserController.php@@ -193,7 +193,7 @@ final class UserController extends Controllerpublic function invite(InviteUserFormRequest $request): RedirectResponse{- $address = (string) $request->get('invited_user');+ $address = (string) $request->input('invited_user');$invitee = $this->repository->inviteUser(auth()->user(), $address);session()->flash('info', trans('firefly.user_is_invited', ['address' => $address]));@@ -256,7 +256,7 @@ final class UserController extends Controllersession()->flash('success', (string) trans('firefly.updated_user', ['email' => $user->email]));Preferences::mark();$redirect = redirect($this->getPreviousUrl('users.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {session()->put('users.edit.fromUpdate', true);$redirect = redirect(route('settings.users.edit', [$user->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.phpindex bd1e9fce6e..de7506534f 100644--- a/app/Http/Controllers/AttachmentController.php+++ b/app/Http/Controllers/AttachmentController.php@@ -172,7 +172,7 @@ final class AttachmentController extends ControllerPreferences::mark();$redirect = redirect($this->getPreviousUrl('attachments.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {$request->session()->put('attachments.edit.fromUpdate', true);$redirect = redirect(route('attachments.edit', [$attachment->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.phpindex 566c1e35be..c5537830fe 100644--- a/app/Http/Controllers/Auth/ForgotPasswordController.php+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php@@ -84,7 +84,7 @@ final class ForgotPasswordController extends Controller// verify if the user is not a demo user. If so, we give him back an error./** @var null|User $user */- $user = User::query()->where('email', $request->get('email'))->first();+ $user = User::query()->where('email', $request->input('email'))->first();if (null !== $user && $repository->hasRole($user, 'demo')) {return back()->withErrors(['email' => (string) trans('firefly.cannot_reset_demo_user')]);diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.phpindex 3241e87126..5c6b65d5b4 100644--- a/app/Http/Controllers/Auth/LoginController.php+++ b/app/Http/Controllers/Auth/LoginController.php@@ -97,8 +97,8 @@ final class LoginController extends Controller// the login attempts for this application. We'll key this by the username and// the IP address of the client making these requests into this application.if ($this->hasTooManyLoginAttempts($request)) {- Log::channel('audit')->warning(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));- Log::error(sprintf('Login for user "%s" was locked out.', $request->get($this->username())));+ Log::channel('audit')->warning(sprintf('Login for user "%s" was locked out.', $request->input($this->username())));+ Log::error(sprintf('Login for user "%s" was locked out.', $request->input($this->username())));$this->fireLockoutEvent($request);$seconds = $this->limiter()->availableIn($this->throttleKey($request));$message = (string) trans('auth.throttle', ['seconds' => $seconds, 'minutes' => ceil($seconds / 60)]);@@ -120,7 +120,7 @@ final class LoginController extends Controller// Copied directly from AuthenticatesUsers, but with logging added:if ($this->attemptLogin($request)) {- Log::channel('audit')->info(sprintf('User "%s" has been logged in.', $request->get($this->username())));+ Log::channel('audit')->info(sprintf('User "%s" has been logged in.', $request->input($this->username())));Log::debug(sprintf('Redirect after login is %s.', $this->redirectPath()));// if you just logged in, it can't be that you have a valid 2FA cookie.@@ -132,7 +132,7 @@ final class LoginController extends Controllerreturn $this->sendLoginResponse($request);}Log::warning('Login attempt failed.');- $username = (string) $request->get($this->username());+ $username = (string) $request->input($this->username());$user = $this->repository->findByEmail($username);if (!$user instanceof User) {// send event to owner.@@ -147,7 +147,7 @@ final class LoginController extends Controller// to log in and redirect the user back to the login form. Of course, when this// user surpasses their maximum number of attempts they will get locked out.$this->incrementLoginAttempts($request);- Log::channel('audit')->warning(sprintf('Login failed. Attempt for user "%s" failed.', $request->get($this->username())));+ Log::channel('audit')->warning(sprintf('Login failed. Attempt for user "%s" failed.', $request->input($this->username())));$this->sendFailedLoginResponse($request);diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.phpindex fcec5665ab..dd31946abd 100644--- a/app/Http/Controllers/Auth/RegisterController.php+++ b/app/Http/Controllers/Auth/RegisterController.php@@ -75,7 +75,7 @@ final class RegisterController extends Controllerpublic function register(Request $request): RedirectResponse{$allowRegistration = $this->allowedToRegister();- $inviteCode = (string) $request->get('invite_code');+ $inviteCode = (string) $request->input('invite_code');$repository = app(UserRepositoryInterface::class);$validCode = $repository->validateInviteCode($inviteCode);diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.phpindex 9da470e811..b39337c994 100644--- a/app/Http/Controllers/Auth/TwoFactorController.php+++ b/app/Http/Controllers/Auth/TwoFactorController.php@@ -66,7 +66,7 @@ final class TwoFactorController extends Controller{/** @var array $mfaHistory */$mfaHistory = Preferences::get('mfa_history', [])->data;- $mfaCode = (string) $request->get('one_time_password');+ $mfaCode = (string) $request->input('one_time_password');// is in history? then refuse to use it.if ($this->inMFAHistory($mfaCode, $mfaHistory)) {diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.phpindex 94d719d06b..dc8e568571 100644--- a/app/Http/Controllers/Bill/EditController.php+++ b/app/Http/Controllers/Bill/EditController.php@@ -134,7 +134,7 @@ final class EditController extends Controller}$redirect = redirect($this->getPreviousUrl('bills.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {$request->session()->put('bills.edit.fromUpdate', true);$redirect = redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.phpindex 2009369ae0..b1fd70231a 100644--- a/app/Http/Controllers/Bill/IndexController.php+++ b/app/Http/Controllers/Bill/IndexController.php@@ -152,8 +152,8 @@ final class IndexController extends Controller*/public function setOrder(Request $request, Bill $bill): JsonResponse{- $objectGroupTitle = (string) $request->get('objectGroupTitle');- $newOrder = (int) $request->get('order');+ $objectGroupTitle = (string) $request->input('objectGroupTitle');+ $newOrder = (int) $request->input('order');$this->repository->setOrder($bill, $newOrder);if ('' !== $objectGroupTitle) {$this->repository->setObjectGroup($bill, $objectGroupTitle);diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.phpindex d4c8ba8a0f..e18b0fe316 100644--- a/app/Http/Controllers/Bill/ShowController.php+++ b/app/Http/Controllers/Bill/ShowController.php@@ -129,7 +129,8 @@ final class ShowController extends Controller/** @var Carbon $end */$end = session('end');$year = $start->year;- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$yearAverage = $this->repository->getYearAverage($bill, $start);$overallAverage = $this->repository->getOverallAverage($bill);diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex 9632996690..ed36a6f3a2 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -151,7 +151,7 @@ final class BudgetLimitController extends Controllerreturn response()->json();}- $amount = (string) $request->get('amount');+ $amount = (string) $request->input('amount');$start->startOfDay();$end->startOfDay();@@ -184,15 +184,15 @@ final class BudgetLimitController extends Controller}if (!$limit instanceof BudgetLimit) {$limit = $this->blRepository->store([- 'budget_id' => $request->get('budget_id'),- 'currency_id' => (int) $request->get('transaction_currency_id'),+ 'budget_id' => $request->input('budget_id'),+ 'currency_id' => (int) $request->input('transaction_currency_id'),'start_date' => $start,'end_date' => $end,'amount' => $amount,]);}// parse notes, if any.- $notes = (string) $request->get('notes');+ $notes = (string) $request->input('notes');$this->blRepository->setNoteText($limit, $notes);if ($request->expectsJson()) {@@ -222,7 +222,7 @@ final class BudgetLimitController extends Controllerpublic function update(Request $request, BudgetLimit $budgetLimit): JsonResponse|RedirectResponse{- $amount = (string) $request->get('amount');+ $amount = (string) $request->input('amount');if ('' === $amount) {$amount = '0';}@@ -247,7 +247,7 @@ final class BudgetLimitController extends Controllerif (-1 === bccomp($amount, '0')) {$amount = bcmul($amount, '-1');}- $notes = (string) $request->get('notes');+ $notes = (string) $request->input('notes');if (strlen($notes) > 32_768) {$notes = substr($notes, 0, 32_768);}@@ -281,7 +281,7 @@ final class BudgetLimitController extends Controller// left per day formatted.$array['amount'] = Steam::bcround($limit['amount'], $limit->transactionCurrency->decimal_places);$array['left_per_day_formatted'] = Amount::formatAnything($limit->transactionCurrency, $array['left_per_day']);- if ('true' === $request->get('redirect')) {+ if ('true' === $request->input('redirect')) {return redirect(route('budgets.index'));}diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.phpindex 21194aeea5..54ed922262 100644--- a/app/Http/Controllers/Budget/CreateController.php+++ b/app/Http/Controllers/Budget/CreateController.php@@ -136,7 +136,7 @@ final class CreateController extends Controller$redirect = redirect($this->getPreviousUrl('budgets.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {$request->session()->put('budgets.create.fromStore', true);$redirect = redirect(route('budgets.create'))->withInput();diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.phpindex 89e38dd9e0..e95fcb466e 100644--- a/app/Http/Controllers/Budget/EditController.php+++ b/app/Http/Controllers/Budget/EditController.php@@ -153,7 +153,7 @@ final class EditController extends Controller$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));}- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {$request->session()->put('budgets.edit.fromUpdate', true);$redirect = redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.phpindex 507187db73..215ebbd484 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -165,7 +165,7 @@ final class IndexController extends Controllerpublic function reorder(Request $request, BudgetRepositoryInterface $repository): JsonResponse{$this->abRepository->cleanup();- $budgetIds = $request->get('budgetIds');+ $budgetIds = $request->input('budgetIds');foreach ($budgetIds as $index => $budgetId) {$budgetId = (int) $budgetId;diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.phpindex 69214929e1..bda5f31e0c 100644--- a/app/Http/Controllers/Budget/ShowController.php+++ b/app/Http/Controllers/Budget/ShowController.php@@ -96,7 +96,8 @@ final class ShowController extends Controller$first = $this->journalRepos->firstNull();$firstDate = $first instanceof TransactionJournal ? $first->date : $start;$periods = $this->getNoModelPeriodOverview('budget', $firstDate, $end);- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;/** @var GroupCollectorInterface $collector */@@ -130,7 +131,8 @@ final class ShowController extends Controller$first = $this->journalRepos->firstNull();$start = $first instanceof TransactionJournal ? $first->date : new Carbon();$end = today(config('app.timezone'));- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;/** @var GroupCollectorInterface $collector */@@ -163,7 +165,8 @@ final class ShowController extends Controller/** @var Carbon $allStart */$allStart = session('first', today(config('app.timezone'))->startOfYear());$allEnd = today();- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$limits = $this->getLimits($budget, $allStart, $allEnd);$repetition = null;@@ -212,7 +215,8 @@ final class ShowController extends Controller}$currencySymbol = $budgetLimit->transactionCurrency->symbol;- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$subTitle = trans('firefly.budget_in_period', ['name' => $budget->name,diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.phpindex c2ddbbef18..f2c629cd97 100644--- a/app/Http/Controllers/Category/CreateController.php+++ b/app/Http/Controllers/Category/CreateController.php@@ -108,7 +108,7 @@ final class CreateController extends Controller}$redirect = redirect(route('categories.index'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {$request->session()->put('categories.create.fromStore', true);$redirect = redirect(route('categories.create'))->withInput();diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.phpindex bfb4b25613..68e7b8092d 100644--- a/app/Http/Controllers/Category/EditController.php+++ b/app/Http/Controllers/Category/EditController.php@@ -108,7 +108,7 @@ final class EditController extends Controller}$redirect = redirect($this->getPreviousUrl('categories.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {$request->session()->put('categories.edit.fromUpdate', true);$redirect = redirect(route('categories.edit', [$category->id]));diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.phpindex 68aed69b1a..81392addd8 100644--- a/app/Http/Controllers/Category/IndexController.php+++ b/app/Http/Controllers/Category/IndexController.php@@ -70,7 +70,8 @@ final class IndexController extends Controller*/public function index(Request $request): Factory|\Illuminate\Contracts\View\View{- $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$collection = $this->repository->getCategories();$total = $collection->count();diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.phpindex 704c6cc545..87d5a22b84 100644--- a/app/Http/Controllers/Category/NoCategoryController.php+++ b/app/Http/Controllers/Category/NoCategoryController.php@@ -84,7 +84,8 @@ final class NoCategoryController extends Controller/** @var Carbon $start *//** @var Carbon $end */- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$subTitle = trans('firefly.without_category_between', ['start' => $start->isoFormat($this->monthAndDayFormat),@@ -133,7 +134,8 @@ final class NoCategoryController extends Controller$start = null;$end = null;$periods = new Collection();- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;Log::debug('Start of noCategory()');$subTitle = (string) trans('firefly.all_journals_without_category');diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.phpindex 284df55c65..45a893ab31 100644--- a/app/Http/Controllers/Category/ShowController.php+++ b/app/Http/Controllers/Category/ShowController.php@@ -83,7 +83,8 @@ final class ShowController extends Controller/** @var Carbon $start *//** @var Carbon $end */$subTitleIcon = 'fa-bookmark';- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$attachments = $this->repository->getAttachments($category);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$oldest = $this->repository->firstUseDate($category) ?? today(config('app.timezone'))->startOfYear();@@ -134,7 +135,8 @@ final class ShowController extends Controller{// default values:$subTitleIcon = 'fa-bookmark';- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$start = null;$end = null;diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.phpindex 8434c36503..e977087c5c 100644--- a/app/Http/Controllers/DebugController.php+++ b/app/Http/Controllers/DebugController.php@@ -176,7 +176,7 @@ final class DebugController extends Controller/** @var iterable $routes */$routes = Route::getRoutes();- if ('true' === $request->get('api')) {+ if ('true' === $request->input('api')) {$collection = [];$i = 0;diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.phpindex ebaf8b6e34..415cd5331a 100644--- a/app/Http/Controllers/HomeController.php+++ b/app/Http/Controllers/HomeController.php@@ -93,7 +93,7 @@ final class HomeController extends Controller$label = $request->input('label');$isCustomRange = false;- Log::debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]);+ Log::debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->input('label')]);// check if the label is "everything" or "Custom range" which will betray// a possible problem with the budgets.if ($label === (string) trans('firefly.everything') || $label === (string) trans('firefly.customRange')) {diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.phpindex fb1b33ff13..1c1804545d 100644--- a/app/Http/Controllers/JavascriptController.php+++ b/app/Http/Controllers/JavascriptController.php@@ -100,7 +100,7 @@ final class JavascriptController extends Controller*/public function variables(Request $request, AccountRepositoryInterface $repository): Response{- $account = $repository->find((int) $request->get('account'));+ $account = $repository->find((int) $request->input('account'));$currency = $this->primaryCurrency;if ($account instanceof Account) {$currency = $repository->getAccountCurrency($account) ?? $this->primaryCurrency;diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.phpindex 75dc1b5e54..2384f50920 100644--- a/app/Http/Controllers/Json/ReconcileController.php+++ b/app/Http/Controllers/Json/ReconcileController.php@@ -70,8 +70,8 @@ final class ReconcileController extends Controller*/public function overview(Request $request, ?Account $account = null, ?Carbon $start = null, ?Carbon $end = null): JsonResponse{- $startBalance = $request->get('startBalance');- $endBalance = $request->get('endBalance');+ $startBalance = $request->input('startBalance');+ $endBalance = $request->input('endBalance');$accountCurrency = $this->accountRepos->getAccountCurrency($account) ?? $this->primaryCurrency;$amount = '0';$clearedAmount = '0';@@ -92,9 +92,9 @@ final class ReconcileController extends Controller$start->startOfDay();$route = route('accounts.reconcile.submit', [$account->id, $start->format('Ymd'), $end->format('Ymd')]);- $selectedIds = $request->get('journals') ?? [];+ $selectedIds = $request->input('journals') ?? [];$clearedJournals = [];- $clearedIds = $request->get('cleared') ?? [];+ $clearedIds = $request->input('cleared') ?? [];$journals = [];// Collect all submitted journalsif (count($selectedIds) > 0) {diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.phpindex 81527aa3eb..ae601b4e40 100644--- a/app/Http/Controllers/Json/RecurrenceController.php+++ b/app/Http/Controllers/Json/RecurrenceController.php@@ -69,16 +69,16 @@ final class RecurrenceController extends Controller{$occurrences = [];$return = [];- $start = Carbon::createFromFormat('Y-m-d', $request->get('start'));- $end = Carbon::createFromFormat('Y-m-d', $request->get('end'));- $firstDate = Carbon::createFromFormat('Y-m-d', $request->get('first_date'));- $endDate = '' !== (string) $request->get('end_date') ? Carbon::createFromFormat('Y-m-d', $request->get('end_date')) : null;- $endsAt = (string) $request->get('ends');- $repetitionType = explode(',', (string) $request->get('type'))[0];- $repetitions = (int) $request->get('reps');- $weekend = (int) $request->get('weekend');+ $start = Carbon::createFromFormat('Y-m-d', $request->input('start'));+ $end = Carbon::createFromFormat('Y-m-d', $request->input('end'));+ $firstDate = Carbon::createFromFormat('Y-m-d', $request->input('first_date'));+ $endDate = '' !== (string) $request->input('end_date') ? Carbon::createFromFormat('Y-m-d', $request->input('end_date')) : null;+ $endsAt = (string) $request->input('ends');+ $repetitionType = explode(',', (string) $request->input('type'))[0];+ $repetitions = (int) $request->input('reps');+ $weekend = (int) $request->input('weekend');$repetitionMoment = '';- $skip = (int) $request->get('skip');+ $skip = (int) $request->input('skip');$skip = $skip < 0 || $skip > 31 ? 0 : $skip;$weekend = $weekend < 1 || $weekend > 4 ? 1 : $weekend;@@ -101,13 +101,13 @@ final class RecurrenceController extends Controller$actualStart = clone $firstDate;if ('weekly' === $repetitionType || 'monthly' === $repetitionType) {- $repetitionMoment = explode(',', (string) $request->get('type'))[1] ?? '1';+ $repetitionMoment = explode(',', (string) $request->input('type'))[1] ?? '1';}if ('ndom' === $repetitionType) {- $repetitionMoment = str_ireplace('ndom,', '', $request->get('type'));+ $repetitionMoment = str_ireplace('ndom,', '', $request->input('type'));}if ('yearly' === $repetitionType) {- $repetitionMoment = explode(',', (string) $request->get('type'))[1] ?? '2025-01-01';+ $repetitionMoment = explode(',', (string) $request->input('type'))[1] ?? '2025-01-01';}$actualStart->startOfDay();$repetition = new RecurrenceRepetition();@@ -153,7 +153,7 @@ final class RecurrenceController extends Controller*/public function suggest(Request $request): JsonResponse{- $string = '' === (string) $request->get('date') ? Carbon::now()->format('Y-m-d') : (string) $request->get('date');+ $string = '' === (string) $request->input('date') ? Carbon::now()->format('Y-m-d') : (string) $request->input('date');$today = today(config('app.timezone'))->startOfDay();try {@@ -165,14 +165,14 @@ final class RecurrenceController extends Controllerreturn response()->json();}$date->startOfDay();- $preSelected = (string) $request->get('pre_select');+ $preSelected = (string) $request->input('pre_select');$locale = Steam::getLocale();Log::debug(sprintf('date = %s, today = %s. date > today? %s', $date->toAtomString(), $today->toAtomString(), var_export($date > $today, true)));- Log::debug(sprintf('past = true? %s', var_export('true' === (string) $request->get('past'), true)));+ Log::debug(sprintf('past = true? %s', var_export('true' === (string) $request->input('past'), true)));$result = [];- if ($date > $today || 'true' === (string) $request->get('past')) {+ if ($date > $today || 'true' === (string) $request->input('past')) {Log::debug('Will fill dropdown.');$weekly = sprintf('weekly,%s', $date->dayOfWeekIso);$monthly = sprintf('monthly,%s', $date->day);diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.phpindex a0d59fe975..c309c3b890 100644--- a/app/Http/Controllers/ObjectGroup/EditController.php+++ b/app/Http/Controllers/ObjectGroup/EditController.php@@ -86,7 +86,7 @@ final class EditController extends Controller$redirect = redirect($this->getPreviousUrl('object-groups.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {session()->put('object-groups.edit.fromUpdate', true);$redirect = redirect(route('object-groups.edit', [$piggyBank->id]));diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.phpindex dc432504ca..39789ac056 100644--- a/app/Http/Controllers/ObjectGroup/IndexController.php+++ b/app/Http/Controllers/ObjectGroup/IndexController.php@@ -73,7 +73,7 @@ final class IndexController extends Controllerpublic function setOrder(Request $request, ObjectGroup $objectGroup){Log::debug(sprintf('Found object group #%d "%s"', $objectGroup->id, $objectGroup->title));- $newOrder = (int) $request->get('order');+ $newOrder = (int) $request->input('order');$this->repository->setOrder($objectGroup, $newOrder);return response()->json();diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.phpindex 5acbee04be..fc1c125019 100644--- a/app/Http/Controllers/PiggyBank/AmountController.php+++ b/app/Http/Controllers/PiggyBank/AmountController.php@@ -194,7 +194,7 @@ final class AmountController extends Controller*/public function postRemove(Request $request, PiggyBank $piggyBank): RedirectResponse{- $amounts = $request->get('amount') ?? [];+ $amounts = $request->input('amount') ?? [];if (!is_array($amounts)) {$amounts = [];}diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.phpindex dfd408387a..cef6f6f8a2 100644--- a/app/Http/Controllers/PiggyBank/CreateController.php+++ b/app/Http/Controllers/PiggyBank/CreateController.php@@ -122,7 +122,7 @@ final class CreateController extends Controller}$redirect = redirect($this->getPreviousUrl('piggy-banks.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {session()->put('piggy-banks.create.fromStore', true);$redirect = redirect(route('piggy-banks.create'))->withInput();diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.phpindex 015196b411..39b58c2a06 100644--- a/app/Http/Controllers/PiggyBank/EditController.php+++ b/app/Http/Controllers/PiggyBank/EditController.php@@ -143,7 +143,7 @@ final class EditController extends Controller}$redirect = redirect($this->getPreviousUrl('piggy-banks.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {session()->put('piggy-banks.edit.fromUpdate', true);$redirect = redirect(route('piggy-banks.edit', [$piggyBank->id]));diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.phpindex 621f80020b..7a9dccd824 100644--- a/app/Http/Controllers/Popup/ReportController.php+++ b/app/Http/Controllers/Popup/ReportController.php@@ -43,7 +43,7 @@ final class ReportController extends Controller*/public function general(Request $request): JsonResponse{- $attributes = $request->get('attributes') ?? [];+ $attributes = $request->input('attributes') ?? [];$attributes = $this->parseAttributes($attributes);app('view')->share('start', $attributes['startDate']);diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.phpindex 05d2d45e4d..7a23b7839b 100644--- a/app/Http/Controllers/Profile/MfaController.php+++ b/app/Http/Controllers/Profile/MfaController.php@@ -232,7 +232,7 @@ final class MfaController extends Controller$user = auth()->user();// verify password.- $password = $request->get('password');+ $password = $request->input('password');if (!auth()->validate(['email' => $user->email, 'password' => $password])) {session()->flash('error', 'Bad user pw, no MFA for you!');@@ -255,7 +255,7 @@ final class MfaController extends ControllerPreferences::mark();// also save the code so replay attack is prevented.- $mfaCode = $request->get('code');+ $mfaCode = $request->input('code');$this->addToMFAHistory($mfaCode);// make sure MFA is logged out.diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.phpindex 9ab159e01e..492d789e94 100644--- a/app/Http/Controllers/ProfileController.php+++ b/app/Http/Controllers/ProfileController.php@@ -289,8 +289,8 @@ final class ProfileController extends Controller}// the request has already validated both new passwords must be equal.- $current = $request->get('current_password');- $new = $request->get('new_password');+ $current = $request->input('current_password');+ $new = $request->input('new_password');/** @var User $user */$user = auth()->user();@@ -303,7 +303,7 @@ final class ProfileController extends Controllerreturn redirect(route('profile.change-password'));}- $repository->changePassword($user, $request->get('new_password'));+ $repository->changePassword($user, $request->input('new_password'));session()->flash('success', (string) trans('firefly.password_changed'));return redirect(route('profile.index'));@@ -320,7 +320,7 @@ final class ProfileController extends Controllerreturn redirect(route('profile.index'));}- if (!Hash::check($request->get('password'), auth()->user()->password)) {+ if (!Hash::check($request->input('password'), auth()->user()->password)) {session()->flash('error', (string) trans('firefly.invalid_password'));return redirect(route('profile.delete-account'));@@ -347,9 +347,9 @@ final class ProfileController extends Controllerreturn redirect(route('profile.index'));}- $creds = ['email' => auth()->user()->email, 'password' => $request->get('password')];+ $creds = ['email' => auth()->user()->email, 'password' => $request->input('password')];if (Auth::once($creds)) {- Auth::logoutOtherDevices($request->get('password'));+ Auth::logoutOtherDevices($request->input('password'));session()->flash('info', (string) trans('firefly.other_sessions_logged_out'));return redirect(route('profile.index'));diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.phpindex f4f7f4eb38..570f4a4ad8 100644--- a/app/Http/Controllers/Recurring/CreateController.php+++ b/app/Http/Controllers/Recurring/CreateController.php@@ -257,7 +257,7 @@ final class CreateController extends Controller}$redirect = redirect($this->getPreviousUrl('recurring.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {// set value so create routine will not overwrite URL:$request->session()->put('recurring.create.fromStore', true);diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.phpindex 649c889be7..66b9f3b5bc 100644--- a/app/Http/Controllers/Recurring/EditController.php+++ b/app/Http/Controllers/Recurring/EditController.php@@ -203,7 +203,7 @@ final class EditController extends Controller}Preferences::mark();$redirect = redirect($this->getPreviousUrl('recurrences.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {// set value so edit routine will not overwrite URL:$request->session()->put('recurrences.edit.fromUpdate', true);diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.phpindex b828cd9de6..0f9d3214fc 100644--- a/app/Http/Controllers/Recurring/IndexController.php+++ b/app/Http/Controllers/Recurring/IndexController.php@@ -80,7 +80,8 @@ final class IndexController extends Controller*/public function index(Request $request): Factory|\Illuminate\Contracts\View\View{- $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$collection = $this->repository->get();$today = today(config('app.timezone'));diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.phpindex aa923a6d6d..45e99c41e9 100644--- a/app/Http/Controllers/ReportController.php+++ b/app/Http/Controllers/ReportController.php@@ -291,7 +291,7 @@ final class ReportController extends Controllerpublic function postIndex(ReportFormRequest $request): RedirectResponse|View{// report type:- $reportType = $request->get('report_type');+ $reportType = $request->input('report_type');$start = $request->getStartDate()->format('Ymd');$end = $request->getEndDate()->format('Ymd');$accounts = implode(',', $request->getAccountList()->pluck('id')->toArray());diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.phpindex 6ae063ab5c..14e0189bbf 100644--- a/app/Http/Controllers/Rule/CreateController.php+++ b/app/Http/Controllers/Rule/CreateController.php@@ -84,7 +84,7 @@ final class CreateController extends Controller$oldActions = [];// build triggers from query, if present.- $query = (string) $request->get('from_query');+ $query = (string) $request->input('from_query');if ('' !== $query) {$search = app(SearchInterface::class);$search->parseQuery($query);@@ -255,7 +255,7 @@ final class CreateController extends Controllerpublic function duplicate(Request $request): JsonResponse{- $ruleId = (int) $request->get('id');+ $ruleId = (int) $request->input('id');$rule = $this->ruleRepos->find($ruleId);if ($rule instanceof Rule) {$this->ruleRepos->duplicate($rule);@@ -278,12 +278,12 @@ final class CreateController extends ControllerPreferences::mark();// redirect to show bill.- if ('true' === $request->get('return_to_bill') && (int) $request->get('bill_id') > 0) {- return redirect(route('bills.show', [(int) $request->get('bill_id')]));+ if ('true' === $request->input('return_to_bill') && (int) $request->input('bill_id') > 0) {+ return redirect(route('bills.show', [(int) $request->input('bill_id')]));}// redirect to new bill creation.- if ((int) $request->get('bill_id') > 0) {+ if ((int) $request->input('bill_id') > 0) {return redirect($this->getPreviousUrl('bills.create.url'));}if (true === $data['run_after_form']) {@@ -292,7 +292,7 @@ final class CreateController extends Controller$redirect = redirect($this->getPreviousUrl('rules.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {session()->put('rules.create.fromStore', true);$redirect = redirect(route('rules.create', [$data['rule_group_id']]))->withInput();}diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.phpindex 6a6146445e..297ce0295d 100644--- a/app/Http/Controllers/Rule/EditController.php+++ b/app/Http/Controllers/Rule/EditController.php@@ -83,7 +83,7 @@ final class EditController extends Controller$oldTriggers = [];// build triggers from query, if present.- $query = (string) $request->get('from_query');+ $query = (string) $request->input('from_query');if ('' !== $query) {$search = app(SearchInterface::class);$search->parseQuery($query);@@ -169,7 +169,7 @@ final class EditController extends Controllerreturn redirect(route('rules.select-transactions', [$rule->id]));}- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {session()->put('rules.edit.fromUpdate', true);$redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.phpindex 28492aeeae..2c2a56165c 100644--- a/app/Http/Controllers/Rule/IndexController.php+++ b/app/Http/Controllers/Rule/IndexController.php@@ -77,7 +77,7 @@ final class IndexController extends Controllerpublic function moveRule(Request $request, Rule $rule, RuleGroup $ruleGroup): JsonResponse{- $order = (int) $request->get('order');+ $order = (int) $request->input('order');$this->ruleRepos->moveRule($rule, $ruleGroup, $order);return response()->json();diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.phpindex 6291467285..edaf7c3428 100644--- a/app/Http/Controllers/Rule/SelectController.php+++ b/app/Http/Controllers/Rule/SelectController.php@@ -72,18 +72,18 @@ final class SelectController extends Controller// Get parameters specified by the user/** @var User $user */$user = auth()->user();- $accounts = implode(',', $request->get('accounts'));+ $accounts = implode(',', $request->input('accounts'));// create new rule engine:$newRuleEngine = app(RuleEngineInterface::class);$newRuleEngine->setUser($user);// add date operators.- if (null !== $request->get('start')) {- $startDate = new Carbon($request->get('start'));+ if (null !== $request->input('start')) {+ $startDate = new Carbon($request->input('start'));$newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);}- if (null !== $request->get('end')) {- $endDate = new Carbon($request->get('end'));+ if (null !== $request->input('end')) {+ $endDate = new Carbon($request->input('end'));$newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);}@@ -129,7 +129,7 @@ final class SelectController extends Controller/** @var \Illuminate\Database\Eloquent\Collection<int, RuleTrigger> $triggers */$triggers = new Collection();- $rule->strict = '1' === $request->get('strict');+ $rule->strict = '1' === $request->input('strict');// build trigger array from response$textTriggers = $this->getValidTriggerList($request);diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.phpindex bcb762dcf7..a2d5bc7edc 100644--- a/app/Http/Controllers/RuleGroup/CreateController.php+++ b/app/Http/Controllers/RuleGroup/CreateController.php@@ -90,7 +90,7 @@ final class CreateController extends ControllerPreferences::mark();$redirect = redirect($this->getPreviousUrl('rule-groups.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {session()->put('rule-groups.create.fromStore', true);$redirect = redirect(route('rule-groups.create'))->withInput();diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.phpindex 024d6605a5..fb81cdcd88 100644--- a/app/Http/Controllers/RuleGroup/DeleteController.php+++ b/app/Http/Controllers/RuleGroup/DeleteController.php@@ -81,7 +81,7 @@ final class DeleteController extends Controller$title = $ruleGroup->title;/** @var RuleGroup $moveTo */- $moveTo = $this->repository->find((int) $request->get('move_rules_before_delete'));+ $moveTo = $this->repository->find((int) $request->input('move_rules_before_delete'));$this->repository->destroy($ruleGroup, $moveTo);session()->flash('success', (string) trans('firefly.deleted_rule_group', ['title' => $title]));diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.phpindex d36157e0ed..9feaa858bf 100644--- a/app/Http/Controllers/RuleGroup/EditController.php+++ b/app/Http/Controllers/RuleGroup/EditController.php@@ -85,10 +85,10 @@ final class EditController extends Controller*/public function moveGroup(Request $request): JsonResponse{- $groupId = (int) $request->get('id');+ $groupId = (int) $request->input('id');$ruleGroup = $this->repository->find($groupId);if ($ruleGroup instanceof RuleGroup) {- $direction = $request->get('direction');+ $direction = $request->input('direction');if ('down' === $direction) {$maxOrder = $this->repository->maxOrder();$order = $ruleGroup->order;@@ -127,7 +127,7 @@ final class EditController extends Controllersession()->flash('success', (string) trans('firefly.updated_rule_group', ['title' => $ruleGroup->title]));Preferences::mark();$redirect = redirect($this->getPreviousUrl('rule-groups.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {session()->put('rule-groups.edit.fromUpdate', true);$redirect = redirect(route('rule-groups.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.phpindex 0017fdaafb..ee4018050a 100644--- a/app/Http/Controllers/RuleGroup/ExecutionController.php+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php@@ -76,18 +76,18 @@ final class ExecutionController extends Controller// start code/** @var User $user */$user = auth()->user();- $accounts = implode(',', $request->get('accounts'));+ $accounts = implode(',', $request->input('accounts'));// create new rule engine:$newRuleEngine = app(RuleEngineInterface::class);$newRuleEngine->setUser($user);// add date operators.- if (null !== $request->get('start')) {- $startDate = new Carbon($request->get('start'));+ if (null !== $request->input('start')) {+ $startDate = new Carbon($request->input('start'));$newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);}- if (null !== $request->get('end')) {- $endDate = new Carbon($request->get('end'));+ if (null !== $request->input('end')) {+ $endDate = new Carbon($request->input('end'));$newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);}diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.phpindex e1fc7a6ad5..f2403c6fd4 100644--- a/app/Http/Controllers/SearchController.php+++ b/app/Http/Controllers/SearchController.php@@ -66,7 +66,8 @@ final class SearchController extends Controller$fullQuery = '';}$fullQuery = (string) $fullQuery;- $page = 0 === (int) $request->input('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$ruleId = (int) $request->input('rule');$ruleChanged = false;@@ -110,12 +111,13 @@ final class SearchController extends Controller*/public function search(Request $request, SearchInterface $searcher): JsonResponse{- $entry = $request->get('query');+ $entry = $request->input('query');if (!is_scalar($entry)) {$entry = '';}$fullQuery = (string) $entry;- $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$searcher->parseQuery($fullQuery);diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.phpindex f8c97a08a4..3a17ffb74f 100644--- a/app/Http/Controllers/TagController.php+++ b/app/Http/Controllers/TagController.php@@ -196,7 +196,7 @@ final class TagController extends Controllerpublic function massDestroy(Request $request): RedirectResponse{- $tags = $request->get('tags');+ $tags = $request->input('tags');if (null === $tags || !is_array($tags)) {session()->flash('info', (string) trans('firefly.select_tags_to_delete'));@@ -297,7 +297,8 @@ final class TagController extends Controller{// default values:$subTitleIcon = 'fa-tag';- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$periods = [];$subTitle = (string) trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]);@@ -376,7 +377,7 @@ final class TagController extends Controller$request->session()->flash('error', $this->attachmentsHelper->getErrors()->get('attachments'));}$redirect = redirect($this->getPreviousUrl('tags.create.url'));- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {session()->put('tags.create.fromStore', true);$redirect = redirect(route('tags.create'))->withInput();@@ -414,7 +415,7 @@ final class TagController extends Controller$request->session()->flash('error', $this->attachmentsHelper->getErrors()->get('attachments'));}$redirect = redirect($this->getPreviousUrl('tags.edit.url'));- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {session()->put('tags.edit.fromUpdate', true);$redirect = redirect(route('tags.edit', [$tag->id]))->withInput(['return_to_edit' => 1]);diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.phpindex 5c0e872966..cbb95da28f 100644--- a/app/Http/Controllers/Transaction/BulkController.php+++ b/app/Http/Controllers/Transaction/BulkController.php@@ -91,11 +91,11 @@ final class BulkController extends Controller*/public function update(BulkEditJournalRequest $request): RedirectResponse{- $journalIds = $request->get('journals');+ $journalIds = $request->input('journals');$journalIds = is_array($journalIds) ? $journalIds : [];- $ignoreCategory = 1 === (int) $request->get('ignore_category');- $ignoreBudget = 1 === (int) $request->get('ignore_budget');- $tagsAction = $request->get('tags_action');+ $ignoreCategory = 1 === (int) $request->input('ignore_category');+ $ignoreBudget = 1 === (int) $request->input('ignore_budget');+ $tagsAction = $request->input('tags_action');$collection = new Collection();$count = 0;diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.phpindex 49131a46c0..7dd84ddced 100644--- a/app/Http/Controllers/Transaction/CreateController.php+++ b/app/Http/Controllers/Transaction/CreateController.php@@ -66,7 +66,7 @@ final class CreateController extends Controllerpublic function cloneGroup(Request $request): JsonResponse{- $groupId = (int) $request->get('id');+ $groupId = (int) $request->input('id');if (0 !== $groupId) {$group = $this->repository->find($groupId);if ($group instanceof TransactionGroup) {@@ -81,7 +81,7 @@ final class CreateController extends Controllersession()->flash('success', trans('firefly.stored_journal', ['description' => $title]));session()->flash('success_url', $link);- if ('edit' === $request->get('redirect')) {+ if ('edit' === $request->input('redirect')) {return response()->json(['redirect' => route('transactions.edit', [$newGroup->id])]);}diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.phpindex e09f0d3025..7035fb88ca 100644--- a/app/Http/Controllers/Transaction/IndexController.php+++ b/app/Http/Controllers/Transaction/IndexController.php@@ -82,7 +82,7 @@ final class IndexController extends Controller$subTitleIcon = config('firefly.transactionIconsByType.'.$objectType);$types = config('firefly.transactionTypesByType.'.$objectType);- $page = (int) $request->get('page');+ $page = (int) $request->input('page');$pageSize = (int) Preferences::get('listPageSize', 50)->data;if (!$start instanceof Carbon) {@@ -151,7 +151,8 @@ final class IndexController extends Controller{$subTitleIcon = config('firefly.transactionIconsByType.'.$objectType);$types = config('firefly.transactionTypesByType.'.$objectType);- $page = (int) $request->get('page');+ $page = (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$path = route('transactions.index.all', [$objectType]);$first = $this->repository->firstNull();diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.phpindex 5bba56d499..3ef3ff5e76 100644--- a/app/Http/Controllers/Transaction/LinkController.php+++ b/app/Http/Controllers/Transaction/LinkController.php@@ -140,7 +140,7 @@ final class LinkController extends Controller*/public function switchLink(Request $request): RedirectResponse{- $linkId = (int) $request->get('id');+ $linkId = (int) $request->input('id');$this->repository->switchLinkById($linkId);return redirect(Steam::getSafePreviousUrl());diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.phpindex 36cde3a113..08c5c76f9f 100644--- a/app/Http/Controllers/Transaction/MassController.php+++ b/app/Http/Controllers/Transaction/MassController.php@@ -198,7 +198,7 @@ final class MassController extends Controllerprivate function getDateFromRequest(MassEditJournalRequest $request, int $journalId, string $key): ?Carbon{- $value = $request->get($key);+ $value = $request->input($key);if (!is_array($value)) {return null;}@@ -220,7 +220,7 @@ final class MassController extends Controllerprivate function getIntFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?int{- $value = $request->get($string);+ $value = $request->input($string);if (!is_array($value)) {return null;}@@ -233,7 +233,7 @@ final class MassController extends Controllerprivate function getStringFromRequest(MassEditJournalRequest $request, int $journalId, string $string): ?string{- $value = $request->get($string);+ $value = $request->input($string);if (!is_array($value)) {return null;}diff --git a/app/Http/Controllers/TransactionCurrency/CreateController.php b/app/Http/Controllers/TransactionCurrency/CreateController.phpindex 9abc826cc2..02216045d3 100644--- a/app/Http/Controllers/TransactionCurrency/CreateController.php+++ b/app/Http/Controllers/TransactionCurrency/CreateController.php@@ -124,7 +124,7 @@ final class CreateController extends Controllerif ($currency instanceof TransactionCurrency) {$request->session()->flash('success', (string) trans('firefly.created_currency', ['name' => $currency->name]));Log::channel('audit')->info('Created (POST) currency.', $data);- if (1 === (int) $request->get('create_another')) {+ if (1 === (int) $request->input('create_another')) {$request->session()->put('currencies.create.fromStore', true);$redirect = redirect(route('currencies.create'))->withInput();diff --git a/app/Http/Controllers/TransactionCurrency/EditController.php b/app/Http/Controllers/TransactionCurrency/EditController.phpindex 31ca05ba85..7eca55a893 100644--- a/app/Http/Controllers/TransactionCurrency/EditController.php+++ b/app/Http/Controllers/TransactionCurrency/EditController.php@@ -127,7 +127,7 @@ final class EditController extends Controller$request->session()->flash('success', (string) trans('firefly.updated_currency', ['name' => $currency->name]));Preferences::mark();- if (1 === (int) $request->get('return_to_edit')) {+ if (1 === (int) $request->input('return_to_edit')) {$request->session()->put('currencies.edit.fromUpdate', true);return redirect(route('currencies.edit', [$currency->id]));diff --git a/app/Http/Controllers/TransactionCurrency/IndexController.php b/app/Http/Controllers/TransactionCurrency/IndexController.phpindex 3ccdbe29e7..6f64769b9a 100644--- a/app/Http/Controllers/TransactionCurrency/IndexController.php+++ b/app/Http/Controllers/TransactionCurrency/IndexController.php@@ -71,7 +71,8 @@ final class IndexController extends Controller{/** @var User $user */$user = auth()->user();- $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page');+ $page = 0 === (int) $request->input('page') ? 1 : (int) $request->input('page');+ $page = min(max(1, $page), 2 ** 16);$pageSize = (int) Preferences::get('listPageSize', 50)->data;$collection = $this->repository->getAll();diff --git a/app/Http/Middleware/InterestingMessage.php b/app/Http/Middleware/InterestingMessage.phpindex 9473b42e0e..97e8f019b4 100644--- a/app/Http/Middleware/InterestingMessage.php+++ b/app/Http/Middleware/InterestingMessage.php@@ -85,8 +85,8 @@ class InterestingMessageprivate function accountMessage(Request $request): bool{// get parameters from request.- $accountId = $request->get('account_id');- $message = $request->get('message');+ $accountId = $request->input('account_id');+ $message = $request->input('message');return null !== $accountId && null !== $message;}@@ -94,8 +94,8 @@ class InterestingMessageprivate function billMessage(Request $request): bool{// get parameters from request.- $billId = $request->get('bill_id');- $message = $request->get('message');+ $billId = $request->input('bill_id');+ $message = $request->input('message');return null !== $billId && null !== $message;}@@ -103,8 +103,8 @@ class InterestingMessageprivate function currencyMessage(Request $request): bool{// get parameters from request.- $code = $request->get('code');- $message = $request->get('message');+ $code = $request->input('code');+ $message = $request->input('message');return null !== $code && null !== $message;}@@ -112,8 +112,8 @@ class InterestingMessageprivate function groupMessage(Request $request): bool{// get parameters from request.- $transactionGroupId = $request->get('transaction_group_id');- $message = $request->get('message');+ $transactionGroupId = $request->input('transaction_group_id');+ $message = $request->input('message');return null !== $transactionGroupId && null !== $message;}@@ -121,8 +121,8 @@ class InterestingMessageprivate function handleAccountMessage(Request $request): void{// get parameters from request.- $accountId = $request->get('account_id');- $message = $request->get('message');+ $accountId = $request->input('account_id');+ $message = $request->input('message');/** @var User $user */$user = auth()->user();@@ -147,8 +147,8 @@ class InterestingMessageprivate function handleBillMessage(Request $request): void{// get parameters from request.- $billId = $request->get('bill_id');- $message = $request->get('message');+ $billId = $request->input('bill_id');+ $message = $request->input('message');/** @var null|Bill $bill */$bill = auth()->user()->bills()->withTrashed()->find($billId);@@ -168,8 +168,8 @@ class InterestingMessage{// params:// get parameters from request.- $code = (string) $request->get('code');- $message = (string) $request->get('message');+ $code = (string) $request->input('code');+ $message = (string) $request->input('message');try {$currency = Amount::getTransactionCurrencyByCode($code);@@ -200,8 +200,8 @@ class InterestingMessageprivate function handleGroupMessage(Request $request): void{// get parameters from request.- $transactionGroupId = $request->get('transaction_group_id');- $message = $request->get('message');+ $transactionGroupId = $request->input('transaction_group_id');+ $message = $request->input('message');// send message about newly created transaction group./** @var null|TransactionGroup $group */@@ -243,8 +243,8 @@ class InterestingMessageprivate function handleUserGroupMessage(Request $request): void{// get parameters from request.- $userGroupId = $request->get('user_group_id');- $message = $request->get('message');+ $userGroupId = $request->input('user_group_id');+ $message = $request->input('message');/** @var User $user */$user = auth()->user();@@ -280,8 +280,8 @@ class InterestingMessageprivate function handleWebhookMessage(Request $request): void{// get parameters from request.- $webhookId = $request->get('webhook_id');- $message = $request->get('message');+ $webhookId = $request->input('webhook_id');+ $message = $request->input('message');/** @var null|Webhook $webhook */$webhook = auth()->user()->webhooks()->withTrashed()->find($webhookId);@@ -309,8 +309,8 @@ class InterestingMessageprivate function userGroupMessage(Request $request): bool{// get parameters from request.- $transactionGroupId = $request->get('user_group_id');- $message = $request->get('message');+ $transactionGroupId = $request->input('user_group_id');+ $message = $request->input('message');return null !== $transactionGroupId && null !== $message;}@@ -318,8 +318,8 @@ class InterestingMessageprivate function webhookMessage(Request $request): bool{// get parameters from request.- $webhookId = $request->get('webhook_id');- $message = $request->get('message');+ $webhookId = $request->input('webhook_id');+ $message = $request->input('message');return null !== $webhookId && null !== $message;}diff --git a/app/Support/Http/Api/ValidatesUserGroupTrait.php b/app/Support/Http/Api/ValidatesUserGroupTrait.phpindex c494ab4c32..3fe036b331 100644--- a/app/Support/Http/Api/ValidatesUserGroupTrait.php+++ b/app/Support/Http/Api/ValidatesUserGroupTrait.php@@ -66,7 +66,7 @@ trait ValidatesUserGroupTraitLog::debug(sprintf('validateUserGroup: no user group submitted, use default group #%d.', $groupId));}if ($request->has('user_group_id')) {- $groupId = (int) $request->get('user_group_id');+ $groupId = (int) $request->input('user_group_id');Log::debug(sprintf('validateUserGroup: user group submitted, search for memberships in group #%d.', $groupId));}diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.phpindex 62051dbd78..20d2ff1eff 100644--- a/app/Support/Http/Controllers/CreateStuff.php+++ b/app/Support/Http/Controllers/CreateStuff.php@@ -48,7 +48,7 @@ trait CreateStuff/** @var AccountRepositoryInterface $repository */$repository = app(AccountRepositoryInterface::class);$assetAccount = [- 'name' => $request->get('bank_name'),+ 'name' => $request->input('bank_name'),'iban' => null,'account_type_name' => 'asset','virtual_balance' => 0,@@ -117,7 +117,7 @@ trait CreateStuff/** @var AccountRepositoryInterface $repository */$repository = app(AccountRepositoryInterface::class);$savingsAccount = [- 'name' => (string) trans('firefly.new_savings_account', ['bank_name' => $request->get('bank_name')], $language),+ 'name' => (string) trans('firefly.new_savings_account', ['bank_name' => $request->input('bank_name')], $language),'iban' => null,'account_type_name' => 'asset','account_type_id' => null,diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.phpindex f1c60166b0..d78da3bab6 100644--- a/app/Support/Http/Controllers/RequestInformation.php+++ b/app/Support/Http/Controllers/RequestInformation.php@@ -77,7 +77,7 @@ trait RequestInformationfinal protected function getValidTriggerList(TestRuleFormRequest $request): array // process input{$triggers = [];- $data = $request->get('triggers');+ $data = $request->input('triggers');if (is_array($data)) {foreach ($data as $triggerInfo) {$current = [diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.phpindex a3b0b7c2f7..04e630dffd 100644--- a/resources/views/components/lists/groups-large.blade.php+++ b/resources/views/components/lists/groups-large.blade.php@@ -136,7 +136,7 @@<x-elements.transaction-running-balance:balance-dirty="($transaction['source_balance_dirty'] ?? false) || ($transaction['destination_balance_dirty'] ?? false)":currency="['symbol' => $transaction['currency_symbol'],'decimal_places' => $transaction['currency_decimal_places']]"- :foreign="['symbol' => $transaction['foreign_currency_symbol'], 'decimal_places' => $transaction['foreign_currency_decimal_places']]"+ :foreign="['id' => $transaction['foreign_currency_id'], 'symbol' => $transaction['foreign_currency_symbol'], 'decimal_places' => $transaction['foreign_currency_decimal_places']]":type="$transaction['transaction_type_type']":account="$account ?? null":source="['id' => $transaction['source_account_id'], 'balance_after' => $transaction['source_balance_after'], 'type' => $transaction['source_account_type']]"diff --git a/resources/views/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.phpindex e5cf0c0c31..21cf94262b 100644--- a/resources/views/components/lists/subscriptions.blade.php+++ b/resources/views/components/lists/subscriptions.blade.php@@ -58,7 +58,7 @@~ {!! format_amount_by_symbol(($entry['amount_max'] + $entry['amount_min'])/2, $entry['currency_symbol'], $entry['currency_decimal_places']) !!}@if('0' !== $entry['pc_amount_max'] && null !== $entry['pc_amount_max'])- (~ {!! format_amount_by_symbol(($entry['pc_amount_max'] + $entry['pc_amount_min'])/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})+ (~ {!! format_amount_by_symbol(($entry['pc_amount_max'] + $entry['pc_amount_min'])/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})@endif</span></td>