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

Fixed some date range problems.

Browse Source
This commit is contained in:
James Cole 2016-01-09 07:46:11 +01:00
parent 723e461559
commit 9fcb00f10b
8 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,6 @@ class AccountController extends Controller
*/
public function __construct()
{
$this->middleware('auth');
parent::__construct();
View::share('mainTitleIcon', 'fa-credit-card');
View::share('title', trans('firefly.accounts'));

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

@ -29,7 +29,6 @@ class AttachmentController extends Controller
*/
public function __construct()
{
$this->middleware('auth');
parent::__construct();
View::share('mainTitleIcon', 'fa-paperclip');
View::share('title', trans('firefly.attachments'));

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

@ -24,7 +24,6 @@ class BillController extends Controller
*/
public function __construct()
{
$this->middleware('auth');
parent::__construct();
View::share('title', trans('firefly.bills'));
View::share('mainTitleIcon', 'fa-calendar-o');

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

@ -30,7 +30,6 @@ class BudgetController extends Controller
*/
public function __construct()
{
$this->middleware('auth');
parent::__construct();
View::share('title', trans('firefly.budgets'));
View::share('mainTitleIcon', 'fa-tasks');

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

@ -29,7 +29,6 @@ class CategoryController extends Controller
*/
public function __construct()
{
$this->middleware('auth');
parent::__construct();
View::share('title', trans('firefly.categories'));
View::share('mainTitleIcon', 'fa-bar-chart');

19
app/Http/Kernel.php
View File

@ -25,13 +25,30 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups
= [
'web' => [
'web' => [
\FireflyIII\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\FireflyIII\Http\Middleware\VerifyCsrfToken::class,
],
'web-auth' => [
\FireflyIII\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\FireflyIII\Http\Middleware\VerifyCsrfToken::class,
\FireflyIII\Http\Middleware\Authenticate::class,
],
'web-auth-range' => [
\FireflyIII\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\FireflyIII\Http\Middleware\VerifyCsrfToken::class,
\FireflyIII\Http\Middleware\Authenticate::class,
\FireflyIII\Http\Middleware\Range::class,
],
'api' => [
'throttle:60,1',

9
app/Http/Middleware/Range.php
View File

@ -6,12 +6,13 @@ namespace FireflyIII\Http\Middleware;
use Carbon\Carbon;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Navigation;
use Preferences;
use Session;
use View;
/**
* Class SessionFilter
*
@ -41,14 +42,14 @@ class Range
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $theNext
* @param \Closure $next
* @param string|null $guard
*
* @return mixed
*/
public function handle($request, Closure $theNext, $guard = null)
{
if ($this->auth->check()) {
if (!Auth::guard($guard)->guest()) {
// ignore preference. set the range to be the current month:
if (!Session::has('start') && !Session::has('end')) {

2
app/Http/routes.php
View File

@ -271,7 +271,7 @@ Route::group(
Route::group(
['middleware' => ['range', 'web']], function () {
['middleware' => ['web-auth-range']], function () {
/**
* Home Controller