mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Cleaned up some routes, added a filter for the date range.
This commit is contained in:
parent
41079aad77
commit
6e7ea89c70
@ -8,7 +8,7 @@ return [
|
||||
'connection' => null,
|
||||
'table' => 'sessions',
|
||||
'lottery' => array(2, 100),
|
||||
'cookie' => 'laravel_session',
|
||||
'cookie' => 'firefly_session',
|
||||
'path' => '/',
|
||||
'domain' => null,
|
||||
'secure' => false,
|
||||
|
@ -1,26 +1,20 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Application & Route Filters
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Below you will find the "before" and "after" events for the application
|
||||
| which may be used to do any work before or after a request into your
|
||||
| application. Here you may also register your custom route filters.
|
||||
|
|
||||
*/
|
||||
|
||||
App::before(function($request)
|
||||
{
|
||||
//
|
||||
});
|
||||
|
||||
|
||||
App::after(function($request, $response)
|
||||
{
|
||||
//
|
||||
});
|
||||
App::before(
|
||||
function ($request) {
|
||||
if (Auth::check()) {
|
||||
\Firefly\Helper\Toolkit\Toolkit::getDateRange();
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
App::after(
|
||||
function ($request, $response) {
|
||||
//
|
||||
}
|
||||
);
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -33,26 +27,24 @@ App::after(function($request, $response)
|
||||
|
|
||||
*/
|
||||
|
||||
Route::filter('auth', function()
|
||||
{
|
||||
if (Auth::guest())
|
||||
{
|
||||
if (Request::ajax())
|
||||
{
|
||||
return Response::make('Unauthorized', 401);
|
||||
}
|
||||
else
|
||||
{
|
||||
return Redirect::guest('login');
|
||||
}
|
||||
}
|
||||
});
|
||||
Route::filter(
|
||||
'auth', function () {
|
||||
if (Auth::guest()) {
|
||||
if (Request::ajax()) {
|
||||
return Response::make('Unauthorized', 401);
|
||||
} else {
|
||||
return Redirect::guest('login');
|
||||
}
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
Route::filter('auth.basic', function()
|
||||
{
|
||||
return Auth::basic();
|
||||
});
|
||||
Route::filter(
|
||||
'auth.basic', function () {
|
||||
return Auth::basic();
|
||||
}
|
||||
);
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -65,10 +57,13 @@ Route::filter('auth.basic', function()
|
||||
|
|
||||
*/
|
||||
|
||||
Route::filter('guest', function()
|
||||
{
|
||||
if (Auth::check()) return Redirect::to('/');
|
||||
});
|
||||
Route::filter(
|
||||
'guest', function () {
|
||||
if (Auth::check()) {
|
||||
return Redirect::to('/');
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
@ -81,10 +76,10 @@ Route::filter('guest', function()
|
||||
|
|
||||
*/
|
||||
|
||||
Route::filter('csrf', function()
|
||||
{
|
||||
if (Session::token() != Input::get('_token'))
|
||||
{
|
||||
throw new Illuminate\Session\TokenMismatchException;
|
||||
}
|
||||
});
|
||||
Route::filter(
|
||||
'csrf', function () {
|
||||
if (Session::token() != Input::get('_token')) {
|
||||
throw new Illuminate\Session\TokenMismatchException;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
@ -26,6 +26,11 @@ Route::group(['before' => 'auth'], function () {
|
||||
Route::get('/accounts/create', ['uses' => 'AccountController@create', 'as' => 'accounts.create']);
|
||||
Route::get('/accounts/{account}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
|
||||
|
||||
// JSON controller:
|
||||
Route::get('/json/beneficiaries', ['uses' => 'JsonController@beneficiaries', 'as' => 'json.beneficiaries']);
|
||||
Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']);
|
||||
|
||||
|
||||
// transaction controller:
|
||||
Route::get('/transactions/add/withdrawal', ['uses' => 'TransactionController@createWithdrawal', 'as' => 'transactions.withdrawal']);
|
||||
Route::get('/transactions/add/deposit', ['uses' => 'TransactionController@createDeposit', 'as' => 'transactions.deposit']);
|
||||
|
Loading…
Reference in New Issue
Block a user