Fixing double encoding here as well

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 1df7e5ef4e4ffb5426b1405b722aa9509127d664..a6a9fc95253efb6d64abd2eb4a30bf08ca1788dd 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -5,25 +5,24 @@
  */
 namespace Friendica\Model;
 
  */
 namespace Friendica\Model;
 

-use DivineOmega\PasswordExposed\PasswordStatus;
+use DivineOmega\PasswordExposed;
+use Exception;

 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;

+use Friendica\Core\Hook;

 use Friendica\Core\L10n;
 use Friendica\Core\L10n;

+use Friendica\Core\Logger;

 use Friendica\Core\PConfig;
 use Friendica\Core\PConfig;

+use Friendica\Core\Protocol;

 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Core\System;
 use Friendica\Core\Worker;

-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-use Friendica\Model\Photo;
+use Friendica\Database\DBA;

 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;

-use dba;
-use Exception;
+use Friendica\Util\Strings;

 use LightOpenID;
 use LightOpenID;

-use function password_exposed;

 
 require_once 'boot.php';
 require_once 'include/dba.php';
 
 require_once 'boot.php';
 require_once 'include/dba.php';


@@ -34,6 +33,43 @@ require_once 'include/text.php';
  */
 class User
 {
  */
 class User
 {

+       /**
+        * Returns true if a user record exists with the provided id
+        *
+        * @param  integer $uid
+        * @return boolean
+        */
+       public static function exists($uid)
+       {
+               return DBA::exists('user', ['uid' => $uid]);
+       }
+
+       /**
+        * @param  integer       $uid
+        * @return array|boolean User record if it exists, false otherwise
+        */
+       public static function getById($uid)
+       {
+               return DBA::selectFirst('user', [], ['uid' => $uid]);
+       }
+
+       /**
+        * @brief Returns the user id of a given profile URL
+        *
+        * @param string $url
+        *
+        * @return integer user id
+        */
+       public static function getIdForURL($url)
+       {
+               $self = DBA::selectFirst('contact', ['uid'], ['nurl' => Strings::normaliseLink($url), 'self' => true]);
+               if (!DBA::isResult($self)) {
+                       return false;
+               } else {
+                       return $self['uid'];
+               }
+       }
+

        /**
         * @brief Get owner data by user id
         *
        /**
         * @brief Get owner data by user id
         *


@@ -41,7 +77,7 @@ class User
         * @return boolean|array
         */
        public static function getOwnerDataById($uid) {
         * @return boolean|array
         */
        public static function getOwnerDataById($uid) {

-               $r = dba::fetch_first("SELECT
+               $r = DBA::fetchFirst("SELECT

                        `contact`.*,
                        `user`.`prvkey` AS `uprvkey`,
                        `user`.`timezone`,
                        `contact`.*,
                        `user`.`prvkey` AS `uprvkey`,
                        `user`.`timezone`,


@@ -59,12 +95,42 @@ class User
                        LIMIT 1",
                        $uid
                );
                        LIMIT 1",
                        $uid
                );

-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
+                       return false;
+               }
+
+               if (empty($r['nickname'])) {

                        return false;
                }
                        return false;
                }

+
+               // Check if the returned data is valid, otherwise fix it. See issue #6122
+               $url = System::baseUrl() . '/profile/' . $r['nickname'];
+               $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+
+               if (($addr != $r['addr']) || ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']))) {
+                       Contact::updateSelfFromUserID($uid);
+               }
+

                return $r;
        }
 
                return $r;
        }
 

