mention if a user is blocked in the admin panel user overview

diff --git a/mod/admin.php b/mod/admin.php
index b88bc723a20f2c1e000be4b5b794e3ee5d1bb113..fae20f79bd9635238ff8708d4ae1f0bb2c943e2d 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1881,6 +1881,7 @@ function admin_page_users(App $a)
                '$deny' => L10n::t('Deny'),
                '$delete' => L10n::t('Delete'),
                '$block' => L10n::t('Block'),
+               '$blocked' => L10n::t('User blocked'),
                '$unblock' => L10n::t('Unblock'),
                '$siteadmin' => L10n::t('Site admin'),
                '$accountexpired' => L10n::t('Account expired'),

diff --git a/view/templates/admin/users.tpl b/view/templates/admin/users.tpl
index a842d6e36412a5fd00b2e37bfc7192a13c69b9cc..b2b0d615a42760d55911c973fe623dc34915aed5 100644 (file)
--- a/view/templates/admin/users.tpl
+++ b/view/templates/admin/users.tpl
@@ -85,7 +85,7 @@
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
                                                <td class='lastitem_date'>{{$u.lastitem_date}}</td>
-                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.blocked}}{{$blocked}}{{/if}}</td>
                                                <td class="checkbox"> 
                                                {{if $u.is_deletable}}
                                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>