Fixed some date range problems.

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,13 +25,30 @@ class Kernel extends HttpKernel
*/ */
protected $middlewareGroups protected $middlewareGroups
= [ = [
'web' => [ 'web' => [
\FireflyIII\Http\Middleware\EncryptCookies::class, \FireflyIII\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class, \Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class,
\FireflyIII\Http\Middleware\VerifyCsrfToken::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' => [ 'api' => [
'throttle:60,1', 'throttle:60,1',

View File

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

View File

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