IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup redirect code.

Browse Source
This commit is contained in:
James Cole 2015-07-06 16:27:21 +02:00
parent c1f142af78
commit ab53cdb896
13 changed files with 55 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AccountController.php
View File

@ -8,7 +8,6 @@ use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Session;
use Steam;
use URL;
@ -89,7 +88,7 @@ class AccountController extends Controller
Session::flash('success', trans('firefly.' . $typeName . '_deleted', ['name' => $name]));
Preferences::mark();
return Redirect::to(Session::get('accounts.delete.url'));
return redirect(Session::get('accounts.delete.url'));
}
/**

16
app/Http/Controllers/BillController.php
View File

@ -7,7 +7,6 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Session;
use URL;
use View;
@ -79,8 +78,7 @@ class BillController extends Controller
Session::flash('success', 'The bill was deleted.');
Preferences::mark();
return Redirect::to(Session::get('bills.delete.url'));
return redirect(Session::get('bills.delete.url'));
}
/**
@ -133,7 +131,7 @@ class BillController extends Controller
if (intval($bill->active) == 0) {
Session::flash('warning', 'Inactive bills cannot be scanned.');
return Redirect::to(URL::previous());
return redirect(URL::previous());
}
$journals = $repository->getPossiblyRelatedJournals($bill);
@ -146,7 +144,7 @@ class BillController extends Controller
Session::flash('success', 'Rescanned everything.');
Preferences::mark();
return Redirect::to(URL::previous());
return redirect(URL::previous());
}
/**
@ -182,11 +180,11 @@ class BillController extends Controller
// set value so create routine will not overwrite URL:
Session::put('bills.create.fromStore', true);
return Redirect::route('bills.create')->withInput();
return redirect(route('bills.create'))->withInput();
}
// redirect to previous URL.
return Redirect::to(Session::get('bills.create.url'));
return redirect(Session::get('bills.create.url'));
}
@ -209,11 +207,11 @@ class BillController extends Controller
// set value so edit routine will not overwrite URL:
Session::put('bills.edit.fromUpdate', true);
return Redirect::route('bills.edit', [$bill->id])->withInput(['return_to_edit' => 1]);
return redirect(route('bills.edit', [$bill->id]))->withInput(['return_to_edit' => 1]);
}
// redirect to previous URL.
return Redirect::to(Session::get('bills.edit.url'));
return redirect(Session::get('bills.edit.url'));
}

13
app/Http/Controllers/BudgetController.php
View File

@ -9,7 +9,6 @@ use FireflyIII\Models\LimitRepetition;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Response;
use Session;
use URL;
@ -106,7 +105,7 @@ class BudgetController extends Controller
Preferences::mark();
return Redirect::to(Session::get('budgets.delete.url'));
return redirect(Session::get('budgets.delete.url'));
}
/**
@ -200,7 +199,7 @@ class BudgetController extends Controller
Preferences::set('budgetIncomeTotal' . $date, intval(Input::get('amount')));
Preferences::mark();
return Redirect::route('budgets.index');
return redirect(route('budgets.index'));
}
/**
@ -254,11 +253,11 @@ class BudgetController extends Controller
// set value so create routine will not overwrite URL:
Session::put('budgets.create.fromStore', true);
return Redirect::route('budgets.create')->withInput();
return redirect(route('budgets.create'))->withInput();
}
// redirect to previous URL.
return Redirect::to(Session::get('budgets.create.url'));
return redirect(Session::get('budgets.create.url'));
}
@ -285,11 +284,11 @@ class BudgetController extends Controller
// set value so edit routine will not overwrite URL:
Session::put('budgets.edit.fromUpdate', true);
return Redirect::route('budgets.edit', [$budget->id])->withInput(['return_to_edit' => 1]);
return redirect(route('budgets.edit', [$budget->id]))->withInput(['return_to_edit' => 1]);
}
// redirect to previous URL.
return Redirect::to(Session::get('budgets.edit.url'));
return redirect(Session::get('budgets.edit.url'));
}

11
app/Http/Controllers/CategoryController.php
View File

@ -8,7 +8,6 @@ use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use Illuminate\Pagination\LengthAwarePaginator;
use Input;
use Preferences;
use Redirect;
use Session;
use URL;
use View;
@ -80,7 +79,7 @@ class CategoryController extends Controller
Session::flash('success', 'The category "' . e($name) . '" was deleted.');
Preferences::mark();
return Redirect::to(Session::get('categories.delete.url'));
return redirect(Session::get('categories.delete.url'));
}
/**
@ -178,10 +177,10 @@ class CategoryController extends Controller
if (intval(Input::get('create_another')) === 1) {
Session::put('categories.create.fromStore', true);
return Redirect::route('categories.create')->withInput();
return redirect(route('categories.create'))->withInput();
}
return Redirect::route('categories.index');
return redirect(route('categories.index'));
}
@ -206,11 +205,11 @@ class CategoryController extends Controller
if (intval(Input::get('return_to_edit')) === 1) {
Session::put('categories.edit.fromUpdate', true);
return Redirect::route('categories.edit', [$category->id]);
return redirect(route('categories.edit', [$category->id]));
}
// redirect to previous URL.
return Redirect::to(Session::get('categories.edit.url'));
return redirect(Session::get('categories.edit.url'));
}

1
app/Http/Controllers/CsvController.php
View File

@ -12,7 +12,6 @@ use Illuminate\Http\Request;
use Input;
use Log;
use Preferences;
use Redirect;
use Session;
use View;

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

@ -7,7 +7,6 @@ use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Session;
use URL;
use View;
@ -65,7 +64,7 @@ class CurrencyController extends Controller
Cache::forget('FFCURRENCYSYMBOL');
Cache::forget('FFCURRENCYCODE');
return Redirect::route('currency.index');
return redirect(route('currency.index'));
}
@ -81,7 +80,7 @@ class CurrencyController extends Controller
if ($repository->countJournals($currency) > 0) {
Session::flash('error', 'Cannot delete ' . e($currency->name) . ' because there are still transactions attached to it.');
return Redirect::route('currency.index');
return redirect(route('currency.index'));
}
// put previous url in session
@ -106,7 +105,7 @@ class CurrencyController extends Controller
if ($repository->countJournals($currency) > 0) {
Session::flash('error', 'Cannot destroy ' . e($currency->name) . ' because there are still transactions attached to it.');
return Redirect::route('currency.index');
return redirect(route('currency.index'));
}
Session::flash('success', 'Currency "' . e($currency->name) . '" deleted');
@ -114,7 +113,7 @@ class CurrencyController extends Controller
$currency->delete();
}
return Redirect::to(Session::get('currency.delete.url'));
return redirect(Session::get('currency.delete.url'));
}
/**
@ -178,11 +177,11 @@ class CurrencyController extends Controller
if (intval(Input::get('create_another')) === 1) {
Session::put('currency.create.fromStore', true);
return Redirect::route('currency.create')->withInput();
return redirect(route('currency.create'))->withInput();
}
// redirect to previous URL.
return Redirect::to(Session::get('currency.create.url'));
return redirect(Session::get('currency.create.url'));
}
@ -207,11 +206,11 @@ class CurrencyController extends Controller
if (intval(Input::get('return_to_edit')) === 1) {
Session::put('currency.edit.fromUpdate', true);
return Redirect::route('currency.edit', [$currency->id]);
return redirect(route('currency.edit', [$currency->id]));
}
// redirect to previous URL.
return Redirect::to(Session::get('currency.edit.url'));
return redirect(Session::get('currency.edit.url'));
}

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

@ -7,7 +7,6 @@ use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Route;
use Session;
use Steam;
@ -57,10 +56,9 @@ class HomeController extends Controller
}
Session::clear();
return Redirect::route('index');
return redirect(route('index'));
}
/**
@ -75,7 +73,7 @@ class HomeController extends Controller
if ($count == 0) {
return Redirect::route('new-user.index');
return redirect(route('new-user.index'));
}
$title = 'Firefly';
@ -127,7 +125,7 @@ class HomeController extends Controller
if (!Auth::user()->hasRole('owner')) {
Session::flash('warning', 'This page is broken.');
return Redirect::route('index');
return redirect(route('index'));
}
// get all routes:

5
app/Http/Controllers/NewUserController.php
View File

@ -7,7 +7,6 @@ use FireflyIII\Http\Requests\NewUserFormRequest;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Preferences;
use Redirect;
use Session;
use View;
@ -35,7 +34,7 @@ class NewUserController extends Controller
$count = $repository->countAccounts($types);
if ($count > 0) {
return Redirect::route('index');
return redirect(route('index'));
}
@ -106,6 +105,6 @@ class NewUserController extends Controller
Session::flash('success', 'New account(s) created!');
Preferences::mark();
return Redirect::route('index');
return redirect(route('index'));
}
}

15
app/Http/Controllers/PiggyBankController.php
View File

@ -11,7 +11,6 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Support\Collection;
use Input;
use Preferences;
use Redirect;
use Session;
use Steam;
use URL;
@ -112,7 +111,7 @@ class PiggyBankController extends Controller
Preferences::mark();
$repository->destroy($piggyBank);
return Redirect::to(Session::get('piggy-banks.delete.url'));
return redirect(Session::get('piggy-banks.delete.url'));
}
/**
@ -246,7 +245,7 @@ class PiggyBankController extends Controller
Session::flash('error', 'Could not add ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".');
}
return Redirect::route('piggy-banks.index');
return redirect(route('piggy-banks.index'));
}
/**
@ -275,7 +274,7 @@ class PiggyBankController extends Controller
Session::flash('error', 'Could not remove ' . Amount::format($amount, false) . ' from "' . e($piggyBank->name) . '".');
}
return Redirect::route('piggy-banks.index');
return redirect(route('piggy-banks.index'));
}
/**
@ -331,12 +330,12 @@ class PiggyBankController extends Controller
if (intval(Input::get('create_another')) === 1) {
Session::put('piggy-banks.create.fromStore', true);
return Redirect::route('piggy-banks.create')->withInput();
return redirect(route('piggy-banks.create'))->withInput();
}
// redirect to previous URL.
return Redirect::to(Session::get('piggy-banks.create.url'));
return redirect(Session::get('piggy-banks.create.url'));
}
/**
@ -366,12 +365,12 @@ class PiggyBankController extends Controller
if (intval(Input::get('return_to_edit')) === 1) {
Session::put('piggy-banks.edit.fromUpdate', true);
return Redirect::route('piggy-banks.edit', [$piggyBank->id]);
return redirect(route('piggy-banks.edit', [$piggyBank->id]));
}
// redirect to previous URL.
return Redirect::to(Session::get('piggy-banks.edit.url'));
return redirect(Session::get('piggy-banks.edit.url'));
}

3
app/Http/Controllers/PreferencesController.php
View File

@ -4,7 +4,6 @@ use Config;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Session;
use View;
@ -79,7 +78,7 @@ class PreferencesController extends Controller
Session::flash('success', 'Preferences saved!');
Preferences::mark();
return Redirect::route('preferences');
return redirect(route('preferences'));
}
}

11
app/Http/Controllers/ProfileController.php
View File

@ -5,7 +5,6 @@ use FireflyIII\Http\Requests;
use FireflyIII\Http\Requests\DeleteAccountFormRequest;
use FireflyIII\Http\Requests\ProfileFormRequest;
use Hash;
use Redirect;
use Session;
/**
@ -56,13 +55,13 @@ class ProfileController extends Controller
if (!Hash::check($request->get('current_password'), Auth::user()->password)) {
Session::flash('error', 'Invalid current password!');
return Redirect::route('profile.change-password');
return redirect(route('profile.change-password'));
}
$result = $this->validatePassword($request->get('current_password'), $request->get('new_password'));
if (!($result === true)) {
Session::flash('error', $result);
return Redirect::route('profile.change-password');
return redirect(route('profile.change-password'));
}
// update the user with the new password.
@ -71,7 +70,7 @@ class ProfileController extends Controller
Session::flash('success', 'Password changed!');
return Redirect::route('profile');
return redirect(route('profile'));
}
/**
@ -103,7 +102,7 @@ class ProfileController extends Controller
if (!Hash::check($request->get('password'), Auth::user()->password)) {
Session::flash('error', 'Invalid password!');
return Redirect::route('profile.delete-account');
return redirect(route('profile.delete-account'));
}
// DELETE!
@ -112,7 +111,7 @@ class ProfileController extends Controller
Session::flash('gaEventCategory', 'user');
Session::flash('gaEventAction', 'delete-account');
return Redirect::route('index');
return redirect(route('index'));
}

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

@ -10,7 +10,6 @@ use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Response;
use Session;
use URL;
@ -108,7 +107,7 @@ class TagController extends Controller
Session::flash('success', 'Tag "' . e($tagName) . '" was deleted.');
Preferences::mark();
return Redirect::to(route('tags.index'));
return redirect(route('tags.index'));
}
/**
@ -248,11 +247,11 @@ class TagController extends Controller
// set value so create routine will not overwrite URL:
Session::put('tags.create.fromStore', true);
return Redirect::route('tags.create')->withInput();
return redirect(route('tags.create'))->withInput();
}
// redirect to previous URL.
return Redirect::to(Session::get('tags.create.url'));
return redirect(Session::get('tags.create.url'));
}
@ -295,10 +294,10 @@ class TagController extends Controller
// set value so edit routine will not overwrite URL:
Session::put('tags.edit.fromUpdate', true);
return Redirect::route('tags.edit', [$tag->id])->withInput(['return_to_edit' => 1]);
return redirect(route('tags.edit', [$tag->id]))->withInput(['return_to_edit' => 1]);
}
// redirect to previous URL.
return Redirect::to(Session::get('tags.edit.url'));
return redirect(Session::get('tags.edit.url'));
}
}

11
app/Http/Controllers/TransactionController.php
View File

@ -12,7 +12,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
use Input;
use Preferences;
use Redirect;
use Response;
use Session;
use URL;
@ -108,7 +107,7 @@ class TransactionController extends Controller
Preferences::mark();
// redirect to previous URL:
return Redirect::to(Session::get('transactions.delete.url'));
return redirect(Session::get('transactions.delete.url'));
}
/**
@ -295,11 +294,11 @@ class TransactionController extends Controller
// set value so create routine will not overwrite URL:
Session::put('transactions.create.fromStore', true);
return Redirect::route('transactions.create', [$request->input('what')])->withInput();
return redirect(route('transactions.create', [$request->input('what')]))->withInput();
}
// redirect to previous URL.
return Redirect::to(Session::get('transactions.create.url'));
return redirect(Session::get('transactions.create.url'));
}
@ -327,11 +326,11 @@ class TransactionController extends Controller
// set value so edit routine will not overwrite URL:
Session::put('transactions.edit.fromUpdate', true);
return Redirect::route('transactions.edit', [$journal->id])->withInput(['return_to_edit' => 1]);
return redirect(route('transactions.edit', [$journal->id]))->withInput(['return_to_edit' => 1]);
}
// redirect to previous URL.
return Redirect::to(Session::get('transactions.edit.url'));
return redirect(Session::get('transactions.edit.url'));
}