kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 02:52:44 +00:00
Code Issues Projects Releases Wiki Activity

More things [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-04-03 10:51:37 +02:00
parent bb82b0eb79
commit 23cc7be231
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Admin/UserController.php
View File

@@ -13,7 +13,6 @@ namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User;
use Log;
use Preferences;
/**
@@ -40,7 +39,7 @@ class UserController extends Controller
// add meta stuff.
$users->each(
function (User $user) use ($confirmAccount) {
// user must be logged in, then continue:
// is user activated?
$isConfirmed = Preferences::getForUser($user, 'user_confirmed', false)->data;
if ($isConfirmed === false && $confirmAccount === true) {
$user->activated = false;
@@ -48,6 +47,17 @@ class UserController extends Controller
$user->activated = true;
}
// is user admin?
$user->isAdmin = $user->hasRole('owner');
// user has 2FA enabled?
$is2faEnabled = Preferences::getForUser($user, 'twoFactorAuthEnabled', false)->data;
$has2faSecret = !is_null(Preferences::getForUser($user, 'twoFactorAuthSecret'));
if ($is2faEnabled && $has2faSecret) {
$user->has2FA = true;
} else {
$user->has2FA = false;
}
}
);