+       /**
+        * @brief Get owner data by nick name
+        *
+        * @param int $nick
+        * @return boolean|array
+        */
+       public static function getOwnerDataByNick($nick)
+       {
+               $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
+
+               if (!DBA::isResult($user)) {
+                       return false;
+               }
+
+               return self::getOwnerDataById($user['uid']);
+       }
+

        /**
         * @brief Returns the default group for a given user and network
         *
        /**
         * @brief Returns the default group for a given user and network
         *


@@ -77,7 +143,7 @@ class User
        {
                $default_group = 0;
 
        {
                $default_group = 0;
 

-               if ($network == NETWORK_OSTATUS) {
+               if ($network == Protocol::OSTATUS) {

                        $default_group = PConfig::get($uid, "ostatus", "default_group");
                }
 
                        $default_group = PConfig::get($uid, "ostatus", "default_group");
                }
 


@@ -85,9 +151,9 @@ class User
                        return $default_group;
                }
 
                        return $default_group;
                }
 

-               $user = dba::selectFirst('user', ['def_gid'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);

 
 

-               if (DBM::is_result($user)) {
+               if (DBA::isResult($user)) {

                        $default_group = $user["def_gid"];
                }
 
                        $default_group = $user["def_gid"];
                }
 


@@ -127,13 +193,23 @@ class User
        {
                $user = self::getAuthenticationInfo($user_info);
 
        {
                $user = self::getAuthenticationInfo($user_info);
 

-               if ($user['legacy_password']) {
+               if (strpos($user['password'], '$') === false) {
+                       //Legacy hash that has not been replaced by a new hash yet
+                       if (self::hashPasswordLegacy($password) === $user['password']) {
+                               self::updatePassword($user['uid'], $password);
+
+                               return $user['uid'];
+                       }
+               } elseif (!empty($user['legacy_password'])) {
+                       //Legacy hash that has been double-hashed and not replaced by a new hash yet
+                       //Warning: `legacy_password` is not necessary in sync with the content of `password`

                        if (password_verify(self::hashPasswordLegacy($password), $user['password'])) {
                                self::updatePassword($user['uid'], $password);
 
                                return $user['uid'];
                        }
                } elseif (password_verify($password, $user['password'])) {
                        if (password_verify(self::hashPasswordLegacy($password), $user['password'])) {
                                self::updatePassword($user['uid'], $password);
 
                                return $user['uid'];
                        }
                } elseif (password_verify($password, $user['password'])) {

+                       //New password hash

                        if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
                                self::updatePassword($user['uid'], $password);
                        }
                        if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
                                self::updatePassword($user['uid'], $password);
                        }


@@ -176,7 +252,7 @@ class User
                        }
                } elseif (is_int($user_info) || is_string($user_info)) {
                        if (is_int($user_info)) {
                        }
                } elseif (is_int($user_info) || is_string($user_info)) {
                        if (is_int($user_info)) {

-                               $user = dba::selectFirst('user', ['uid', 'password', 'legacy_password'],
+                               $user = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'],

                                        [
                                                'uid' => $user_info,
                                                'blocked' => 0,
                                        [
                                                'uid' => $user_info,
                                                'blocked' => 0,


@@ -186,21 +262,14 @@ class User
                                        ]
                                );
                        } else {
                                        ]
                                );
                        } else {

-                               $user = dba::fetch_first('SELECT `uid`, `password`, `legacy_password`
-                                       FROM `user`
-                                       WHERE (`email` = ? OR `username` = ? OR `nickname` = ?)
-                                       AND `blocked` = 0
-                                       AND `account_expired` = 0
-                                       AND `account_removed` = 0
-                                       AND `verified` = 1
-                                       LIMIT 1',
-                                       $user_info,
-                                       $user_info,
-                                       $user_info
-                               );
+                               $fields = ['uid', 'password', 'legacy_password'];
+                               $condition = ["(`email` = ? OR `username` = ? OR `nickname` = ?)
+                                       AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified`",
+                                       $user_info, $user_info, $user_info];
+                               $user = DBA::selectFirst('user', $fields, $condition);

                        }
 
                        }
 

-                       if (!DBM::is_result($user)) {
+                       if (!DBA::isResult($user)) {

                                throw new Exception(L10n::t('User not found'));
                        }
                }
                                throw new Exception(L10n::t('User not found'));
                        }
                }


@@ -215,7 +284,7 @@ class User
         */
        public static function generateNewPassword()
        {
         */
        public static function generateNewPassword()
        {

-               return autoname(6) . mt_rand(100, 9999);
+               return Strings::getRandomName(6) . mt_rand(100, 9999);

        }
 
        /**
        }
 
        /**


@@ -226,7 +295,14 @@ class User
         */
        public static function isPasswordExposed($password)
        {
         */
        public static function isPasswordExposed($password)
        {

-               return password_exposed($password) === PasswordStatus::EXPOSED;
+               $cache = new \DivineOmega\DOFileCachePSR6\CacheItemPool();
+               $cache->changeConfig([
+                       'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
+               ]);
+
+               $PasswordExposedCHecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
+
+               return $PasswordExposedCHecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;

        }
 
        /**
        }
 
        /**


@@ -248,6 +324,10 @@ class User
         */
        public static function hashPassword($password)
        {
         */
        public static function hashPassword($password)
        {

+               if (!trim($password)) {
+                       throw new Exception(L10n::t('Password can\'t be empty'));
+               }
+

                return password_hash($password, PASSWORD_DEFAULT);
        }
 
                return password_hash($password, PASSWORD_DEFAULT);
        }
 


@@ -279,7 +359,37 @@ class User
                        'pwdreset_time' => null,
                        'legacy_password' => false
                ];
                        'pwdreset_time' => null,
                        'legacy_password' => false
                ];

