Remove a lot of stuff that deals with user activation.

This commit is contained in:
James Cole
2016-12-28 17:07:44 +01:00
parent 98d4bc48b6
commit f44336f7aa
18 changed files with 10 additions and 511 deletions

View File

@@ -108,14 +108,6 @@ class UserRepository implements UserRepositoryInterface
$return['has_2fa'] = true;
}
// is user activated?
$mustConfirmAccount = FireflyConfig::get('must_confirm_account', config('firefly.configuration.must_confirm_account'))->data;
$isConfirmed = Preferences::getForUser($user, 'user_confirmed', false)->data;
$return['is_activated'] = true;
if ($isConfirmed === false && $mustConfirmAccount === true) {
$return['is_activated'] = false;
}
$return['is_admin'] = $user->hasRole('owner');
$return['blocked'] = intval($user->blocked) === 1;
$return['blocked_code'] = $user->blocked_code;