From 6e7ea89c703f26d32a45dbad3e7bf7e4b7af9ebd Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 15 Jul 2014 06:57:20 +0200
Subject: [PATCH] Cleaned up some routes, added a filter for the date range.

---
 app/config/session.php |  2 +-
 app/filters.php        | 91 ++++++++++++++++++++----------------------
 app/routes.php         |  5 +++
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/app/config/session.php b/app/config/session.php
index 6e07b5115b..d8b46954f4 100644
--- a/app/config/session.php
+++ b/app/config/session.php
@@ -8,7 +8,7 @@ return [
     'connection'      => null,
     'table'           => 'sessions',
     'lottery'         => array(2, 100),
-    'cookie'          => 'laravel_session',
+    'cookie'          => 'firefly_session',
     'path'            => '/',
     'domain'          => null,
     'secure'          => false,
diff --git a/app/filters.php b/app/filters.php
index fd0b4bcb6d..e0986863eb 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -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;
+        }
+    }
+);
diff --git a/app/routes.php b/app/routes.php
index b09ff0416e..1cba80ad8d 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -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']);