diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 69a329c2c9..ac1f2866f0 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -57,20 +57,22 @@ class UserController extends Controller // add meta stuff. $users->each( function (User $user) use ($mustConfirmAccount) { - // is user activated? - $isConfirmed = Preferences::getForUser($user, 'user_confirmed', false)->data; + $list = ['user_confirmed', 'twoFactorAuthEnabled', 'twoFactorAuthSecret', 'registration_ip_address', 'confirmation_ip_address']; + $preferences = Preferences::getArrayForUser($user, $list); + $user->activated = true; - if ($isConfirmed === false && $mustConfirmAccount === true) { + if (!($preferences['user_confirmed'] === true) && $mustConfirmAccount === true) { $user->activated = false; } $user->isAdmin = $user->hasRole('owner'); - $is2faEnabled = Preferences::getForUser($user, 'twoFactorAuthEnabled', false)->data; - $has2faSecret = !is_null(Preferences::getForUser($user, 'twoFactorAuthSecret')); + $is2faEnabled = $preferences['twoFactorAuthEnabled'] === true; + $has2faSecret = !is_null($preferences['twoFactorAuthSecret']); $user->has2FA = false; if ($is2faEnabled && $has2faSecret) { $user->has2FA = true; } + $user->prefs = $preferences; } ); diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index 55ed08c6dc..44f709de98 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -57,6 +57,30 @@ class Preferences return $this->getForUser(auth()->user(), $name, $default); } + /** + * @param User $user + * @param array $list + * + * @return array + */ + public function getArrayForUser(User $user, array $list): array + { + $result = []; + $preferences = Preference::where('user_id', $user->id)->whereIn('name', $list)->get(['id', 'name', 'data']); + /** @var Preference $preference */ + foreach ($preferences as $preference) { + $result[$preference->name] = $preference->data; + } + foreach ($list as $name) { + if (!isset($result[$name])) { + $result[$name] = null; + } + } + + return $result; + + } + /** * @param \FireflyIII\User $user * @param string $name diff --git a/resources/views/admin/domains/index.twig b/resources/views/admin/domains/index.twig index 5245f5901c..2ea2a88005 100644 --- a/resources/views/admin/domains/index.twig +++ b/resources/views/admin/domains/index.twig @@ -5,19 +5,18 @@ {% endblock %} {% block content %}
-
+

{{ 'all_blocked_domains'|_ }}

-
+
{% if domains|length > 0 %} - +
- - - + + @@ -27,9 +26,9 @@ unblock - - {% endfor %} @@ -43,12 +42,9 @@ - - - -
-
+ +

{{ 'all_user_domains'|_ }}

@@ -59,11 +55,11 @@ {{ 'all_domains_is_filtered'|_ }}

-
 {{ trans('list.domain') }}{{ trans('list.is_blocked') }} {{ trans('list.domain') }}
{{ domain }} - + + {{ domain }} + (whois)
+
- - + + diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig index cbe5832e92..f71843647c 100644 --- a/resources/views/admin/users/index.twig +++ b/resources/views/admin/users/index.twig @@ -14,16 +14,16 @@
 {{ trans('list.domain') }} {{ trans('list.domain') }}
- - - - - + + + + + - + @@ -41,11 +41,17 @@ {{ user.created_at.formatLocalized(monthAndDayFormat) }} {{ user.created_at.format('H:i') }} - - - + {% if what == 'asset' %} - + {% endif %} - - + + - - + + @@ -42,11 +42,11 @@ {% endif %} {% if account.lastActivityDate %} - {% else %} - {% endif %} diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index 2443bda422..02ae6daedb 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -3,13 +3,13 @@ - - - - + + + + - + @@ -37,36 +37,36 @@ {% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %} - - {% endif %} {% if entry.paidDates.count() == 0 and entry.payDates.count() > 0 and entry.active %} - - {% endif %} {% if entry.paidDates.count() == entry.payDates.count() and entry.payDates.count() > 0 and entry.active %} - - {% endif %} {% if not entry.active %} - - {% endif %} diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twig index 11cda8e04e..16deef6773 100644 --- a/resources/views/list/categories.twig +++ b/resources/views/list/categories.twig @@ -24,11 +24,11 @@ {{ category.name }} {% if category.lastActivity.year != "1900" %} - {% else %} - {% endif %}
{{ trans('list.email') }}{{ trans('list.email') }} {{ trans('list.is_activated') }} {{ trans('list.is_blocked') }}
{{ trans('list.name') }}{{ trans('list.name') }}{{ trans('list.currentBalance') }}{{ trans('list.currentBalance') }}
{{ trans('list.name') }}{{ trans('list.matchingAmount') }}{{ trans('list.matchingAmount') }}
+ {{ 'not_expected_period'|_ }} + {{ 'not_or_not_yet'|_ }} + {% for date in entry.paidDates %} {{ date.formatLocalized(monthAndDayFormat) }}
{% endfor %} 		+ ~