-               return dba::update('user', $fields, ['uid' => $uid]);
+               return DBA::update('user', $fields, ['uid' => $uid]);
+       }
+
+       /**
+        * @brief Checks if a nickname is in the list of the forbidden nicknames
+        *
+        * Check if a nickname is forbidden from registration on the node by the
+        * admin. Forbidden nicknames (e.g. role namess) can be configured in the
+        * admin panel.
+        *
+        * @param string $nickname The nickname that should be checked
+        * @return boolean True is the nickname is blocked on the node
+        */
+       public static function isNicknameBlocked($nickname)
+       {
+               $forbidden_nicknames = Config::get('system', 'forbidden_nicknames', '');
+
+               // if the config variable is empty return false
+               if (empty($forbidden_nicknames)) {
+                       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;
+               }
+
+               // else return false
+               return false;

        }
 
        /**
        }
 
        /**


@@ -306,20 +416,21 @@ class User
                $using_invites = Config::get('system', 'invitation_only');
                $num_invites   = Config::get('system', 'number_invites');
 
                $using_invites = Config::get('system', 'invitation_only');
                $num_invites   = Config::get('system', 'number_invites');
 

-               $invite_id  = x($data, 'invite_id')  ? notags(trim($data['invite_id']))  : '';
-               $username   = x($data, 'username')   ? notags(trim($data['username']))   : '';
-               $nickname   = x($data, 'nickname')   ? notags(trim($data['nickname']))   : '';
-               $email      = x($data, 'email')      ? notags(trim($data['email']))      : '';
-               $openid_url = x($data, 'openid_url') ? notags(trim($data['openid_url'])) : '';
-               $photo      = x($data, 'photo')      ? notags(trim($data['photo']))      : '';
-               $password   = x($data, 'password')   ? trim($data['password'])           : '';
-               $password1  = x($data, 'password1')  ? trim($data['password1'])          : '';
-               $confirm    = x($data, 'confirm')    ? trim($data['confirm'])            : '';
-               $blocked    = x($data, 'blocked')    ? intval($data['blocked'])          : 0;
-               $verified   = x($data, 'verified')   ? intval($data['verified'])         : 0;
-
-               $publish = x($data, 'profile_publish_reg') && intval($data['profile_publish_reg']) ? 1 : 0;
-               $netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
+               $invite_id  = !empty($data['invite_id'])  ? Strings::escapeTags(trim($data['invite_id']))  : '';
+               $username   = !empty($data['username'])   ? Strings::escapeTags(trim($data['username']))   : '';
+               $nickname   = !empty($data['nickname'])   ? Strings::escapeTags(trim($data['nickname']))   : '';
+               $email      = !empty($data['email'])      ? Strings::escapeTags(trim($data['email']))      : '';
+               $openid_url = !empty($data['openid_url']) ? Strings::escapeTags(trim($data['openid_url'])) : '';
+               $photo      = !empty($data['photo'])      ? Strings::escapeTags(trim($data['photo']))      : '';
+               $password   = !empty($data['password'])   ? trim($data['password'])           : '';
+               $password1  = !empty($data['password1'])  ? trim($data['password1'])          : '';
+               $confirm    = !empty($data['confirm'])    ? trim($data['confirm'])            : '';
+               $blocked    = !empty($data['blocked']);
+               $verified   = !empty($data['verified']);
+               $language   = !empty($data['language'])   ? Strings::escapeTags(trim($data['language']))   : 'en';
+
+               $publish = !empty($data['profile_publish_reg']);
+               $netpublish = $publish && Config::get('system', 'directory');

 
                if ($password1 != $confirm) {
                        throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
 
                if ($password1 != $confirm) {
                        throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));


@@ -332,12 +443,12 @@ class User
                                throw new Exception(L10n::t('An invitation is required.'));
                        }
 
                                throw new Exception(L10n::t('An invitation is required.'));
                        }
 

-                       if (!dba::exists('register', ['hash' => $invite_id])) {
+                       if (!Register::existsByHash($invite_id)) {

                                throw new Exception(L10n::t('Invitation could not be verified.'));
                        }
                }
 
                                throw new Exception(L10n::t('Invitation could not be verified.'));
                        }
                }
 

-               if (!x($username) || !x($email) || !x($nickname)) {
+               if (empty($username) || empty($email) || empty($nickname)) {

                        if ($openid_url) {
                                if (!Network::isUrlValid($openid_url)) {
                                        throw new Exception(L10n::t('Invalid OpenID url'));
                        if ($openid_url) {
                                if (!Network::isUrlValid($openid_url)) {
                                        throw new Exception(L10n::t('Invalid OpenID url'));


@@ -345,7 +456,7 @@ class User
                                $_SESSION['register'] = 1;
                                $_SESSION['openid'] = $openid_url;
 
                                $_SESSION['register'] = 1;
                                $_SESSION['openid'] = $openid_url;
 

-                               $openid = new LightOpenID;
+                               $openid = new LightOpenID($a->getHostName());

                                $openid->identity = $openid_url;
                                $openid->returnUrl = System::baseUrl() . '/openid';
                                $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
                                $openid->identity = $openid_url;
                                $openid->returnUrl = System::baseUrl() . '/openid';
                                $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];


@@ -355,7 +466,7 @@ class User
                                } catch (Exception $e) {
                                        throw new Exception(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . L10n::t('The error message was:') . $e->getMessage(), 0, $e);
                                }
                                } catch (Exception $e) {
                                        throw new Exception(L10n::t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . L10n::t('The error message was:') . $e->getMessage(), 0, $e);
                                }

-                               goaway($authurl);
+                               System::externalRedirect($authurl);

                                // NOTREACHED
                        }
 
                                // NOTREACHED
                        }
 


@@ -371,19 +482,30 @@ class User
                // collapse multiple spaces in name
                $username = preg_replace('/ +/', ' ', $username);
 
                // collapse multiple spaces in name
                $username = preg_replace('/ +/', ' ', $username);
 

-               if (mb_strlen($username) > 48) {
-                       throw new Exception(L10n::t('Please use a shorter name.'));
+               $username_min_length = max(1, min(64, intval(Config::get('system', 'username_min_length', 3))));
+               $username_max_length = max(1, min(64, intval(Config::get('system', 'username_max_length', 48))));
+
+               if ($username_min_length > $username_max_length) {
+                       Logger::log(L10n::t('system.username_min_length (%s) and system.username_max_length (%s) are excluding each other, swapping values.', $username_min_length, $username_max_length), Logger::WARNING);
+                       $tmp = $username_min_length;
+                       $username_min_length = $username_max_length;
+                       $username_max_length = $tmp;
+               }
+
+               if (mb_strlen($username) < $username_min_length) {
+                       throw new Exception(L10n::tt('Username should be at least %s character.', 'Username should be at least %s characters.', $username_min_length));

                }
                }

-               if (mb_strlen($username) < 3) {
-                       throw new Exception(L10n::t('Name too short.'));
+
+               if (mb_strlen($username) > $username_max_length) {
+                       throw new Exception(L10n::tt('Username should be at most %s character.', 'Username should be at most %s characters.', $username_max_length));

                }
 
                // So now we are just looking for a space in the full name.
                $loose_reg = Config::get('system', 'no_regfullname');
                if (!$loose_reg) {
                        $username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');
                }
 
                // So now we are just looking for a space in the full name.
                $loose_reg = Config::get('system', 'no_regfullname');
                if (!$loose_reg) {
                        $username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');

-                       if (!strpos($username, ' ')) {
-                               throw new Exception(L10n::t("That doesn't appear to be your full \x28First Last\x29 name."));
+                       if (strpos($username, ' ') === false) {
+                               throw new Exception(L10n::t("That doesn't appear to be your full (First Last) name."));

                        }
                }
 
                        }
                }
 


@@ -391,18 +513,21 @@ class User
                        throw new Exception(L10n::t('Your email domain is not among those allowed on this site.'));
                }
 
                        throw new Exception(L10n::t('Your email domain is not among those allowed on this site.'));
                }
 

-               if (!valid_email($email) || !Network::isEmailDomainValid($email)) {
+               if (!filter_var($email, FILTER_VALIDATE_EMAIL) || !Network::isEmailDomainValid($email)) {

                        throw new Exception(L10n::t('Not a valid email address.'));
                }
                        throw new Exception(L10n::t('Not a valid email address.'));
                }

+               if (self::isNicknameBlocked($nickname)) {
+                       throw new Exception(L10n::t('The nickname was blocked from registration by the nodes admin.'));
+               }

 
 

-               if (Config::get('system', 'block_extended_register', false) && dba::exists('user', ['email' => $email])) {
+               if (Config::get('system', 'block_extended_register', false) && DBA::exists('user', ['email' => $email])) {

                        throw new Exception(L10n::t('Cannot use that email.'));
                }
 
                // Disallow somebody creating an account using openid that uses the admin email address,
                // since openid bypasses email verification. We'll allow it if there is not yet an admin account.
                        throw new Exception(L10n::t('Cannot use that email.'));
                }
 
                // Disallow somebody creating an account using openid that uses the admin email address,
                // since openid bypasses email verification. We'll allow it if there is not yet an admin account.

-               if (x($a->config, 'admin_email') && strlen($openid_url)) {
-                       $adminlist = explode(',', str_replace(' ', '', strtolower($a->config['admin_email'])));
+               if (Config::get('config', 'admin_email') && strlen($openid_url)) {
+                       $adminlist = explode(',', str_replace(' ', '', strtolower(Config::get('config', 'admin_email'))));

                        if (in_array(strtolower($email), $adminlist)) {
                                throw new Exception(L10n::t('Cannot use that email.'));
                        }
                        if (in_array(strtolower($email), $adminlist)) {
                                throw new Exception(L10n::t('Cannot use that email.'));
                        }


@@ -415,8 +540,8 @@ class User
                }
 
                // Check existing and deleted accounts for this nickname.
                }
 
                // Check existing and deleted accounts for this nickname.

-               if (dba::exists('user', ['nickname' => $nickname])
-                       || dba::exists('userd', ['username' => $nickname])
+               if (DBA::exists('user', ['nickname' => $nickname])
+                       || DBA::exists('userd', ['username' => $nickname])

                ) {
                        throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
                }
                ) {
                        throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
                }


@@ -439,8 +564,8 @@ class User
                $sprvkey = $sres['prvkey'];
                $spubkey = $sres['pubkey'];
 
                $sprvkey = $sres['prvkey'];
                $spubkey = $sres['pubkey'];
 

-               $insert_result = dba::insert('user', [
-                       'guid'     => generate_user_guid(),
+               $insert_result = DBA::insert('user', [
+                       'guid'     => System::createUUID(),

                        'username' => $username,
                        'password' => $new_password_encoded,
                        'email'    => $email,
                        'username' => $username,
                        'password' => $new_password_encoded,
                        'email'    => $email,


@@ -452,14 +577,15 @@ class User
                        'sprvkey'  => $sprvkey,
                        'verified' => $verified,
                        'blocked'  => $blocked,
                        'sprvkey'  => $sprvkey,
                        'verified' => $verified,
                        'blocked'  => $blocked,

+                       'language' => $language,

                        'timezone' => 'UTC',
                        'register_date' => DateTimeFormat::utcNow(),
                        'default-location' => ''
                ]);
 
                if ($insert_result) {
                        'timezone' => 'UTC',
                        'register_date' => DateTimeFormat::utcNow(),
                        'default-location' => ''
                ]);
 
                if ($insert_result) {

-                       $uid = dba::lastInsertId();
-                       $user = dba::selectFirst('user', [], ['uid' => $uid]);
+                       $uid = DBA::lastInsertId();
+                       $user = DBA::selectFirst('user', [], ['uid' => $uid]);

                } else {
                        throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
                }
                } else {
                        throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
                }


@@ -470,14 +596,14 @@ class User
 
                // if somebody clicked submit twice very quickly, they could end up with two accounts
                // due to race condition. Remove this one.
 
                // if somebody clicked submit twice very quickly, they could end up with two accounts
                // due to race condition. Remove this one.

-               $user_count = dba::count('user', ['nickname' => $nickname]);
+               $user_count = DBA::count('user', ['nickname' => $nickname]);

                if ($user_count > 1) {
                if ($user_count > 1) {

-                       dba::delete('user', ['uid' => $uid]);
+                       DBA::delete('user', ['uid' => $uid]);

 
                        throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
                }
 
 
                        throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
                }
 

-               $insert_result = dba::insert('profile', [
+               $insert_result = DBA::insert('profile', [

                        'uid' => $uid,
                        'name' => $username,
                        'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",
                        'uid' => $uid,
                        'name' => $username,
                        'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",


@@ -488,14 +614,14 @@ class User
                        'profile-name' => L10n::t('default')
                ]);
                if (!$insert_result) {
                        'profile-name' => L10n::t('default')
                ]);
                if (!$insert_result) {

-                       dba::delete('user', ['uid' => $uid]);
+                       DBA::delete('user', ['uid' => $uid]);

 
                        throw new Exception(L10n::t('An error occurred creating your default profile. Please try again.'));
                }
 
                // Create the self contact
                if (!Contact::createSelfFromUserId($uid)) {
 
                        throw new Exception(L10n::t('An error occurred creating your default profile. Please try again.'));
                }
 
                // Create the self contact
                if (!Contact::createSelfFromUserId($uid)) {

-                       dba::delete('user', ['uid' => $uid]);
+                       DBA::delete('user', ['uid' => $uid]);

 
                        throw new Exception(L10n::t('An error occurred creating your self contact. Please try again.'));
                }
 
                        throw new Exception(L10n::t('An error occurred creating your self contact. Please try again.'));
                }


@@ -504,7 +630,7 @@ class User
                // right away as a default group for new contacts.
                $def_gid = Group::create($uid, L10n::t('Friends'));
                if (!$def_gid) {
                // right away as a default group for new contacts.
                $def_gid = Group::create($uid, L10n::t('Friends'));
                if (!$def_gid) {

-                       dba::delete('user', ['uid' => $uid]);
+                       DBA::delete('user', ['uid' => $uid]);

 
                        throw new Exception(L10n::t('An error occurred creating your default contact group. Please try again.'));
                }
 
                        throw new Exception(L10n::t('An error occurred creating your default contact group. Please try again.'));
                }


@@ -514,7 +640,7 @@ class User
                        $fields['allow_gid'] = '<' . $def_gid . '>';
                }
 
                        $fields['allow_gid'] = '<' . $def_gid . '>';
                }
 

-               dba::update('user', $fields, ['uid' => $uid]);
+               DBA::update('user', $fields, ['uid' => $uid]);

 
                // if we have no OpenID photo try to look up an avatar
                if (!strlen($photo)) {
 
                // if we have no OpenID photo try to look up an avatar
                if (!strlen($photo)) {


@@ -532,7 +658,7 @@ class User
 
                        $Image = new Image($img_str, $type);
                        if ($Image->isValid()) {
 
                        $Image = new Image($img_str, $type);
                        if ($Image->isValid()) {

-                               $Image->scaleToSquare(175);
+                               $Image->scaleToSquare(300);

 
                                $hash = Photo::newResource();
 
 
                                $hash = Photo::newResource();
 


@@ -559,7 +685,7 @@ class User
                                }
 
                                if (!$photo_failure) {
                                }
 
                                if (!$photo_failure) {

-                                       dba::update('photo', ['profile' => 1], ['resource-id' => $hash]);
+                                       DBA::update('photo', ['profile' => 1], ['resource-id' => $hash]);

                                }
                        }
                }
                                }
                        }
                }


@@ -571,27 +697,36 @@ class User
        }
 
        /**
        }
 
        /**

-        * @brief Sends pending registration confiŕmation email
+        * @brief Sends pending registration confirmation email

         *
         *

-        * @param string $email
+        * @param array  $user     User record array

         * @param string $sitename
         * @param string $sitename

-        * @param string $username
+        * @param string $siteurl
+        * @param string $password Plaintext password

         * @return NULL|boolean from notification() and email() inherited
         */
         * @return NULL|boolean from notification() and email() inherited
         */

