kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 03:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Various nestor-related fixes.

Browse Source
This commit is contained in:
James Cole
2025-05-24 05:46:39 +02:00
parent c40229e9fa
commit 1c33be4828
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Auth/LoginController.php
View File

@@ -24,7 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Auth; namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\User; use FireflyIII\User;
use Cookie; use Illuminate\Support\Facades\Cookie;
use FireflyIII\Events\ActuallyLoggedIn; use FireflyIII\Events\ActuallyLoggedIn;
use FireflyIII\Events\Security\UnknownUserAttemptedLogin; use FireflyIII\Events\Security\UnknownUserAttemptedLogin;
use FireflyIII\Events\Security\UserAttemptedLogin; use FireflyIII\Events\Security\UserAttemptedLogin;
@@ -221,7 +221,7 @@ class LoginController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function showLoginForm(Request $request) public function showLoginForm(?Request $request = null)
{ {
Log::channel('audit')->info('Show login form (1.1).'); Log::channel('audit')->info('Show login form (1.1).');
@@ -247,8 +247,8 @@ class LoginController extends Controller
$allowReset = false; $allowReset = false;
} }
$email = $request->old('email'); $email = $request?->old('email');
$remember = $request->old('remember'); $remember = $request?->old('remember');
$storeInCookie = config('google2fa.store_in_cookie', false); $storeInCookie = config('google2fa.store_in_cookie', false);
if (false !== $storeInCookie) { if (false !== $storeInCookie) {

6
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -130,7 +130,7 @@ class RegisterController extends Controller
$allowRegistration = false; $allowRegistration = false;
} }
if ('web' !== $guard) { if ('web' !== $guard) {
$allowRegistration = false; return false;
} }
return $allowRegistration; return $allowRegistration;
@@ -175,7 +175,7 @@ class RegisterController extends Controller
* *
* @throws FireflyException * @throws FireflyException
*/ */
public function showRegistrationForm(Request $request) public function showRegistrationForm(?Request $request = null)
{ {
$isDemoSite = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $isDemoSite = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$pageTitle = (string) trans('firefly.register_page_title'); $pageTitle = (string) trans('firefly.register_page_title');
@@ -187,7 +187,7 @@ class RegisterController extends Controller
return view('error', compact('message')); return view('error', compact('message'));
} }
$email = $request->old('email'); $email = $request?->old('email');
return view('auth.register', compact('isDemoSite', 'email', 'pageTitle')); return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
} }

2
app/Http/Requests/CurrencyFormRequest.php
View File

@@ -70,7 +70,7 @@ class CurrencyFormRequest extends FormRequest
$currency = $this->route()->parameter('currency'); $currency = $this->route()->parameter('currency');
if (null !== $currency) { if (null !== $currency) {
$rules = [ return [
'name' => 'required|max:48|min:1', 'name' => 'required|max:48|min:1',
'code' => 'required|min:3|max:51', 'code' => 'required|min:3|max:51',
'symbol' => 'required|min:1|max:51', 'symbol' => 'required|min:1|max:51',