Skip to content

Firefly III: a personal finances manager

Fix #12951

James Coleb6c7c1731ce7
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 89646322cb..f69f611d25 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -67,7 +67,8 @@ abstract class Controller extends BaseController
protected string $monthAndDayFormat;
protected string $monthFormat;
protected string $redirectUrl = '/';
- protected string $from = '';
+ protected string $from = '/';
+ protected string $requestFrom = '/';
/**
* Controller constructor.
@@ -90,6 +91,7 @@ abstract class Controller extends BaseController
View::share('FF_VERSION', config('firefly.version'));
View::share('FF_BUILD_TIME', config('firefly.build_time'));
$this->from = $this->getFromUrl();
+ $this->requestFrom = $this->getRequestFromUrl();
View::share('FF3_FROM', $this->from);
// this breaks when running < PHP 8.5 and is totally intentional.
$input = ' James is cool';
@@ -203,4 +205,19 @@ abstract class Controller extends BaseController
return $from;
}
+
+ private function getRequestFromUrl(): string
+ {
+ $from = (string)request()->input('_from');
+ if('' === $from) {
+ return '/';
+ }
+ // validate query, and give error if invalid.
+ $validator = validator(['_from' => $from], ['nullable', 'max:255', new IsValidOriginUrl()]);
+ if ($validator->fails()) {
+ throw new FireflyException(trans('validation.bad_url_parts'));
+ }
+
+ return $from;
+ }
}
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 6f771cbd73..13f19a8931 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -114,7 +114,7 @@ final class HomeController extends Controller
$request->session()->put('end', $end);
Log::debug(sprintf('Set end to %s', $end->format('Y-m-d H:i:s')));
if ('true' === $request->input('redirect')) {
- return redirect(route('home'));
+ return redirect(route('index').$this->requestFrom);
}
return response()->json(['ok' => 'ok']);
diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php
index 8961d6727e..d26ca75497 100644
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -67,13 +67,6 @@ final class CreateController extends Controller
public function cloneGroup(Request $request): JsonResponse
{
- // validate query, and give error if invalid.
- $validator = validator(['_from' => $request->input('_from')], ['nullable', 'max:255', new IsValidOriginUrl()]);
- if ($validator->fails()) {
- throw new FireflyException(trans('validation.bad_url_parts'));
- }
- $from = $request->input('_from');
-
$groupId = (int) $request->input('id');
if (0 !== $groupId) {
$group = $this->repository->find($groupId);
@@ -90,14 +83,14 @@ final class CreateController extends Controller
session()->flash('success_url', $link);
if ('edit' === $request->input('redirect')) {
- return response()->json(['redirect' => route('transactions.edit', [$newGroup->id]).'?_from='.urlencode($from)]);
+ return response()->json(['redirect' => route('transactions.edit', [$newGroup->id]).'?_from='.urlencode($this->requestFrom)]);
}
- return response()->json(['redirect' => route('index').$from]);
+ return response()->json(['redirect' => route('index').$this->requestFrom]);
}
}
- return response()->json(['redirect' => route('index').$from]);
+ return response()->json(['redirect' => route('index').$this->requestFrom]);
}
/**
diff --git a/resources/assets/v3/js/pages/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.js
index c52965edd5..94b1664e6d 100644
--- a/resources/assets/v3/js/pages/accounts/index.js
+++ b/resources/assets/v3/js/pages/accounts/index.js
@@ -30,7 +30,7 @@ import formatMoney from "../../util/format-money.js";
import i18next from "i18next";
import { addDrag } from "../shared/drag-and-droppable-rows.js";
-window.enableDates = false;
+window.enableDates = true;
let index = function () {
return {
diff --git a/resources/views/layout/v3/session.blade.php b/resources/views/layout/v3/session.blade.php
index 627ee78e8b..de09c43a7f 100644
--- a/resources/views/layout/v3/session.blade.php
+++ b/resources/views/layout/v3/session.blade.php
@@ -438,6 +438,7 @@
<form action="{{ route('daterange') }}?redirect=true" method="POST" id="daterange-form">
<input name="_token" type="hidden" value="{{ csrf_token() }}">
<input type="hidden" name="start" value="" id="customStart"/>
+ <input type="hidden" name="_from" value="{{ $FF3_FROM }}" />
<input type="hidden" name="end" value="" id="customEnd"/>
<div class="modal-content">
<div class="modal-header">