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

Replace uri with url

Browse Source
This commit is contained in:
James Cole
2022-04-12 18:19:30 +02:00
parent ac5c11a8d7
commit 50f87a210a
101 changed files with 449 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Account/CreateController.php
View File

@@ -119,7 +119,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('accounts.create.fromStore')) {
$this->rememberPreviousUri('accounts.create.uri');
$this->rememberPreviousUrl('accounts.create.url');
}
$request->session()->forget('accounts.create.fromStore');
Log::channel('audit')->info('Creating new account.');
@@ -171,7 +171,7 @@ class CreateController extends Controller
}
// redirect to previous URL.
$redirect = redirect($this->getPreviousUri('accounts.create.uri'));
$redirect = redirect($this->getPreviousUrl('accounts.create.url'));
if (1 === (int) $request->get('create_another')) {
// set value so create routine will not overwrite URL:
$request->session()->put('accounts.create.fromStore', true);

4
app/Http/Controllers/Account/DeleteController.php
View File

@@ -82,7 +82,7 @@ class DeleteController extends Controller
unset($accountList[$account->id]);
// put previous url in session
$this->rememberPreviousUri('accounts.delete.uri');
$this->rememberPreviousUrl('accounts.delete.url');
return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
}
@@ -111,7 +111,7 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans(sprintf('firefly.%s_deleted', $typeName), ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('accounts.delete.uri'));
return redirect($this->getPreviousUrl('accounts.delete.url'));
}
}

4
app/Http/Controllers/Account/EditController.php
View File

@@ -118,7 +118,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('accounts.edit.fromUpdate')) {
$this->rememberPreviousUri('accounts.edit.uri');
$this->rememberPreviousUrl('accounts.edit.url');
}
$request->session()->forget('accounts.edit.fromUpdate');
@@ -211,7 +211,7 @@ class EditController extends Controller
}
// redirect
$redirect = redirect($this->getPreviousUri('accounts.edit.uri'));
$redirect = redirect($this->getPreviousUrl('accounts.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
// set value so edit routine will not overwrite URL:
$request->session()->put('accounts.edit.fromUpdate', true);

12
app/Http/Controllers/Account/ReconcileController.php
View File

@@ -134,9 +134,9 @@ class ReconcileController extends Controller
$subTitle = (string) trans('firefly.reconcile_account', ['account' => $account->name]);
// various links
$transactionsUri = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUri = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
$transactionsUrl = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']);
$overviewUrl = route('accounts.reconcile.overview', [$account->id, '%start%', '%end%']);
$indexUrl = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
$objectType = 'asset';
return view(
@@ -151,9 +151,9 @@ class ReconcileController extends Controller
'subTitle',
'startBalance',
'endBalance',
'transactionsUri',
'overviewUri',
'indexUri'
'transactionsUrl',
'overviewUrl',
'indexUrl'
)
);
}

8
app/Http/Controllers/Account/ShowController.php
View File

@@ -114,7 +114,7 @@ class ShowController extends Controller
$fStart = $start->isoFormat($this->monthAndDayFormat);
$fEnd = $end->isoFormat($this->monthAndDayFormat);
$subTitle = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]);
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
$periods = $this->getAccountPeriodOverview($account, $firstTransaction, $end);
@@ -152,7 +152,7 @@ class ShowController extends Controller
'subTitle',
'start',
'end',
'chartUri',
'chartUrl',
'location',
'balance'
)
@@ -194,7 +194,7 @@ class ShowController extends Controller
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page)->withAccountInformation()->withCategoryInformation();
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('accounts.show.all', [$account->id]));
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]);
$showAll = true;
$balance = app('steam')->balance($account, $end);
@@ -209,7 +209,7 @@ class ShowController extends Controller
'attachments',
'currency',
'today',
'chartUri',
'chartUrl',
'periods',
'subTitleIcon',
'groups',

12
app/Http/Controllers/Admin/LinkController.php
View File

