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

Fix previous url, also in Safari

Browse Source
This commit is contained in:
James Cole
2021-10-03 06:06:49 +02:00
parent 4e7a27dd65
commit ab6707b9d9
2 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,16 +42,20 @@ class StartFireflySession extends StartSession
*/
protected function storeCurrentUrl(Request $request, $session): void
{
$url = $request->fullUrl();
$forbiddenWords = strpos($url, 'offline') || strpos($url, 'jscript') || strpos($url, 'delete') || strpos($url, '/login') || strpos($url, '/json') || strpos($url, 'serviceworker') || strpos($url, '/attachments/view');
$url = $request->fullUrl();
$safeUrl = app('steam')->getSafeUrl($url, route('index'));
if (false === $forbiddenWords
&& 'GET' === $request->method()
&& !$request->ajax()) {
//Log::debug(sprintf('Redirect is now "%s".', $url));
$session->setPreviousUrl($url);
if ($url !== $safeUrl) {
//Log::debug(sprintf('storeCurrentUrl: converted "%s" to "%s", so will not use it.', $url, $safeUrl));
return;
}
//Log::debug(sprintf('Refuse to set "%s" as current URL.', $url));
if ('GET' === $request->method() && !$request->ajax()) {
//Log::debug(sprintf('storeCurrentUrl: Redirect is now "%s".', $safeUrl));
$session->setPreviousUrl($safeUrl);
return;
}
//Log::debug(sprintf('storeCurrentUrl: Refuse to set "%s" as current URL.', $safeUrl));
}
}