Admin panel: show if an account has expired

diff --git a/mod/admin.php b/mod/admin.php
index fb333c3e5c389bfe69b8701f519ab7cdb4e45ba5..ecca0b8be3bf5cec455945d7ef98d2b4fcf7452f 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -694,7 +694,7 @@ function admin_page_users(&$a){
        }
        
        
-       $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`
+       $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
                                FROM
                                        (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
                                        FROM `item`
@@ -718,7 +718,7 @@ function admin_page_users(&$a){
                        t('Normal Account'), 
                        t('Soapbox Account'),
                        t('Community/Celebrity Account'),
-                       t('Automatic Friend Account')
+                        t('Automatic Friend Account')
                );
                $e['page-flags'] = $accounts[$e['page-flags']];
                $e['register_date'] = relative_date($e['register_date']);
@@ -756,6 +756,7 @@ function admin_page_users(&$a){
                '$block' => t('Block'),
                '$unblock' => t('Unblock'),
         '$siteadmin' => t('Site admin'),
+        '$accountexpired' => t('Account expired'),
                
                '$h_users' => t('Users'),
                '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account') ),

diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index 781d538bb7caad688048921b1b0d45f2cab5b89c..71d55c04db2d7822c35d852c013264e7a36802a9 100644 (file)
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -70,7 +70,13 @@
                                                <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){{ endif }}</td>
+                                               <td
+                                                class='login_date'>$u.page_flags
+                                                {{ if $u.is_admin
+                                                }}($siteadmin){{ endif }} {{ if
+                                                $u.account_expired
+                                                }}($accountexpired){{ endif
+                                                }}</td>
                                                <td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;

diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
index 7ecef1a56ca86aefdf257a378620f8e171899bec..e3fc14ac3bd9e703319cb89c2acdb13094f29c1b 100644 (file)
--- a/view/smarty3/admin_users.tpl
+++ b/view/smarty3/admin_users.tpl
@@ -75,7 +75,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}}</td>
+                                               <td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.accountexpired}}{{$account_expired}}{{/if}}</td>
                                                <td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;