@@ -76,7 +76,7 @@ class LinkController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('link-types.create.fromStore')) {
$this->rememberPreviousUri('link-types.create.uri');
$this->rememberPreviousUrl('link-types.create.url');
}
return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
@@ -113,7 +113,7 @@ class LinkController extends Controller
}
// put previous url in session
$this->rememberPreviousUri('link-types.delete.uri');
$this->rememberPreviousUrl('link-types.delete.url');
return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
}
@@ -136,7 +136,7 @@ class LinkController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_link_type', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('link-types.delete.uri'));
return redirect($this->getPreviousUrl('link-types.delete.url'));
}
/**
@@ -161,7 +161,7 @@ class LinkController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('link-types.edit.fromUpdate')) {
$this->rememberPreviousUri('link-types.edit.uri');
$this->rememberPreviousUrl('link-types.edit.url');
}
$request->session()->forget('link-types.edit.fromUpdate');
@@ -226,7 +226,7 @@ class LinkController extends Controller
Log::channel('audit')->info('User stored new link type.', $linkType->toArray());
$request->session()->flash('success', (string) trans('firefly.stored_new_link_type', ['name' => $linkType->name]));
$redirect = redirect($this->getPreviousUri('link-types.create.uri'));
$redirect = redirect($this->getPreviousUrl('link-types.create.url'));
if (1 === (int) $request->get('create_another')) {
// set value so create routine will not overwrite URL:
$request->session()->put('link-types.create.fromStore', true);
@@ -265,7 +265,7 @@ class LinkController extends Controller
$request->session()->flash('success', (string) trans('firefly.updated_link_type', ['name' => $linkType->name]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('link-types.edit.uri'));
$redirect = redirect($this->getPreviousUrl('link-types.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
// set value so edit routine will not overwrite URL:
$request->session()->put('link-types.edit.fromUpdate', true);

4
app/Http/Controllers/Admin/UserController.php
View File

@@ -117,7 +117,7 @@ class UserController extends Controller
}
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('users.edit.fromUpdate')) {
$this->rememberPreviousUri('users.edit.uri');
$this->rememberPreviousUrl('users.edit.url');
}
session()->forget('users.edit.fromUpdate');
@@ -217,7 +217,7 @@ class UserController extends Controller
session()->flash('success', (string) trans('firefly.updated_user', ['email' => $user->email]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('users.edit.uri'));
$redirect = redirect($this->getPreviousUrl('users.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('users.edit.fromUpdate', true);

8
app/Http/Controllers/AttachmentController.php
View File

@@ -77,7 +77,7 @@ class AttachmentController extends Controller
$subTitle = (string) trans('firefly.delete_attachment', ['name' => $attachment->filename]);
// put previous url in session
$this->rememberPreviousUri('attachments.delete.uri');
$this->rememberPreviousUrl('attachments.delete.url');
return view('attachments.delete', compact('attachment', 'subTitle'));
}
@@ -99,7 +99,7 @@ class AttachmentController extends Controller
$request->session()->flash('success', (string) trans('firefly.attachment_deleted', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('attachments.delete.uri'));
return redirect($this->getPreviousUrl('attachments.delete.url'));
}
/**
@@ -150,7 +150,7 @@ class AttachmentController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('attachments.edit.fromUpdate')) {
$this->rememberPreviousUri('attachments.edit.uri');
$this->rememberPreviousUrl('attachments.edit.url');
}
$request->session()->forget('attachments.edit.fromUpdate');
$preFilled = [
@@ -196,7 +196,7 @@ class AttachmentController extends Controller
$request->session()->flash('success', (string) trans('firefly.attachment_updated', ['name' => $attachment->filename]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('attachments.edit.uri'));
$redirect = redirect($this->getPreviousUrl('attachments.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
$request->session()->put('attachments.edit.fromUpdate', true);

8
app/Http/Controllers/Auth/LoginController.php
View File

@@ -169,11 +169,11 @@ class LoginController extends Controller
public function logout(Request $request)
{
$authGuard = config('firefly.authentication_guard');
$logoutUri = config('firefly.custom_logout_url');
if ('remote_user_guard' === $authGuard && '' !== $logoutUri) {
return redirect($logoutUri);
$logoutUrl = config('firefly.custom_logout_url');
if ('remote_user_guard' === $authGuard && '' !== $logoutUrl) {
return redirect($logoutUrl);
}
if ('remote_user_guard' === $authGuard && '' === $logoutUri) {
if ('remote_user_guard' === $authGuard && '' === $logoutUrl) {
session()->flash('error', trans('firefly.cant_logout_guard'));
}

2
app/Http/Controllers/Bill/CreateController.php
View File

@@ -84,7 +84,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('bills.create.fromStore')) {
$this->rememberPreviousUri('bills.create.uri');
$this->rememberPreviousUrl('bills.create.url');
}
$request->session()->forget('bills.create.fromStore');

4
app/Http/Controllers/Bill/DeleteController.php
View File

@@ -72,7 +72,7 @@ class DeleteController extends Controller
public function delete(Bill $bill)
{
// put previous url in session
$this->rememberPreviousUri('bills.delete.uri');
$this->rememberPreviousUrl('bills.delete.url');
$subTitle = (string) trans('firefly.delete_bill', ['name' => $bill->name]);
return view('bills.delete', compact('bill', 'subTitle'));
@@ -94,6 +94,6 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_bill', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('bills.delete.uri'));
return redirect($this->getPreviousUrl('bills.delete.url'));
}
}

4
app/Http/Controllers/Bill/EditController.php
View File

@@ -85,7 +85,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('bills.edit.fromUpdate')) {
$this->rememberPreviousUri('bills.edit.uri');
$this->rememberPreviousUrl('bills.edit.url');
}
$currency = app('amount')->getDefaultCurrency();
@@ -141,7 +141,7 @@ class EditController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('bills.edit.uri'));
$redirect = redirect($this->getPreviousUrl('bills.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {

4
app/Http/Controllers/Budget/CreateController.php
View File

@@ -98,7 +98,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('budgets.create.fromStore')) {
$this->rememberPreviousUri('budgets.create.uri');
$this->rememberPreviousUrl('budgets.create.url');
}
$request->session()->forget('budgets.create.fromStore');
$subTitle = (string) trans('firefly.create_new_budget');
@@ -136,7 +136,7 @@ class CreateController extends Controller
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('budgets.create.uri'));
$redirect = redirect($this->getPreviousUrl('budgets.create.url'));
if (1 === (int) $request->get('create_another')) {

4
app/Http/Controllers/Budget/DeleteController.php
View File

@@ -73,7 +73,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_budget', ['name' => $budget->name]);
// put previous url in session
$this->rememberPreviousUri('budgets.delete.uri');
$this->rememberPreviousUrl('budgets.delete.url');
return view('budgets.delete', compact('budget', 'subTitle'));
}
@@ -93,7 +93,7 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_budget', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('budgets.delete.uri'));
return redirect($this->getPreviousUrl('budgets.delete.url'));
}
}

4
app/Http/Controllers/Budget/EditController.php
View File

@@ -108,7 +108,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('budgets.edit.fromUpdate')) {
$this->rememberPreviousUri('budgets.edit.uri');
$this->rememberPreviousUrl('budgets.edit.url');
}
$request->session()->forget('budgets.edit.fromUpdate');
$request->session()->flash('preFilled', $preFilled);
@@ -133,7 +133,7 @@ class EditController extends Controller
$this->repository->cleanupBudgets();
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('budgets.edit.uri'));
$redirect = redirect($this->getPreviousUrl('budgets.edit.url'));
// store new attachment(s):
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;

2
app/Http/Controllers/Category/CreateController.php
View File

@@ -73,7 +73,7 @@ class CreateController extends Controller
public function create(Request $request)
{
if (true !== session('categories.create.fromStore')) {
$this->rememberPreviousUri('categories.create.uri');
$this->rememberPreviousUrl('categories.create.url');
}
$request->session()->forget('categories.create.fromStore');
$subTitle = (string) trans('firefly.create_new_category');

4
app/Http/Controllers/Category/DeleteController.php
View File

@@ -72,7 +72,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_category', ['name' => $category->name]);
// put previous url in session
$this->rememberPreviousUri('categories.delete.uri');
$this->rememberPreviousUrl('categories.delete.url');
return view('categories.delete', compact('category', 'subTitle'));
}
@@ -93,6 +93,6 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_category', ['name' => $name]));
app('preferences')->mark();
return redirect($this->getPreviousUri('categories.delete.uri'));
return redirect($this->getPreviousUrl('categories.delete.url'));
}
}

4
app/Http/Controllers/Category/EditController.php
View File

@@ -78,7 +78,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('categories.edit.fromUpdate')) {
$this->rememberPreviousUri('categories.edit.uri');
$this->rememberPreviousUrl('categories.edit.url');
}
$request->session()->forget('categories.edit.fromUpdate');
@@ -117,7 +117,7 @@ class EditController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('categories.edit.uri'));
$redirect = redirect($this->getPreviousUrl('categories.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {

6
app/Http/Controllers/Controller.php
View File

@@ -41,7 +41,7 @@ abstract class Controller extends BaseController
protected string $dateTimeFormat;
protected string $monthAndDayFormat;
protected string $monthFormat;
protected string $redirectUri = '/';
protected string $redirectUrl = '/';
/**
* Controller constructor.
@@ -63,10 +63,10 @@ abstract class Controller extends BaseController
// share custom auth guard info.
$authGuard = config('firefly.authentication_guard');
$logoutUri = config('firefly.custom_logout_url');
$logoutUrl = config('firefly.custom_logout_url');
app('view')->share('authGuard', $authGuard);
app('view')->share('logoutUri', $logoutUri);
app('view')->share('logoutUrl', $logoutUrl);
// upload size
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));

14
app/Http/Controllers/CurrencyController.php
View File

@@ -88,7 +88,7 @@ class CurrencyController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('currencies.create.fromStore')) {
$this->rememberPreviousUri('currencies.create.uri');
$this->rememberPreviousUrl('currencies.create.url');
}
$request->session()->forget('currencies.create.fromStore');
@@ -157,7 +157,7 @@ class CurrencyController extends Controller
}
// put previous url in session
$this->rememberPreviousUri('currencies.delete.uri');
$this->rememberPreviousUrl('currencies.delete.url');
$subTitle = (string) trans('form.delete_currency', ['name' => $currency->name]);
Log::channel('audit')->info(sprintf('Visit page to delete currency %s.', $currency->code));
@@ -204,7 +204,7 @@ class CurrencyController extends Controller
$request->session()->flash('success', (string) trans('firefly.deleted_currency', ['name' => $currency->name]));
return redirect($this->getPreviousUri('currencies.delete.uri'));
return redirect($this->getPreviousUrl('currencies.delete.url'));
}
/**
@@ -297,7 +297,7 @@ class CurrencyController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('currencies.edit.fromUpdate')) {
$this->rememberPreviousUri('currencies.edit.uri');
$this->rememberPreviousUrl('currencies.edit.url');
}
$request->session()->forget('currencies.edit.fromUpdate');
@@ -375,7 +375,7 @@ class CurrencyController extends Controller
Log::error('User ' . auth()->user()->id . ' is not admin, but tried to store a currency.');
Log::channel('audit')->info('Tried to create (POST) currency without admin rights.', $data);
return redirect($this->getPreviousUri('currencies.create.uri'));
return redirect($this->getPreviousUrl('currencies.create.url'));
}
@@ -388,7 +388,7 @@ class CurrencyController extends Controller
$request->session()->flash('error', (string) trans('firefly.could_not_store_currency'));
$currency = null;
}
$redirect = redirect($this->getPreviousUri('currencies.create.uri'));
$redirect = redirect($this->getPreviousUrl('currencies.create.url'));
if (null !== $currency) {
$request->session()->flash('success', (string) trans('firefly.created_currency', ['name' => $currency->name]));
@@ -443,6 +443,6 @@ class CurrencyController extends Controller
}
return redirect($this->getPreviousUri('currencies.edit.uri'));
return redirect($this->getPreviousUrl('currencies.edit.url'));
}
}

2
app/Http/Controllers/Json/ReconcileController.php
View File

@@ -168,7 +168,7 @@ class ReconcileController extends Controller
}
$return = [
'post_uri' => $route,
'post_url' => $route,
'html' => $view,
];

4
app/Http/Controllers/ObjectGroup/DeleteController.php
View File

@@ -72,7 +72,7 @@ class DeleteController extends Controller
$piggyBanks = $objectGroup->piggyBanks()->count();
// put previous url in session
$this->rememberPreviousUri('object-groups.delete.uri');
$this->rememberPreviousUrl('object-groups.delete.url');
return view('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
}
@@ -90,7 +90,7 @@ class DeleteController extends Controller
app('preferences')->mark();
$this->repository->destroy($objectGroup);
return redirect($this->getPreviousUri('object-groups.delete.uri'));
return redirect($this->getPreviousUrl('object-groups.delete.url'));
}
}

4
app/Http/Controllers/ObjectGroup/EditController.php
View File

@@ -75,7 +75,7 @@ class EditController extends Controller
$subTitleIcon = 'fa-pencil';
if (true !== session('object-groups.edit.fromUpdate')) {
$this->rememberPreviousUri('object-groups.edit.uri');
$this->rememberPreviousUrl('object-groups.edit.url');
}
session()->forget('object-groups.edit.fromUpdate');
@@ -98,7 +98,7 @@ class EditController extends Controller
session()->flash('success', (string) trans('firefly.updated_object_group', ['title' => $objectGroup->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('object-groups.edit.uri'));
$redirect = redirect($this->getPreviousUrl('object-groups.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {

4
app/Http/Controllers/PiggyBank/CreateController.php
View File

@@ -76,7 +76,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('piggy-banks.create.fromStore')) {
$this->rememberPreviousUri('piggy-banks.create.uri');
$this->rememberPreviousUrl('piggy-banks.create.url');
}
session()->forget('piggy-banks.create.fromStore');
@@ -115,7 +115,7 @@ class CreateController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('piggy-banks.create.uri'));
$redirect = redirect($this->getPreviousUrl('piggy-banks.create.url'));
if (1 === (int) $request->get('create_another')) {

4
app/Http/Controllers/PiggyBank/DeleteController.php
View File

@@ -72,7 +72,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]);
// put previous url in session
$this->rememberPreviousUri('piggy-banks.delete.uri');
$this->rememberPreviousUrl('piggy-banks.delete.url');
return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
}
@@ -90,6 +90,6 @@ class DeleteController extends Controller
app('preferences')->mark();
$this->piggyRepos->destroy($piggyBank);
return redirect($this->getPreviousUri('piggy-banks.delete.uri'));
return redirect($this->getPreviousUrl('piggy-banks.delete.url'));
}
}

4
app/Http/Controllers/PiggyBank/EditController.php
View File

@@ -102,7 +102,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('piggy-banks.edit.fromUpdate')) {
$this->rememberPreviousUri('piggy-banks.edit.uri');
$this->rememberPreviousUrl('piggy-banks.edit.url');
}
session()->forget('piggy-banks.edit.fromUpdate');
@@ -138,7 +138,7 @@ class EditController extends Controller
if (count($this->attachments->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('piggy-banks.edit.uri'));
$redirect = redirect($this->getPreviousUrl('piggy-banks.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {

6
app/Http/Controllers/Recurring/CreateController.php
View File

@@ -94,7 +94,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('recurring.create.fromStore')) {
$this->rememberPreviousUri('recurring.create.uri');
$this->rememberPreviousUrl('recurring.create.url');
}
$request->session()->forget('recurring.create.fromStore');
$repetitionEnds = [
@@ -139,7 +139,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('recurring.create.fromStore')) {
$this->rememberPreviousUri('recurring.create.uri');
$this->rememberPreviousUrl('recurring.create.url');
}
$request->session()->forget('recurring.create.fromStore');
$repetitionEnds = [
@@ -253,7 +253,7 @@ class CreateController extends Controller
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('recurring.create.uri'));
$redirect = redirect($this->getPreviousUrl('recurring.create.url'));
if (1 === (int) $request->get('create_another')) {
// set value so create routine will not overwrite URL:
$request->session()->put('recurring.create.fromStore', true);

4
app/Http/Controllers/Recurring/DeleteController.php
View File

@@ -73,7 +73,7 @@ class DeleteController extends Controller
{
$subTitle = (string) trans('firefly.delete_recurring', ['title' => $recurrence->title]);
// put previous url in session
$this->rememberPreviousUri('recurrences.delete.uri');
$this->rememberPreviousUrl('recurrences.delete.url');
$journalsCreated = $this->recurring->getTransactions($recurrence)->count();
@@ -95,7 +95,7 @@ class DeleteController extends Controller
$request->session()->flash('success', (string) trans('firefly.' . 'recurrence_deleted', ['title' => $recurrence->title]));
app('preferences')->mark();
return redirect($this->getPreviousUri('recurrences.delete.uri'));
return redirect($this->getPreviousUrl('recurrences.delete.url'));
}
}

4
app/Http/Controllers/Recurring/EditController.php
View File

@@ -112,7 +112,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('recurrences.edit.fromUpdate')) {
$this->rememberPreviousUri('recurrences.edit.uri');
$this->rememberPreviousUrl('recurrences.edit.url');
}
$request->session()->forget('recurrences.edit.fromUpdate');
@@ -186,7 +186,7 @@ class EditController extends Controller
$request->session()->flash('info', $this->attachments->getMessages()->get('attachments'));
}
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('recurrences.edit.uri'));
$redirect = redirect($this->getPreviousUrl('recurrences.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
// set value so edit routine will not overwrite URL:
$request->session()->put('recurrences.edit.fromUpdate', true);

4
app/Http/Controllers/ReportController.php
View File

@@ -377,7 +377,7 @@ class ReportController extends Controller
return view('error')->with('message', (string) trans('firefly.end_after_start_date'));
}
$uri = match ($reportType) {
$url = match ($reportType) {
default => route('reports.report.default', [$accounts, $start, $end]),
'category' => route('reports.report.category', [$accounts, $categories, $start, $end]),
'audit' => route('reports.report.audit', [$accounts, $start, $end]),
@@ -386,7 +386,7 @@ class ReportController extends Controller
'double' => route('reports.report.double', [$accounts, $double, $start, $end]),
};
return redirect($uri);
return redirect($url);
}
/**

10
app/Http/Controllers/Rule/CreateController.php
View File

@@ -122,7 +122,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
$this->rememberPreviousUrl('rules.create.url');
}
session()->forget('rules.create.fromStore');
@@ -175,7 +175,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
$this->rememberPreviousUrl('rules.create.url');
}
session()->forget('rules.create.fromStore');
@@ -225,7 +225,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rules.create.fromStore')) {
$this->rememberPreviousUri('rules.create.uri');
$this->rememberPreviousUrl('rules.create.url');
}
session()->forget('rules.create.fromStore');
@@ -272,10 +272,10 @@ class CreateController extends Controller
// redirect to new bill creation.
if ((int) $request->get('bill_id') > 0) {
return redirect($this->getPreviousUri('bills.create.uri'));
return redirect($this->getPreviousUrl('bills.create.url'));
}
$redirect = redirect($this->getPreviousUri('rules.create.uri'));
$redirect = redirect($this->getPreviousUrl('rules.create.url'));
if (1 === (int) $request->get('create_another')) {

4
app/Http/Controllers/Rule/DeleteController.php
View File

@@ -71,7 +71,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_rule', ['title' => $rule->title]);
// put previous url in session
$this->rememberPreviousUri('rules.delete.uri');
$this->rememberPreviousUrl('rules.delete.url');
return view('rules.rule.delete', compact('rule', 'subTitle'));
}
@@ -91,7 +91,7 @@ class DeleteController extends Controller
session()->flash('success', (string) trans('firefly.deleted_rule', ['title' => $title]));
app('preferences')->mark();
return redirect($this->getPreviousUri('rules.delete.uri'));
return redirect($this->getPreviousUrl('rules.delete.url'));
}
}

4
app/Http/Controllers/Rule/EditController.php
View File

@@ -127,7 +127,7 @@ class EditController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rules.edit.fromUpdate')) {
$this->rememberPreviousUri('rules.edit.uri');
$this->rememberPreviousUrl('rules.edit.url');
}
session()->forget('rules.edit.fromUpdate');
@@ -193,7 +193,7 @@ class EditController extends Controller
session()->flash('success', (string) trans('firefly.updated_rule', ['title' => $rule->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('rules.edit.uri'));
$redirect = redirect($this->getPreviousUrl('rules.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('rules.edit.fromUpdate', true);

4
app/Http/Controllers/RuleGroup/CreateController.php
View File

@@ -72,7 +72,7 @@ class CreateController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('rule-groups.create.fromStore')) {
$this->rememberPreviousUri('rule-groups.create.uri');
$this->rememberPreviousUrl('rule-groups.create.url');
}
session()->forget('rule-groups.create.fromStore');
@@ -94,7 +94,7 @@ class CreateController extends Controller
session()->flash('success', (string) trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('rule-groups.create.uri'));
$redirect = redirect($this->getPreviousUrl('rule-groups.create.url'));
if (1 === (int) $request->get('create_another')) {
session()->put('rule-groups.create.fromStore', true);

4
app/Http/Controllers/RuleGroup/DeleteController.php
View File

@@ -73,7 +73,7 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]);
// put previous url in session
$this->rememberPreviousUri('rule-groups.delete.uri');
$this->rememberPreviousUrl('rule-groups.delete.url');
return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
}
@@ -97,7 +97,7 @@ class DeleteController extends Controller
session()->flash('success', (string) trans('firefly.deleted_rule_group', ['title' => $title]));
app('preferences')->mark();
return redirect($this->getPreviousUri('rule-groups.delete.uri'));
return redirect($this->getPreviousUrl('rule-groups.delete.url'));
}
}

4
app/Http/Controllers/RuleGroup/EditController.php
View File

@@ -80,7 +80,7 @@ class EditController extends Controller
];
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rule-groups.edit.fromUpdate')) {
$this->rememberPreviousUri('rule-groups.edit.uri');
$this->rememberPreviousUrl('rule-groups.edit.url');
}
session()->forget('rule-groups.edit.fromUpdate');
session()->flash('preFilled', $preFilled);
@@ -140,7 +140,7 @@ class EditController extends Controller
session()->flash('success', (string) trans('firefly.updated_rule_group', ['title' => $ruleGroup->title]));
app('preferences')->mark();
$redirect = redirect($this->getPreviousUri('rule-groups.edit.uri'));
$redirect = redirect($this->getPreviousUrl('rule-groups.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('rule-groups.edit.fromUpdate', true);

14
app/Http/Controllers/TagController.php
View File

@@ -52,7 +52,7 @@ class TagController extends Controller
public function __construct()
{
parent::__construct();
$this->redirectUri = route('tags.index');
$this->redirectUrl = route('tags.index');
$this->middleware(
function ($request, $next) {
@@ -90,7 +90,7 @@ class TagController extends Controller
// put previous url in session if not redirect from store (not "create another").
if (true !== session('tags.create.fromStore')) {
$this->rememberPreviousUri('tags.create.uri');
$this->rememberPreviousUrl('tags.create.url');
}
session()->forget('tags.create.fromStore');
@@ -109,7 +109,7 @@ class TagController extends Controller
$subTitle = (string) trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]);
// put previous url in session
$this->rememberPreviousUri('tags.delete.uri');
$this->rememberPreviousUrl('tags.delete.url');
return view('tags.delete', compact('tag', 'subTitle'));
}
@@ -129,7 +129,7 @@ class TagController extends Controller
session()->flash('success', (string) trans('firefly.deleted_tag', ['tag' => $tagName]));
app('preferences')->mark();
return redirect($this->getPreviousUri('tags.delete.uri'));
return redirect($this->getPreviousUrl('tags.delete.url'));
}
/**
@@ -160,7 +160,7 @@ class TagController extends Controller
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('tags.edit.fromUpdate')) {
$this->rememberPreviousUri('tags.edit.uri');
$this->rememberPreviousUrl('tags.edit.url');
}
session()->forget('tags.edit.fromUpdate');
@@ -333,7 +333,7 @@ class TagController extends Controller
if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('tags.create.uri'));
$redirect = redirect($this->getPreviousUrl('tags.create.url'));
if (1 === (int) $request->get('create_another')) {
session()->put('tags.create.fromStore', true);
@@ -374,7 +374,7 @@ class TagController extends Controller
if (count($this->attachmentsHelper->getMessages()->get('attachments')) > 0) {
$request->session()->flash('info', $this->attachmentsHelper->getMessages()->get('attachments'));
}
$redirect = redirect($this->getPreviousUri('tags.edit.uri'));
$redirect = redirect($this->getPreviousUrl('tags.edit.url'));
if (1 === (int) $request->get('return_to_edit')) {
session()->put('tags.edit.fromUpdate', true);

4
app/Http/Controllers/Transaction/BulkController.php
View File

@@ -76,7 +76,7 @@ class BulkController extends Controller
{
$subTitle = (string) trans('firefly.mass_bulk_journals');
$this->rememberPreviousUri('transactions.bulk-edit.uri');
$this->rememberPreviousUrl('transactions.bulk-edit.url');
// make amounts positive.
@@ -121,7 +121,7 @@ class BulkController extends Controller
$request->session()->flash('success', (string) trans_choice('firefly.mass_edited_transactions_success', $count));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.bulk-edit.uri'));
return redirect($this->getPreviousUrl('transactions.bulk-edit.url'));
}
/**

2
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -121,7 +121,7 @@ class CreateController extends Controller
$allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency();
$previousUrl = $this->rememberPreviousUri('transactions.create.uri');
$previousUrl = $this->rememberPreviousUrl('transactions.create.url');
$parts = parse_url($previousUrl);
$search = sprintf('?%s', $parts['query'] ?? '');
$previousUrl = str_replace($search, '', $previousUrl);

6
app/Http/Controllers/Transaction/DeleteController.php
View File

@@ -85,8 +85,8 @@ class DeleteController extends Controller
$subTitle = (string) trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]);
$previous = app('steam')->getSafePreviousUrl(route('index'));
// put previous url in session
Log::debug('Will try to remember previous URI');
$this->rememberPreviousUri('transactions.delete.uri');
Log::debug('Will try to remember previous URL');
$this->rememberPreviousUrl('transactions.delete.url');
return view('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
}
@@ -115,6 +115,6 @@ class DeleteController extends Controller
app('preferences')->mark();
return redirect($this->getPreviousUri('transactions.delete.uri'));
return redirect($this->getPreviousUrl('transactions.delete.url'));
}
}

2
app/Http/Controllers/Transaction/EditController.php
View File

@@ -80,7 +80,7 @@ class EditController extends Controller
$defaultCurrency = app('amount')->getDefaultCurrency();
$cash = $repository->getCashAccount();
$previousUrl = $this->rememberPreviousUri('transactions.edit.uri');
$previousUrl = $this->rememberPreviousUrl('transactions.edit.url');
$parts = parse_url($previousUrl);
$search = sprintf('?%s', $parts['query'] ?? '');
$previousUrl = str_replace($search, '', $previousUrl);

4
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -76,7 +76,7 @@ class LinkController extends Controller
{
$subTitleIcon = 'fa-link';
$subTitle = (string) trans('breadcrumbs.delete_journal_link');
$this->rememberPreviousUri('journal_links.delete.uri');
$this->rememberPreviousUrl('journal_links.delete.url');
return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
}
@@ -95,7 +95,7 @@ class LinkController extends Controller
session()->flash('success', (string) trans('firefly.deleted_link'));
app('preferences')->mark();
return redirect((string) session('journal_links.delete.uri'));
return redirect((string) session('journal_links.delete.url'));
}
/**

8
app/Http/Controllers/Transaction/MassController.php
View File

@@ -82,7 +82,7 @@ class MassController extends Controller
$subTitle = (string) trans('firefly.mass_delete_journals');
// put previous url in session
$this->rememberPreviousUri('transactions.mass-delete.uri');
$this->rememberPreviousUrl('transactions.mass-delete.url');
return view('transactions.mass.delete', compact('journals', 'subTitle'));
}
@@ -115,7 +115,7 @@ class MassController extends Controller
session()->flash('success', (string) trans_choice('firefly.mass_deleted_transactions_success', $count));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-delete.uri'));
return redirect($this->getPreviousUrl('transactions.mass-delete.url'));
}
/**
@@ -151,7 +151,7 @@ class MassController extends Controller
null : app('steam')->positive($journal['foreign_amount']);
}
$this->rememberPreviousUri('transactions.mass-edit.uri');
$this->rememberPreviousUrl('transactions.mass-edit.url');
return view('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
}
@@ -187,7 +187,7 @@ class MassController extends Controller
session()->flash('success', (string) trans_choice('firefly.mass_edited_transactions_success', $count));
// redirect to previous URL:
return redirect($this->getPreviousUri('transactions.mass-edit.uri'));
return redirect($this->getPreviousUrl('transactions.mass-edit.url'));
}
/**