diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index a517272c6b..27b62ea041 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -241,7 +241,7 @@ class BillController extends Controller { $billData = $request->getBillData(); $bill = $repository->store($billData); - $request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => e($bill->name)]))); + $request->session()->flash('success', strval(trans('firefly.stored_new_bill', ['name' => $bill->name]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { @@ -269,7 +269,7 @@ class BillController extends Controller $billData = $request->getBillData(); $bill = $repository->update($bill, $billData); - $request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => e($bill->name)]))); + $request->session()->flash('success', strval(trans('firefly.updated_bill', ['name' => $bill->name]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 9f961bf06d..08f03c4aec 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -135,7 +135,7 @@ class BudgetController extends Controller $name = $budget->name; $this->repository->destroy($budget); - $request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)]))); + $request->session()->flash('success', strval(trans('firefly.deleted_budget', ['name' => $name]))); Preferences::mark(); return redirect($this->getPreviousUri('budgets.delete.uri')); @@ -464,7 +464,7 @@ class BudgetController extends Controller $data = $request->getBudgetData(); $budget = $this->repository->store($data); - $request->session()->flash('success', strval(trans('firefly.stored_new_budget', ['name' => e($budget->name)]))); + $request->session()->flash('success', strval(trans('firefly.stored_new_budget', ['name' => $budget->name]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { @@ -489,7 +489,7 @@ class BudgetController extends Controller $data = $request->getBudgetData(); $this->repository->update($budget, $data); - $request->session()->flash('success', strval(trans('firefly.updated_budget', ['name' => e($budget->name)]))); + $request->session()->flash('success', strval(trans('firefly.updated_budget', ['name' => $budget->name]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index c35295733f..b64d1e15ae 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -108,7 +108,7 @@ class CategoryController extends Controller $name = $category->name; $repository->destroy($category); - $request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)]))); + $request->session()->flash('success', strval(trans('firefly.deleted_category', ['name' => $name]))); Preferences::mark(); return redirect($this->getPreviousUri('categories.delete.uri')); @@ -292,7 +292,7 @@ class CategoryController extends Controller $data = $request->getCategoryData(); $category = $repository->store($data); - $request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => e($category->name)]))); + $request->session()->flash('success', strval(trans('firefly.stored_category', ['name' => $category->name]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { @@ -319,7 +319,7 @@ class CategoryController extends Controller $data = $request->getCategoryData(); $repository->update($category, $data); - $request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => e($category->name)]))); + $request->session()->flash('success', strval(trans('firefly.updated_category', ['name' => $category->name]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index bed151d63b..1d0bb3c7e9 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -149,7 +149,7 @@ class PiggyBankController extends Controller */ public function destroy(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => e($piggyBank->name)]))); + Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => $piggyBank->name]))); Preferences::mark(); $repository->destroy($piggyBank); @@ -297,7 +297,7 @@ class PiggyBankController extends Controller 'error', strval( trans( 'firefly.cannot_add_amount_piggy', - ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)] + ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name] ) ) ); @@ -337,7 +337,7 @@ class PiggyBankController extends Controller 'error', strval( trans( 'firefly.cannot_remove_from_piggy', - ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => e($piggyBank->name)] + ['amount' => app('amount')->formatAnything($currency, $amount, false), 'name' => $piggyBank->name] ) ) ); @@ -395,7 +395,7 @@ class PiggyBankController extends Controller $data = $request->getPiggyBankData(); $piggyBank = $repository->store($data); - Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => e($piggyBank->name)]))); + Session::flash('success', strval(trans('firefly.stored_piggy_bank', ['name' => $piggyBank->name]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { @@ -421,7 +421,7 @@ class PiggyBankController extends Controller $data = $request->getPiggyBankData(); $piggyBank = $repository->update($piggyBank, $data); - Session::flash('success', strval(trans('firefly.updated_piggy_bank', ['name' => e($piggyBank->name)]))); + Session::flash('success', strval(trans('firefly.updated_piggy_bank', ['name' => $piggyBank->name]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 82de1dfc8a..376676e59f 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -118,7 +118,7 @@ class TagController extends Controller $tagName = $tag->tag; $this->repository->destroy($tag); - Session::flash('success', strval(trans('firefly.deleted_tag', ['tag' => e($tagName)]))); + Session::flash('success', strval(trans('firefly.deleted_tag', ['tag' => $tagName]))); Preferences::mark(); return redirect($this->getPreviousUri('tags.delete.uri')); @@ -262,7 +262,7 @@ class TagController extends Controller $data = $request->collectTagData(); $this->repository->store($data); - Session::flash('success', strval(trans('firefly.created_tag', ['tag' => e($data['tag'])]))); + Session::flash('success', strval(trans('firefly.created_tag', ['tag' => $data['tag']]))); Preferences::mark(); if (intval($request->get('create_another')) === 1) { @@ -288,7 +288,7 @@ class TagController extends Controller $data = $request->collectTagData(); $this->repository->update($tag, $data); - Session::flash('success', strval(trans('firefly.updated_tag', ['tag' => e($data['tag'])]))); + Session::flash('success', strval(trans('firefly.updated_tag', ['tag' => $data['tag']]))); Preferences::mark(); if (intval($request->get('return_to_edit')) === 1) { diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 00fdfd3128..29989bf223 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -222,7 +222,7 @@ class SingleController extends Controller } // @codeCoverageIgnoreEnd $type = $transactionJournal->transactionTypeStr(); - Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); + Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => $transactionJournal->description]))); $this->repository->delete($transactionJournal); @@ -355,7 +355,7 @@ class SingleController extends Controller event(new StoredTransactionJournal($journal, $data['piggy_bank_id'])); - Session::flash('success', strval(trans('firefly.stored_journal', ['description' => e($journal->description)]))); + Session::flash('success', strval(trans('firefly.stored_journal', ['description' => $journal->description]))); Preferences::mark(); // @codeCoverageIgnoreStart @@ -408,7 +408,7 @@ class SingleController extends Controller // update, get events by date and sort DESC $type = strtolower($journal->transactionTypeStr()); - Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['description'])]))); + Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => $data['description']]))); Preferences::mark(); // @codeCoverageIgnoreStart diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 1d35c2a45f..f658752ff6 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -161,7 +161,7 @@ class SplitController extends Controller // @codeCoverageIgnoreEnd $type = strtolower($journal->transactionTypeStr()); - Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => e($data['journal_description'])]))); + Session::flash('success', strval(trans('firefly.updated_' . $type, ['description' => $data['journal_description']]))); Preferences::mark(); // @codeCoverageIgnoreStart diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 59465552e1..6bc0a0d7bf 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -168,7 +168,7 @@ class TransactionController extends Controller $events = $tasker->getPiggyBankEvents($journal); $transactions = $tasker->getTransactionsOverview($journal); $what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type); - $subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"'; + $subTitle = trans('firefly.' . $what) . ' "' . $journal->description . '"'; return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions', 'linkTypes', 'links'));