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 5f21a07b21146a7283107198f6c26202b25badcc..dca8c9c2e6bd716f9a93da8ed944778d15e2fa76 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -47,7 +47,7 @@ class Users extends BaseAdmin
 
                if ($nu_name !== '' && $nu_email !== '' && $nu_nickname !== '') {
                        try {
-                               DI::userService()->createMinimal($nu_name, $nu_email, $nu_nickname, $nu_language);
+                               User::createMinimal($nu_name, $nu_email, $nu_nickname, $nu_language);
                        } catch (\Exception $ex) {
                                notice($ex->getMessage());
                                return;
@@ -55,15 +55,17 @@ class Users extends BaseAdmin
                }
 
                if (!empty($_POST['page_users_block'])) {
-                       if (User::block($users)) {
-                               notice(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
+                       foreach ($users as $uid) {
+                               User::block($uid);
                        }
+                       notice(DI::l10n()->tt('%s user blocked', '%s users blocked', count($users)));
                }
 
                if (!empty($_POST['page_users_unblock'])) {
-                       if (User::block($users, false)) {
-                               notice(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
+                       foreach ($users as $uid) {
+                               User::block($uid, false);
                        }
+                       notice(DI::l10n()->tt('%s user unblocked', '%s users unblocked', count($users)));
                }
 
                if (!empty($_POST['page_users_delete'])) {
@@ -79,17 +81,17 @@ class Users extends BaseAdmin
                }
 
                if (!empty($_POST['page_users_approve'])) {
-                       require_once 'mod/regmod.php';
                        foreach ($pending as $hash) {
                                User::allow($hash);
                        }
+                       notice(DI::l10n()->tt('%s user approved', '%s users approved', count($pending)));
                }
 
                if (!empty($_POST['page_users_deny'])) {
-                       require_once 'mod/regmod.php';
                        foreach ($pending as $hash) {
-                               user_deny($hash);
+                               User::deny($hash);
                        }
+                       notice(DI::l10n()->tt('%s registration revoked', '%s registrations revoked', count($pending)));
                }
 
                DI::baseUrl()->redirect('admin/users');
@@ -126,16 +128,24 @@ class Users extends BaseAdmin
                                        break;
                                case 'block':
                                        parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
-                                       // @TODO Move this to Model\User:block([$uid]);
-                                       DBA::update('user', ['blocked' => 1], ['uid' => $uid]);
+                                       User::block($uid);
                                        notice(DI::l10n()->t('User "%s" blocked', $user['username']));
                                        break;
                                case 'unblock':
                                        parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
-                                       // @TODO Move this to Model\User:unblock([$uid]);
-                                       DBA::update('user', ['blocked' => 0], ['uid' => $uid]);
+                                       User::block($uid, false);
                                        notice(DI::l10n()->t('User "%s" unblocked', $user['username']));
                                        break;
+                               case 'allow':
+                                       parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
+                                       User::allow(Register::getPendingForUser($uid)['hash'] ?? '');
+                                       notice(DI::l10n()->t('Account approved.'));
+                                       break;
+                               case 'deny':
+                                       parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
+                                       User::deny(Register::getPendingForUser($uid)['hash'] ?? '');
+                                       notice(DI::l10n()->t('Registration revoked'));
+                                       break;
                        }
 
                        DI::baseUrl()->redirect('admin/users');
@@ -146,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'];
@@ -169,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) {
@@ -205,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);