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

First working version of the group collector.

Browse Source
This commit is contained in:
James Cole
2019-03-24 14:48:12 +01:00
parent d94b23b15d
commit c946a4040f
8 changed files with 321 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Middleware/Installer.php
View File

@@ -54,6 +54,7 @@ class Installer
*/
public function handle($request, Closure $next)
{
Log::debug(sprintf('Installer middleware for URI %s', $request->url()));
// ignore installer in test environment.
if ('testing' === config('app.env')) {
return $next($request);

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

@@ -41,13 +41,17 @@ class StartFireflySession extends StartSession
*/
protected function storeCurrentUrl(Request $request, $session): void
{
$uri = $request->fullUrl();
$uri = $request->fullUrl();
$isScriptPage = strpos($uri, 'jscript');
$isDeletePage = strpos($uri, 'delete');
$isDeletePage = strpos($uri, 'delete');
$isLoginPage = strpos($uri, '/login');
// also stop remembering "delete" URL's.
if (false === $isScriptPage && false === $isDeletePage && 'GET' === $request->method() && !$request->ajax()) {
if (false === $isScriptPage && false === $isDeletePage
&& false === $isLoginPage
&& 'GET' === $request->method()
&& !$request->ajax()) {
$session->setPreviousUrl($uri);
Log::debug(sprintf('Will set previous URL to %s', $uri));