-       public static function sendRegisterPendingEmail($email, $sitename, $username)
+       public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)

        {
        {

-               $body = deindent(L10n::t('
+               $body = Strings::deindent(L10n::t('

                        Dear %1$s,
                                Thank you for registering at %2$s. Your account is pending for approval by the administrator.
                        Dear %1$s,
                                Thank you for registering at %2$s. Your account is pending for approval by the administrator.

-               '));

 
 

-               $body = sprintf($body, $username, $sitename);
+                       Your login details are as follows:
+
+                       Site Location:  %3$s
+                       Login Name:             %4$s
+                       Password:               %5$s
+               ',
+                       $user['username'], $sitename, $siteurl, $user['nickname'], $password
+               ));

 
                return notification([
 
                return notification([

-                       'type' => SYSTEM_EMAIL,
-                       'to_email' => $email,
-                       'subject'=> L10n::t('Registration at %s', $sitename),
-                       'body' => $body]);
+                       'type'     => SYSTEM_EMAIL,
+                       'uid'      => $user['uid'],
+                       'to_email' => $user['email'],
+                       'subject'  => L10n::t('Registration at %s', $sitename),
+                       'body'     => $body
+               ]);

        }
 
        /**
        }
 
        /**


@@ -599,26 +734,28 @@ class User
         *
         * It's here as a function because the mail is sent from different parts
         *
         *
         * It's here as a function because the mail is sent from different parts
         *

-        * @param string $email
+        * @param array  $user     User record array

         * @param string $sitename
         * @param string $siteurl
         * @param string $sitename
         * @param string $siteurl

-        * @param string $username
-        * @param string $password
+        * @param string $password Plaintext password

         * @return NULL|boolean from notification() and email() inherited
         */
         * @return NULL|boolean from notification() and email() inherited
         */

-       public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password)
+       public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password)

        {
        {

-               $preamble = deindent(L10n::t('
+               $preamble = Strings::deindent(L10n::t('

                        Dear %1$s,
                                Thank you for registering at %2$s. Your account has been created.
                        Dear %1$s,
                                Thank you for registering at %2$s. Your account has been created.

-               '));
-               $body = deindent(L10n::t('
+               ',
+                       $user['username'], $sitename
+               ));
+               $body = Strings::deindent(L10n::t('

                        The login details are as follows:
                        The login details are as follows:

-                               Site Location:  %3$s
-                               Login Name:     %1$s
-                               Password:       %5$s

 
 

-                       You may change your password from your account Settings page after logging
+                       Site Location:  %3$s
+                       Login Name:             %1$s
+                       Password:               %5$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.
                        in.
 
                        Please take a few moments to review the other account settings on that page.


@@ -627,7 +764,7 @@ class User
                        ' . "\x28" . 'on the "Profiles" page' . "\x29" . ' so that other people can easily find you.
 
                        We recommend setting your full name, adding a profile photo,
                        ' . "\x28" . 'on the "Profiles" page' . "\x29" . ' so that other people can easily find you.
 
                        We recommend setting your full name, adding a profile photo,

-                       adding some profile keywords ' . "\x28" . 'very useful in making new friends' . "\x29" . ' - and
+                       adding some profile "keywords" ' . "\x28" . 'very useful in making new friends' . "\x29" . ' - and

                        perhaps what country you live in; if you do not wish to be more specific
                        than that.
 
                        perhaps what country you live in; if you do not wish to be more specific
                        than that.
 


@@ -635,18 +772,21 @@ class User
                        If you are new and do not know anybody here, they may help
                        you to make some new and interesting friends.
 
                        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 %3$s/removeme

 
 

-                       Thank you and welcome to %2$s.'));
-
-               $preamble = sprintf($preamble, $username, $sitename);
-               $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
+                       Thank you and welcome to %2$s.',
+                       $user['email'], $sitename, $siteurl, $user['username'], $password
+               ));

 
                return notification([
 
                return notification([

-                       'type' => SYSTEM_EMAIL,
-                       'to_email' => $email,
-                       'subject'=> L10n::t('Registration details for %s', $sitename),
-                       'preamble'=> $preamble,
-                       'body' => $body]);
+                       'uid'      => $user['uid'],
+                       'language' => $user['language'],
+                       'type'     => SYSTEM_EMAIL,
+                       'to_email' => $user['email'],
+                       'subject'  => L10n::t('Registration details for %s', $sitename),
+                       'preamble' => $preamble,
+                       'body'     => $body
+               ]);

        }
 
        /**
        }
 
        /**


@@ -656,30 +796,102 @@ class User
        public static function remove($uid)
        {
                if (!$uid) {
        public static function remove($uid)
        {
                if (!$uid) {

-                       return;
+                       return false;

                }
 
                }
 

-               logger('Removing user: ' . $uid);
+               $a = get_app();
+
+               Logger::log('Removing user: ' . $uid);

 
 

-               $user = dba::selectFirst('user', [], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', [], ['uid' => $uid]);

 
 

-               Addon::callHooks('remove_user', $user);
+               Hook::callAll('remove_user', $user);

 
                // save username (actually the nickname as it is guaranteed
                // unique), so it cannot be re-registered in the future.
 
                // save username (actually the nickname as it is guaranteed
                // unique), so it cannot be re-registered in the future.

-               dba::insert('userd', ['username' => $user['nickname']]);
+               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 "cron_expire_and_remove_users" (cronjobs.php)

-               dba::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utcNow()], ['uid' => $uid]);
-               Worker::add(PRIORITY_HIGH, "Notifier", "removeme", $uid);
+               DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
+               Worker::add(PRIORITY_HIGH, 'Notifier', 'removeme', $uid);

 
                // Send an update to the directory
 
                // Send an update to the directory

-               Worker::add(PRIORITY_LOW, "Directory", $user['url']);
+               $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
+               Worker::add(PRIORITY_LOW, 'Directory', $self['url']);
+
+               // Remove the user relevant data
+               Worker::add(PRIORITY_LOW, 'RemoveUser', $uid);
+
+               return true;
+       }
+
+       /**
+        * Return all identities to a user
+        *
+        * @param int $uid The user id
+        * @return array All identities for this user
+        *
+        * Example for a return:
+        *      [
+        *              [
+        *                      'uid' => 1,
+        *                      'username' => 'maxmuster',
+        *                      'nickname' => 'Max Mustermann'
+        *              ],
+        *              [
+        *                      'uid' => 2,
+        *                      'username' => 'johndoe',
+        *                      'nickname' => 'John Doe'
+        *              ]
+        *      ]
+        */
+       public static function identities($uid)
+       {
+               $identities = [];

 
 

-               if ($uid == local_user()) {
-                       unset($_SESSION['authenticated']);
-                       unset($_SESSION['uid']);
-                       goaway(System::baseUrl());
+               $user = DBA::selectFirst('user', ['uid', 'nickname', 'username', 'parent-uid'], ['uid' => $uid]);
+               if (!DBA::isResult($user)) {
+                       return $identities;

                }
                }

+
+               if ($user['parent-uid'] == 0) {
+                       // First add our own entry
+                       $identities = [['uid' => $user['uid'],
+                               'username' => $user['username'],
+                               'nickname' => $user['nickname']]];
+
+                       // Then add all the children
+                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
+                               ['parent-uid' => $user['uid'], 'account_removed' => false]);
+                       if (DBA::isResult($r)) {
+                               $identities = array_merge($identities, DBA::toArray($r));
+                       }
+               } else {
+                       // First entry is our parent
+                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
+                               ['uid' => $user['parent-uid'], 'account_removed' => false]);
+                       if (DBA::isResult($r)) {
+                               $identities = DBA::toArray($r);
+                       }
+
+                       // Then add all siblings
+                       $r = DBA::select('user', ['uid', 'username', 'nickname'],
+                               ['parent-uid' => $user['parent-uid'], 'account_removed' => false]);
+                       if (DBA::isResult($r)) {
+                               $identities = array_merge($identities, DBA::toArray($r));
+                       }
+               }
+
+               $r = DBA::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
+                       FROM `manage`
+                       INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
+                       WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
+                       $user['uid']
+               );
+               if (DBA::isResult($r)) {
+                       $identities = array_merge($identities, DBA::toArray($r));
+               }
+
+               return $identities;

        }
 }
        }
 }