Fix issue 8551: Last item is now displayed again

[friendica.git] / src / Module / Admin / Users.php

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 73a11e65a8de775f2a6db8648de632759c2066cb..dca8c9c2e6bd716f9a93da8ed944778d15e2fa76 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -156,17 +156,16 @@ class Users extends BaseAdmin
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 100);
 
-               // @TODO Move below block to Model\User::getUsers($start, $count, $order = 'contact.name', $order_direction = '+')
                $valid_orders = [
-                       'contact.name',
-                       'user.email',
-                       'user.register_date',
-                       'user.login_date',
-                       'lastitem_date',
-                       'user.page-flags'
+                       'name',
+                       'email',
+                       'register_date',
+                       'login_date',
+                       'last-item',
+                       'page-flags'
                ];
 
-               $order = 'contact.name';
+               $order = 'name';
                $order_direction = '+';
                if (!empty($_GET['o'])) {
                        $new_order = $_GET['o'];
@@ -179,16 +178,8 @@ class Users extends BaseAdmin
                                $order = $new_order;
                        }
                }
-               $sql_order = '`' . str_replace('.', '`.`', $order) . '`';
-               $sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC';
 
-               $usersStmt = DBA::p("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date`
-                               FROM `user`
-                               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
-                               WHERE `user`.`verified`
-                               ORDER BY $sql_order $sql_order_direction LIMIT ?, ?", $pager->getStart(), $pager->getItemsPerPage()
-               );
-               $users = DBA::toArray($usersStmt);
+               $users = User::getList($pager->getStart(), $pager->getItemsPerPage(), 'all', $order, ($order_direction == '-'));
 
                $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
                $_setup_users = function ($e) use ($adminlist) {
@@ -215,7 +206,7 @@ class Users extends BaseAdmin
 
                        $e['register_date'] = Temporal::getRelativeDate($e['register_date']);
                        $e['login_date'] = Temporal::getRelativeDate($e['login_date']);
-                       $e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']);
+                       $e['lastitem_date'] = Temporal::getRelativeDate($e['last-item']);
                        $e['is_admin'] = in_array($e['email'], $adminlist);
                        $e['is_deletable'] = (intval($e['uid']) != local_user());
                        $e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);