kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 01:06:46 +00:00
Code Issues Projects Releases Wiki Activity

Code for #896

Browse Source
This commit is contained in:
James Cole
2018-09-06 10:14:12 +02:00
parent 4ef663669c
commit 32ed9c59ea
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Support/Http/Controllers/UserNavigation.php
View File

@@ -42,7 +42,7 @@ trait UserNavigation
* *
* - If the $identifier contains the word "delete" then a remembered uri with the text "/show/" in it will not be returned but instead the index (/) * - If the $identifier contains the word "delete" then a remembered uri with the text "/show/" in it will not be returned but instead the index (/)
* will be returned. * will be returned.
* - If the remembered uri contains "javascript/" the remembered uri will not be returned but instead the index (/) will be returned. * - If the remembered uri contains "jscript/" the remembered uri will not be returned but instead the index (/) will be returned.
* *
* @param string $identifier * @param string $identifier
* *
@@ -50,8 +50,28 @@ trait UserNavigation
*/ */
protected function getPreviousUri(string $identifier): string protected function getPreviousUri(string $identifier): string
{ {
// "forbidden" words for specific identifiers:
// if these are in the previous URI, don't refer back there.
$array = [
'accounts.delete.uri' => '/accounts/show/',
'transactions.delete.uri' => '/transactions/show/',
'attachments.delete.uri' => '/attachments/show/',
'bills.delete.uri' => '/bills/show/',
'budgets.delete.uri' => '/budgets/show/',
'categories.delete.uri' => '/categories/show/',
'currencies.delete.uri' => '/currencies/show/',
'piggy-banks.delete.uri' => '/piggy-banks/show/',
'tags.delete.uri' => '/tags/show/',
'rules.delete.uri' => '/rules/edit/',
'transactions.mass-delete.uri' => '/transactions/show/',
];
$forbidden = $array[$identifier] ?? '/show/';
$uri = (string)session($identifier); $uri = (string)session($identifier);
if (!(false === strpos($identifier, 'delete')) && !(false === strpos($uri, '/show/'))) { if (
!(false === strpos($identifier, 'delete'))
&& !(false === strpos($uri, $forbidden))) {
$uri = $this->redirectUri; $uri = $this->redirectUri;
} }
if (!(false === strpos($uri, 'jscript'))) { if (!(false === strpos($uri, 'jscript'))) {