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

Cleaned up some routes, added a filter for the date range.

Browse Source
This commit is contained in:
James Cole
2014-07-15 06:57:20 +02:00
parent 41079aad77
commit 6e7ea89c70
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/session.php
View File

@@ -8,7 +8,7 @@ return [
'connection' => null, 'connection' => null,
'table' => 'sessions', 'table' => 'sessions',
'lottery' => array(2, 100), 'lottery' => array(2, 100),
'cookie' => 'laravel_session', 'cookie' => 'firefly_session',
'path' => '/', 'path' => '/',
'domain' => null, 'domain' => null,
'secure' => false, 'secure' => false,

77
app/filters.php
View File

@@ -1,26 +1,20 @@
<?php <?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::before(
function ($request) {
if (Auth::check()) {
\Firefly\Helper\Toolkit\Toolkit::getDateRange();
}
}
);
App::after(
function ($request, $response) {
// //
}); }
);
App::after(function($request, $response)
{
//
});
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@@ -33,26 +27,24 @@ App::after(function($request, $response)
| |
*/ */
Route::filter('auth', function() Route::filter(
{ 'auth', function () {
if (Auth::guest()) if (Auth::guest()) {
{ if (Request::ajax()) {
if (Request::ajax())
{
return Response::make('Unauthorized', 401); return Response::make('Unauthorized', 401);
} } else {
else
{
return Redirect::guest('login'); return Redirect::guest('login');
} }
} }
}); }
);
Route::filter('auth.basic', function() Route::filter(
{ 'auth.basic', function () {
return Auth::basic(); return Auth::basic();
}); }
);
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@@ -65,10 +57,13 @@ Route::filter('auth.basic', function()
| |
*/ */
Route::filter('guest', function() Route::filter(
{ 'guest', function () {
if (Auth::check()) return Redirect::to('/'); if (Auth::check()) {
}); return Redirect::to('/');
}
}
);
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@@ -81,10 +76,10 @@ Route::filter('guest', function()
| |
*/ */
Route::filter('csrf', function() Route::filter(
{ 'csrf', function () {
if (Session::token() != Input::get('_token')) if (Session::token() != Input::get('_token')) {
{
throw new Illuminate\Session\TokenMismatchException; throw new Illuminate\Session\TokenMismatchException;
} }
}); }
);

5
app/routes.php
View File

@@ -26,6 +26,11 @@ Route::group(['before' => 'auth'], function () {
Route::get('/accounts/create', ['uses' => 'AccountController@create', 'as' => 'accounts.create']); Route::get('/accounts/create', ['uses' => 'AccountController@create', 'as' => 'accounts.create']);
Route::get('/accounts/{account}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']); 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: // transaction controller:
Route::get('/transactions/add/withdrawal', ['uses' => 'TransactionController@createWithdrawal', 'as' => 'transactions.withdrawal']); Route::get('/transactions/add/withdrawal', ['uses' => 'TransactionController@createWithdrawal', 'as' => 'transactions.withdrawal']);
Route::get('/transactions/add/deposit', ['uses' => 'TransactionController@createDeposit', 'as' => 'transactions.deposit']); Route::get('/transactions/add/deposit', ['uses' => 'TransactionController@createDeposit', 'as' => 'transactions.deposit']);