]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/User.php
Merge pull request #9261 from annando/relay-distribution
[friendica.git] / src / Model / User.php
index 7e2d37c4087b980fde8b6dd53da4b932dfda0ae9..73636a9953762bb4726e9db45a2a3ca10bac4efa 100644 (file)
@@ -1,15 +1,33 @@
 <?php
-
 /**
- * @file src/Model/User.php
- * This file includes the User class with user related database functions
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model;
 
+use DivineOmega\DOFileCachePSR6\CacheItemPool;
 use DivineOmega\PasswordExposed;
+use ErrorException;
 use Exception;
+use Friendica\Content\Pager;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -17,6 +35,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\TwoFactor\AppSpecificPassword;
+use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
@@ -24,6 +43,7 @@ use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
+use ImagickException;
 use LightOpenID;
 
 /**
@@ -80,6 +100,107 @@ class User
         * @}
         */
 
+       private static $owner;
+
+       /**
+        * Fetch the system account
+        *
+        * @return array system account
+        */
+       public static function getSystemAccount()
+       {
+               $system = Contact::selectFirst([], ['self' => true, 'uid' => 0]);
+               if (!DBA::isResult($system)) {
+                       self::createSystemAccount();
+                       $system = Contact::selectFirst([], ['self' => true, 'uid' => 0]);
+                       if (!DBA::isResult($system)) {
+                               return [];
+                       }
+               }
+
+               $system['sprvkey'] = $system['uprvkey'] = $system['prvkey'];
+               $system['spubkey'] = $system['upubkey'] = $system['pubkey'];
+               $system['nickname'] = $system['nick'];
+               return $system;
+       }
+
+       /**
+        * Create the system account
+        *
+        * @return void
+        */
+       private static function createSystemAccount()
+       {
+               $system_actor_name = self::getActorName();
+               if (empty($system_actor_name)) {
+                       return;
+               }
+
+               $keys = Crypto::newKeypair(4096);
+               if ($keys === false) {
+                       throw new Exception(DI::l10n()->t('SERIOUS ERROR: Generation of security keys failed.'));
+               }
+
+               $system = [];
+               $system['uid'] = 0;
+               $system['created'] = DateTimeFormat::utcNow();
+               $system['self'] = true;
+               $system['network'] = Protocol::ACTIVITYPUB;
+               $system['name'] = 'System Account';
+               $system['addr'] = $system_actor_name . '@' . DI::baseUrl()->getHostname();
+               $system['nick'] = $system_actor_name;
+               $system['avatar'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO;
+               $system['photo'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO;
+               $system['thumb'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_THUMB;
+               $system['micro'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_MICRO;
+               $system['url'] = DI::baseUrl() . '/friendica';
+               $system['nurl'] = Strings::normaliseLink($system['url']);
+               $system['pubkey'] = $keys['pubkey'];
+               $system['prvkey'] = $keys['prvkey'];
+               $system['blocked'] = 0;
+               $system['pending'] = 0;
+               $system['contact-type'] = Contact::TYPE_RELAY; // In AP this is translated to 'Application'
+               $system['name-date'] = DateTimeFormat::utcNow();
+               $system['uri-date'] = DateTimeFormat::utcNow();
+               $system['avatar-date'] = DateTimeFormat::utcNow();
+               $system['closeness'] = 0;
+               $system['baseurl'] = DI::baseUrl();
+               $system['gsid'] = GServer::getID($system['baseurl']);
+               DBA::insert('contact', $system);
+       }
+
+       /**
+        * Detect a usable actor name
+        *
+        * @return string actor account name
+        */
+       public static function getActorName()
+       {
+               $system_actor_name = DI::config()->get('system', 'actor_name');
+               if (!empty($system_actor_name)) {
+                       $self = Contact::selectFirst(['nick'], ['uid' => 0, 'self' => true]);
+                       if (!empty($self['nick'])) {
+                               if ($self['nick'] != $system_actor_name) {
+                                       // Reset the actor name to the already used name
+                                       DI::config()->set('system', 'actor_name', $self['nick']);
+                                       $system_actor_name = $self['nick'];
+                               }
+                       }
+                       return $system_actor_name;
+               }
+
+               // List of possible actor names
+               $possible_accounts = ['friendica', 'actor', 'system', 'internal'];
+               foreach ($possible_accounts as $name) {
+                       if (!DBA::exists('user', ['nickname' => $name, 'account_removed' => false, 'expire']) &&
+                               !DBA::exists('userd', ['username' => $name])) {
+                               DI::config()->set('system', 'actor_name', $name);
+                               return $name;
+                       }
+               }
+               return '';
+       }
+
        /**
         * Returns true if a user record exists with the provided id
         *
@@ -143,14 +264,29 @@ class User
         * @return integer user id
         * @throws Exception
         */
-       public static function getIdForURL($url)
+       public static function getIdForURL(string $url)
        {
-               $self = DBA::selectFirst('contact', ['uid'], ['nurl' => Strings::normaliseLink($url), 'self' => true]);
-               if (!DBA::isResult($self)) {
-                       return false;
-               } else {
+               // Avoid any database requests when the hostname isn't even part of the url.
+               if (!strpos($url, DI::baseUrl()->getHostname())) {
+                       return 0;
+               }
+
+               $self = Contact::selectFirst(['uid'], ['self' => true, 'nurl' => Strings::normaliseLink($url)]);
+               if (!empty($self['uid'])) {
                        return $self['uid'];
                }
+
+               $self = Contact::selectFirst(['uid'], ['self' => true, 'addr' => $url]);
+               if (!empty($self['uid'])) {
+                       return $self['uid'];
+               }
+
+               $self = Contact::selectFirst(['uid'], ['self' => true, 'alias' => [$url, Strings::normaliseLink($url)]]);
+               if (!empty($self['uid'])) {
+                       return $self['uid'];
+               }
+
+               return 0;
        }
 
        /**
@@ -168,6 +304,24 @@ class User
                return DBA::selectFirst('user', $fields, ['email' => $email]);
        }
 
+       /**
+        * Fetch the user array of the administrator. The first one if there are several.
+        *
+        * @param array $fields
+        * @return array user
+        */
+       public static function getFirstAdmin(array $fields = [])
+       {
+               if (!empty(DI::config()->get('config', 'admin_nickname'))) {
+                       return self::getByNickname(DI::config()->get('config', 'admin_nickname'), $fields);
+               } elseif (!empty(DI::config()->get('config', 'admin_email'))) {
+                       $adminList = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
+                       return self::getByEmail($adminList[0], $fields);
+               } else {
+                       return [];
+               }
+       }
+
        /**
         * Get owner data by user id
         *
@@ -176,68 +330,61 @@ class User
         * @return boolean|array
         * @throws Exception
         */
-       public static function getOwnerDataById($uid, $check_valid = true)
+       public static function getOwnerDataById(int $uid, bool $check_valid = true)
        {
-               $r = DBA::fetchFirst(
-                       "SELECT
-                       `contact`.*,
-                       `user`.`prvkey` AS `uprvkey`,
-                       `user`.`timezone`,
-                       `user`.`nickname`,
-                       `user`.`sprvkey`,
-                       `user`.`spubkey`,
-                       `user`.`page-flags`,
-                       `user`.`account-type`,
-                       `user`.`prvnets`,
-                       `user`.`account_removed`,
-                       `user`.`hidewall`
-                       FROM `contact`
-                       INNER JOIN `user`
-                               ON `user`.`uid` = `contact`.`uid`
-                       WHERE `contact`.`uid` = ?
-                       AND `contact`.`self`
-                       LIMIT 1",
-                       $uid
-               );
-               if (!DBA::isResult($r)) {
-                       return false;
+               if ($uid == 0) {
+                       return self::getSystemAccount();
+               }
+
+               if (!empty(self::$owner[$uid])) {
+                       return self::$owner[$uid];
                }
 
-               if (empty($r['nickname'])) {
+               $owner = DBA::selectFirst('owner-view', [], ['uid' => $uid]);
+               if (!DBA::isResult($owner)) {
+                       if (!DBA::exists('user', ['uid' => $uid]) || !$check_valid) {
+                               return false;
+                       }
+                       Contact::createSelfFromUserId($uid);
+                       $owner = self::getOwnerDataById($uid, false);
+               }
+
+               if (empty($owner['nickname'])) {
                        return false;
                }
 
                if (!$check_valid) {
-                       return $r;
+                       return $owner;
                }
 
                // Check if the returned data is valid, otherwise fix it. See issue #6122
 
                // Check for correct url and normalised nurl
-               $url = DI::baseUrl() . '/profile/' . $r['nickname'];
-               $repair = ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']));
+               $url = DI::baseUrl() . '/profile/' . $owner['nickname'];
+               $repair = ($owner['url'] != $url) || ($owner['nurl'] != Strings::normaliseLink($owner['url']));
 
                if (!$repair) {
                        // Check if "addr" is present and correct
-                       $addr = $r['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
-                       $repair = ($addr != $r['addr']);
+                       $addr = $owner['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+                       $repair = ($addr != $owner['addr']);
                }
 
                if (!$repair) {
                        // Check if the avatar field is filled and the photo directs to the correct path
                        $avatar = Photo::selectFirst(['resource-id'], ['uid' => $uid, 'profile' => true]);
                        if (DBA::isResult($avatar)) {
-                               $repair = empty($r['avatar']) || !strpos($r['photo'], $avatar['resource-id']);
+                               $repair = empty($owner['avatar']) || !strpos($owner['photo'], $avatar['resource-id']);
                        }
                }
 
                if ($repair) {
                        Contact::updateSelfFromUserID($uid);
                        // Return the corrected data and avoid a loop
-                       $r = self::getOwnerDataById($uid, false);
+                       $owner = self::getOwnerDataById($uid, false);
                }
 
-               return $r;
+               self::$owner[$uid] = $owner;
+               return $owner;
        }
 
        /**
@@ -261,11 +408,11 @@ class User
        /**
         * Returns the default group for a given user and network
         *
-        * @param int $uid User id
+        * @param int    $uid     User id
         * @param string $network network name
         *
         * @return int group id
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws Exception
         */
        public static function getDefaultGroup($uid, $network = '')
        {
@@ -317,7 +464,8 @@ class User
         * @param string $password
         * @param bool   $third_party
         * @return int User Id if authentication is successful
-        * @throws Exception
+        * @throws HTTPException\ForbiddenException
+        * @throws HTTPException\NotFoundException
         */
        public static function getIdFromPasswordAuthentication($user_info, $password, $third_party = false)
        {
@@ -352,7 +500,7 @@ class User
                        return $user['uid'];
                }
 
-               throw new Exception(DI::l10n()->t('Login failed'));
+               throw new HTTPException\ForbiddenException(DI::l10n()->t('Login failed'));
        }
 
        /**
@@ -366,7 +514,7 @@ class User
         *
         * @param mixed $user_info
         * @return array
-        * @throws Exception
+        * @throws HTTPException\NotFoundException
         */
        private static function getAuthenticationInfo($user_info)
        {
@@ -410,7 +558,7 @@ class User
                        }
 
                        if (!DBA::isResult($user)) {
-                               throw new Exception(DI::l10n()->t('User not found'));
+                               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found'));
                        }
                }
 
@@ -421,6 +569,7 @@ class User
         * Generates a human-readable random password
         *
         * @return string
+        * @throws Exception
         */
        public static function generateNewPassword()
        {
@@ -436,7 +585,7 @@ class User
         */
        public static function isPasswordExposed($password)
        {
-               $cache = new \DivineOmega\DOFileCachePSR6\CacheItemPool();
+               $cache = new CacheItemPool();
                $cache->changeConfig([
                        'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
                ]);
@@ -445,7 +594,7 @@ class User
                        $passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
 
                        return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
-               } catch (\Exception $e) {
+               } catch (Exception $e) {
                        Logger::error('Password Exposed Exception: ' . $e->getMessage(), [
                                'code' => $e->getCode(),
                                'file' => $e->getFile(),
@@ -542,20 +691,28 @@ class User
         *
         * @param string $nickname The nickname that should be checked
         * @return boolean True is the nickname is blocked on the node
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isNicknameBlocked($nickname)
        {
                $forbidden_nicknames = DI::config()->get('system', 'forbidden_nicknames', '');
+               if (!empty($forbidden_nicknames)) {
+                       $forbidden = explode(',', $forbidden_nicknames);
+                       $forbidden = array_map('trim', $forbidden);
+               } else {
+                       $forbidden = [];
+               }
 
-               // if the config variable is empty return false
-               if (empty($forbidden_nicknames)) {
+               // Add the name of the internal actor to the "forbidden" list
+               $actor_name = self::getActorName();
+               if (!empty($actor_name)) {
+                       $forbidden[] = $actor_name;
+               }
+
+               if (empty($forbidden)) {
                        return false;
                }
 
                // check if the nickname is in the list of blocked nicknames
-               $forbidden = explode(',', $forbidden_nicknames);
-               $forbidden = array_map('trim', $forbidden);
                if (in_array(strtolower($nickname), $forbidden)) {
                        return true;
                }
@@ -578,9 +735,9 @@ class User
         *
         * @param  array $data
         * @return array
-        * @throws \ErrorException
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
-        * @throws \ImagickException
+        * @throws ErrorException
+        * @throws HTTPException\InternalServerErrorException
+        * @throws ImagickException
         * @throws Exception
         */
        public static function create(array $data)
@@ -602,8 +759,7 @@ class User
                $verified   = !empty($data['verified']);
                $language   = !empty($data['language'])   ? Strings::escapeTags(trim($data['language']))   : 'en';
 
-               $publish = !empty($data['profile_publish_reg']);
-               $netpublish = $publish && DI::config()->get('system', 'directory');
+               $netpublish = $publish = !empty($data['profile_publish_reg']);
 
                if ($password1 != $confirm) {
                        throw new Exception(DI::l10n()->t('Passwords do not match. Password unchanged.'));
@@ -707,7 +863,7 @@ class User
 
                $nickname = $data['nickname'] = strtolower($nickname);
 
-               if (!preg_match('/^[a-z0-9][a-z0-9\_]*$/', $nickname)) {
+               if (!preg_match('/^[a-z0-9][a-z0-9_]*$/', $nickname)) {
                        throw new Exception(DI::l10n()->t('Your nickname can only contain a-z, 0-9 and _.'));
                }
 
@@ -823,9 +979,16 @@ class User
                        $photo_failure = false;
 
                        $filename = basename($photo);
-                       $img_str = Network::fetchUrl($photo, true);
-                       // guess mimetype from headers or filename
-                       $type = Images::guessType($photo, true);
+                       $curlResult = DI::httpRequest()->get($photo, true);
+                       if ($curlResult->isSuccess()) {
+                               $img_str = $curlResult->getBody();
+                               $type = $curlResult->getContentType();
+                       } else {
+                               $img_str = '';
+                               $type = '';
+                       }
+
+                       $type = Images::getMimeTypeByData($img_str, $photo, $type);
 
                        $Image = new Image($img_str, $type);
                        if ($Image->isValid()) {
@@ -867,6 +1030,166 @@ class User
                return $return;
        }
 
+       /**
+        * Sets block state for a given user
+        *
+        * @param int  $uid   The user id
+        * @param bool $block Block state (default is true)
+        *
+        * @return bool True, if successfully blocked
+
+        * @throws Exception
+        */
+       public static function block(int $uid, bool $block = true)
+       {
+               return DBA::update('user', ['blocked' => $block], ['uid' => $uid]);
+       }
+
+       /**
+        * Allows a registration based on a hash
+        *
+        * @param string $hash
+        *
+        * @return bool True, if the allow was successful
+        *
+        * @throws HTTPException\InternalServerErrorException
+        * @throws Exception
+        */
+       public static function allow(string $hash)
+       {
+               $register = Register::getByHash($hash);
+               if (!DBA::isResult($register)) {
+                       return false;
+               }
+
+               $user = User::getById($register['uid']);
+               if (!DBA::isResult($user)) {
+                       return false;
+               }
+
+               Register::deleteByHash($hash);
+
+               DBA::update('user', ['blocked' => false, 'verified' => true], ['uid' => $register['uid']]);
+
+               $profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid']]);
+
+               if (DBA::isResult($profile) && $profile['net-publish'] && DI::config()->get('system', 'directory')) {
+                       $url = DI::baseUrl() . '/profile/' . $user['nickname'];
+                       Worker::add(PRIORITY_LOW, "Directory", $url);
+               }
+
+               $l10n = DI::l10n()->withLang($register['language']);
+
+               return User::sendRegisterOpenEmail(
+                       $l10n,
+                       $user,
+                       DI::config()->get('config', 'sitename'),
+                       DI::baseUrl()->get(),
+                       ($register['password'] ?? '') ?: 'Sent in a previous email'
+               );
+       }
+
+       /**
+        * Denys a pending registration
+        *
+        * @param string $hash The hash of the pending user
+        *
+        * This does not have to go through user_remove() and save the nickname
+        * permanently against re-registration, as the person was not yet
+        * allowed to have friends on this system
+        *
+        * @return bool True, if the deny was successfull
+        * @throws Exception
+        */
+       public static function deny(string $hash)
+       {
+               $register = Register::getByHash($hash);
+               if (!DBA::isResult($register)) {
+                       return false;
+               }
+
+               $user = User::getById($register['uid']);
+               if (!DBA::isResult($user)) {
+                       return false;
+               }
+
+               return DBA::delete('user', ['uid' => $register['uid']]) &&
+                      Register::deleteByHash($register['hash']);
+       }
+
+       /**
+        * Creates a new user based on a minimal set and sends an email to this user
+        *
+        * @param string $name  The user's name
+        * @param string $email The user's email address
+        * @param string $nick  The user's nick name
+        * @param string $lang  The user's language (default is english)
+        *
+        * @return bool True, if the user was created successfully
+        * @throws HTTPException\InternalServerErrorException
+        * @throws ErrorException
+        * @throws ImagickException
+        */
+       public static function createMinimal(string $name, string $email, string $nick, string $lang = L10n::DEFAULT)
+       {
+               if (empty($name) ||
+                   empty($email) ||
+                   empty($nick)) {
+                       throw new HTTPException\InternalServerErrorException('Invalid arguments.');
+               }
+
+               $result = self::create([
+                       'username' => $name,
+                       'email' => $email,
+                       'nickname' => $nick,
+                       'verified' => 1,
+                       'language' => $lang
+               ]);
+
+               $user = $result['user'];
+               $preamble = Strings::deindent(DI::l10n()->t('
+               Dear %1$s,
+                       the administrator of %2$s has set up an account for you.'));
+               $body = Strings::deindent(DI::l10n()->t('
+               The login details are as follows:
+
+               Site Location:  %1$s
+               Login Name:             %2$s
+               Password:               %3$s
+
+               You may change your password from your account "Settings" page after logging
+               in.
+
+               Please take a few moments to review the other account settings on that page.
+
+               You may also wish to add some basic information to your default profile
+               (on the "Profiles" page) so that other people can easily find you.
+
+               We recommend setting your full name, adding a profile photo,
+               adding some profile "keywords" (very useful in making new friends) - and
+               perhaps what country you live in; if you do not wish to be more specific
+               than that.
+
+               We fully respect your right to privacy, and none of these items are necessary.
+               If you are new and do not know anybody here, they may help
+               you to make some new and interesting friends.
+
+               If you ever want to delete your account, you can do so at %1$s/removeme
+
+               Thank you and welcome to %4$s.'));
+
+               $preamble = sprintf($preamble, $user['username'], DI::config()->get('config', 'sitename'));
+               $body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], DI::config()->get('config', 'sitename'));
+
+               $email = DI::emailer()
+                       ->newSystemMail()
+                       ->withMessage(DI::l10n()->t('Registration details for %s', DI::config()->get('config', 'sitename')), $preamble, $body)
+                       ->forUser($user)
+                       ->withRecipient($user['email'])
+                       ->build();
+               return DI::emailer()->send($email);
+       }
+
        /**
         * Sends pending registration confirmation email
         *
@@ -875,7 +1198,7 @@ class User
         * @param string $siteurl
         * @param string $password Plaintext password
         * @return NULL|boolean from notification() and email() inherited
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws HTTPException\InternalServerErrorException
         */
        public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)
        {
@@ -911,16 +1234,16 @@ class User
         *
         * It's here as a function because the mail is sent from different parts
         *
-        * @param \Friendica\Core\L10n $l10n     The used language
-        * @param array                $user     User record array
-        * @param string               $sitename
-        * @param string               $siteurl
-        * @param string               $password Plaintext password
+        * @param L10n   $l10n     The used language
+        * @param array  $user     User record array
+        * @param string $sitename
+        * @param string $siteurl
+        * @param string $password Plaintext password
         *
         * @return NULL|boolean from notification() and email() inherited
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws HTTPException\InternalServerErrorException
         */
-       public static function sendRegisterOpenEmail(\Friendica\Core\L10n $l10n, $user, $sitename, $siteurl, $password)
+       public static function sendRegisterOpenEmail(L10n $l10n, $user, $sitename, $siteurl, $password)
        {
                $preamble = Strings::deindent($l10n->t(
                        '
@@ -975,11 +1298,11 @@ class User
        }
 
        /**
-        * @param object $uid user to remove
+        * @param int $uid user to remove
         * @return bool
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws HTTPException\InternalServerErrorException
         */
-       public static function remove($uid)
+       public static function remove(int $uid)
        {
                if (!$uid) {
                        return false;
@@ -995,7 +1318,7 @@ class User
                // unique), so it cannot be re-registered in the future.
                DBA::insert('userd', ['username' => $user['nickname']]);
 
-               // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
+               // The user and related data will be deleted in Friendica\Worker\ExpireAndRemoveUsers
                DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
                Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid);
 
@@ -1105,22 +1428,20 @@ class User
                        'total_users'           => 0,
                        'active_users_halfyear' => 0,
                        'active_users_monthly'  => 0,
+                       'active_users_weekly'   => 0,
                ];
 
-               $userStmt = DBA::p("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
-                       FROM `user`
-                       INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid`
-                       INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
-                       WHERE (`profile`.`publish` OR `profile`.`net-publish`) AND `user`.`verified`
-                               AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
-                               AND NOT `user`.`account_expired`");
-
+               $userStmt = DBA::select('owner-view', ['uid', 'login_date', 'last-item'],
+                       ["`verified` AND `login_date` > ? AND NOT `blocked`
+                       AND NOT `account_removed` AND NOT `account_expired`",
+                       DBA::NULL_DATETIME]);
                if (!DBA::isResult($userStmt)) {
                        return $statistics;
                }
 
                $halfyear = time() - (180 * 24 * 60 * 60);
                $month = time() - (30 * 24 * 60 * 60);
+               $week = time() - (7 * 24 * 60 * 60);
 
                while ($user = DBA::fetch($userStmt)) {
                        $statistics['total_users']++;
@@ -1134,8 +1455,46 @@ class User
                        ) {
                                $statistics['active_users_monthly']++;
                        }
+
+                       if ((strtotime($user['login_date']) > $week) || (strtotime($user['last-item']) > $week)
+                       ) {
+                               $statistics['active_users_weekly']++;
+                       }
                }
+               DBA::close($userStmt);
 
                return $statistics;
        }
+
+       /**
+        * Get all users of the current node
+        *
+        * @param int    $start Start count (Default is 0)
+        * @param int    $count Count of the items per page (Default is @see Pager::ITEMS_PER_PAGE)
+        * @param string $type  The type of users, which should get (all, bocked, removed)
+        * @param string $order Order of the user list (Default is 'contact.name')
+        * @param bool   $descending Order direction (Default is ascending)
+        *
+        * @return array The list of the users
+        * @throws Exception
+        */
+       public static function getList($start = 0, $count = Pager::ITEMS_PER_PAGE, $type = 'all', $order = 'name', bool $descending = false)
+       {
+               $param = ['limit' => [$start, $count], 'order' => [$order => $descending]];
+               $condition = [];
+               switch ($type) {
+                       case 'active':
+                               $condition['account_removed'] = false;
+                               $condition['blocked'] = false;
+                               break;
+                       case 'blocked':
+                               $condition['blocked'] = true;
+                               break;
+                       case 'removed':
+                               $condition['account_removed'] = true;
+                               break;
+               }
+
+               return DBA::selectToArray('owner-view', [], $condition, $param);
+       }
 }