kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 00:04:24 +00:00
Code Issues Projects Releases Wiki Activity

Some more confirmation things.

Browse Source
This commit is contained in:
James Cole
2016-03-29 13:52:51 +02:00
parent 2d3f3f0fde
commit c6ac81dcf6
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Handlers/Events/UserConfirmation.php
View File

@@ -72,6 +72,7 @@ class UserConfirmation
if ($confirmAccount === false) { if ($confirmAccount === false) {
Preferences::setForUser($user, 'user_confirmed', true); Preferences::setForUser($user, 'user_confirmed', true);
Preferences::setForUser($user, 'user_confirmed_last_mail', 0); Preferences::setForUser($user, 'user_confirmed_last_mail', 0);
Preferences::mark();
return; return;
} }

5
app/Http/Middleware/IsConfirmed.php
View File

@@ -42,9 +42,12 @@ class IsConfirmed
return redirect()->guest('login'); return redirect()->guest('login');
} }
} else { } else {
// must the user be confirmed in the first place?
$confirmAccount = env('MUST_CONFIRM_ACCOUNT', false);
// user must be logged in, then continue: // user must be logged in, then continue:
$isConfirmed = Preferences::get('user_confirmed', false)->data; $isConfirmed = Preferences::get('user_confirmed', false)->data;
if ($isConfirmed === false) {
if ($isConfirmed === false && $confirmAccount === true) {
// user account is not confirmed, redirect to // user account is not confirmed, redirect to
// confirmation page: // confirmation page:

4
app/Http/Middleware/IsNotConfirmed.php
View File

@@ -42,9 +42,11 @@ class IsNotConfirmed
return redirect()->guest('login'); return redirect()->guest('login');
} }
} else { } else {
// must the user be confirmed in the first place?
$confirmAccount = env('MUST_CONFIRM_ACCOUNT', false);
// user must be logged in, then continue: // user must be logged in, then continue:
$isConfirmed = Preferences::get('user_confirmed', false)->data; $isConfirmed = Preferences::get('user_confirmed', false)->data;
if ($isConfirmed) { if ($isConfirmed || $confirmAccount === false) {
// user account is confirmed, simply send them home. // user account is confirmed, simply send them home.
return redirect(route('home')); return redirect(route('home'));
} }