re-added last item date in admin user page. relative_date return 'never' if null...

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 9a92f4e1587a115159fc41e797203027cc3ed0b4..8f0b2c93d846fc9f4771644d221c27ee360b71c7 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -406,11 +406,18 @@ function admin_page_users(&$a){
                $a->set_pager_itemspage(100);
        }
 
-       $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro` 
-                               FROM `user`
-                               LEFT JOIN `contact` ON `user`.`uid` = `contact`.`uid`
-                               WHERE `user`.`verified` =1
-                               AND `contact`.`self` =1
+       $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`
+                               FROM
+                                       (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
+                                       FROM `item`
+                                       WHERE `item`.`type` = 'wall'
+                                       GROUP BY `item`.`uid`) AS `lastitem`
+                                                RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`,
+                                          `contact`
+                               WHERE
+                                          `user`.`uid` = `contact`.`uid`
+                                               AND `user`.`verified` =1
+                                       AND `contact`.`self` =1
                                ORDER BY `contact`.`name` LIMIT %d, %d
                                ",
                                intval($a->pager['start']),
@@ -427,6 +434,7 @@ function admin_page_users(&$a){
                $e['page-flags'] = $accounts[$e['page-flags']];
                $e['register_date'] = relative_date($e['register_date']);
                $e['login_date'] = relative_date($e['login_date']);
+               $e['lastitem_date'] = relative_date($e['lastitem_date']);
                return $e;
        }
        $users = array_map("_setup_users", $users);
@@ -448,7 +456,7 @@ function admin_page_users(&$a){
                '$unblock' => t('Unblock'),
                
                '$h_users' => t('Users'),
-               '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'),  t('Account') ),
+               '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'),  t('Account') ),
 
                '$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
                '$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),