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

Update service provider.

Browse Source
This commit is contained in:
James Cole 2017-10-28 07:31:12 +02:00
parent 7f26b4e7a7
commit d3c34ca155
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Middleware/StartFireflySession.php
View File

@ -43,25 +43,25 @@ class StartFireflySession extends StartSession
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) // public function handle($request, Closure $next)
{ // {
return parent::handle($request, $next); // defer to the right stuff // return parent::handle($request, $next); // defer to the right stuff
} // }
/** // /**
* Store the current URL for the request if necessary. // * Store the current URL for the request if necessary.
* // *
* @param \Illuminate\Http\Request $request // * @param \Illuminate\Http\Request $request
* @param \Illuminate\Contracts\Session\Session $session // * @param \Illuminate\Contracts\Session\Session $session
* // *
* @return void // * @return void
*/ // */
protected function storeCurrentUrl(Request $request, $session) // protected function storeCurrentUrl(Request $request, $session)
{ // {
$uri = $request->fullUrl(); // $uri = $request->fullUrl();
$strpos = strpos($uri, 'jscript'); // $strpos = strpos($uri, 'jscript');
if ($request->method() === 'GET' && $request->route() && !$request->ajax() && $strpos === false) { // if ($request->method() === 'GET' && $request->route() && !$request->ajax() && $strpos === false) {
$session->setPreviousUrl($uri); // $session->setPreviousUrl($uri);
} // }
} // }
} }

49
app/Providers/SessionServiceProvider.php Normal file
View File

@ -0,0 +1,49 @@
<?php
/**
* SessionServiceProvider.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
*
* This file is part of Firefly III.
*
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Providers;
use FireflyIII\Http\Middleware\StartFireflySession;
use Illuminate\Session\SessionServiceProvider as BaseSessionServiceProvider;
/**
* Class SessionServiceProvider
*
* @package FireflyIII\Providers
*/
class SessionServiceProvider extends BaseSessionServiceProvider
{
/**
* Register the service provider.
*
* @return void
*/
public function register()
{
$this->registerSessionManager();
$this->registerSessionDriver();
$this->app->singleton(StartFireflySession::class);
}
}

2
config/app.php
View File

@ -57,7 +57,7 @@ return [
Illuminate\Queue\QueueServiceProvider::class, Illuminate\Queue\QueueServiceProvider::class,
Illuminate\Redis\RedisServiceProvider::class, Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class, FireflyIII\Providers\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class, Illuminate\View\ViewServiceProvider::class,