]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/User.php
Fix translation strings for use with util/extract.php
[friendica.git] / src / Model / User.php
index 7d5f96a609fa386165d461007f012f5a1b9092aa..07df7ca6150a35171be1cafa3335fd3a381bd64c 100644 (file)
@@ -1,14 +1,14 @@
 <?php
-
 /**
  * @file src/Model/User.php
  * @brief This file includes the User class with user related database functions
  */
-
 namespace Friendica\Model;
 
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
@@ -16,22 +16,52 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
+use Friendica\Util\Crypto;
 use dba;
 use Exception;
 
 require_once 'boot.php';
-require_once 'include/crypto.php';
+require_once 'include/dba.php';
 require_once 'include/enotify.php';
 require_once 'include/network.php';
 require_once 'library/openid.php';
-require_once 'include/pgettext.php';
-require_once 'include/plugin.php';
 require_once 'include/text.php';
 /**
  * @brief This class handles User related functions
  */
 class User
 {
+       /**
+        * @brief Get owner data by user id
+        *
+        * @param int $uid
+        * @return boolean|array
+        */
+       public static function getOwnerDataById($uid) {
+               $r = dba::fetch_first("SELECT
+                       `contact`.*,
+                       `user`.`prvkey` AS `uprvkey`,
+                       `user`.`timezone`,
+                       `user`.`nickname`,
+                       `user`.`sprvkey`,
+                       `user`.`spubkey`,
+                       `user`.`page-flags`,
+                       `user`.`account-type`,
+                       `user`.`prvnets`
+                       FROM `contact`
+                       INNER JOIN `user`
+                               ON `user`.`uid` = `contact`.`uid`
+                       WHERE `contact`.`uid` = ?
+                       AND `contact`.`self`
+                       LIMIT 1",
+                       $uid
+               );
+               if (!DBM::is_result($r)) {
+                       return false;
+               }
+               return $r;
+       }
+
        /**
         * @brief Returns the default group for a given user and network
         *
@@ -52,7 +82,7 @@ class User
                        return $default_group;
                }
 
-               $user = dba::select('user', ['def_gid'], ['uid' => $uid], ['limit' => 1]);
+               $user = dba::selectFirst('user', ['def_gid'], ['uid' => $uid]);
 
                if (DBM::is_result($user)) {
                        $default_group = $user["def_gid"];
@@ -80,19 +110,17 @@ class User
                if (is_object($user_info)) {
                        $user = (array) $user_info;
                } elseif (is_int($user_info)) {
-                       $user = dba::select('user',
-                               ['uid', 'password'],
+                       $user = dba::selectFirst('user', ['uid', 'password', 'legacy_password'],
                                [
                                        'uid' => $user_info,
                                        'blocked' => 0,
                                        'account_expired' => 0,
                                        'account_removed' => 0,
                                        'verified' => 1
-                               ],
-                               ['limit' => 1]
+                               ]
                        );
                } elseif (is_string($user_info)) {
-                       $user = dba::fetch_first('SELECT `uid`, `password`
+                       $user = dba::fetch_first('SELECT `uid`, `password`, `legacy_password`
                                FROM `user`
                                WHERE (`email` = ? OR `username` = ? OR `nickname` = ?)
                                AND `blocked` = 0
@@ -108,17 +136,92 @@ class User
                        $user = $user_info;
                }
 
-               if (!DBM::is_result($user) || !isset($user['uid']) || !isset($user['password'])) {
-                       return false;
+               if (!DBM::is_result($user)
+                       || !isset($user['uid'])
+                       || !isset($user['password'])
+                       || !isset($user['legacy_password'])
+               ) {
+                       throw new Exception('Not enough information to authenticate');
                }
 
-               $password_hashed = hash('whirlpool', $password);
+               if ($user['legacy_password']) {
+                       if (password_verify(self::hashPasswordLegacy($password), $user['password'])) {
+                               self::updatePassword($user['uid'], $password);
 
-               if ($password_hashed !== $user['password']) {
-                       return false;
+                               return $user['uid'];
+                       }
+               } elseif (password_verify($password, $user['password'])) {
+                       if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
+                               self::updatePassword($user['uid'], $password);
+                       }
+
+                       return $user['uid'];
                }
 
-               return $user['uid'];
+               return false;
+       }
+
+       /**
+        * Generates a human-readable random password
+        *
+        * @return string
+        */
+       public static function generateNewPassword()
+       {
+               return autoname(6) . mt_rand(100, 9999);
+       }
+
+       /**
+        * Legacy hashing function, kept for password migration purposes
+        *
+        * @param string $password
+        * @return string
+        */
+       private static function hashPasswordLegacy($password)
+       {
+               return hash('whirlpool', $password);
+       }
+
+       /**
+        * Global user password hashing function
+        *
+        * @param string $password
+        * @return string
+        */
+       public static function hashPassword($password)
+       {
+               return password_hash($password, PASSWORD_DEFAULT);
+       }
+
+       /**
+        * Updates a user row with a new plaintext password
+        *
+        * @param int    $uid
+        * @param string $password
+        * @return bool
+        */
+       public static function updatePassword($uid, $password)
+       {
+               return self::updatePasswordHashed($uid, self::hashPassword($password));
+       }
+
+       /**
+        * Updates a user row with a new hashed password.
+        * Empties the password reset token field just in case.
+        *
+        * @param int    $uid
+        * @param string $pasword_hashed
+        * @return bool
+        */
+       private static function updatePasswordHashed($uid, $pasword_hashed)
+       {
+               $fields = [
+                       'password' => $pasword_hashed,
+                       'pwdreset' => null,
+                       'pwdreset_time' => null,
+                       'legacy_password' => false
+               ];
+               return dba::update('user', $fields, ['uid' => $uid]);
        }
 
        /**
@@ -161,49 +264,47 @@ class User
                $netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
 
                if ($password1 != $confirm) {
-                       throw new Exception(t('Passwords do not match. Password unchanged.'));
-               } elseif ($password1 != "") {
+                       throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
+               } elseif ($password1 != '') {
                        $password = $password1;
                }
 
-               $tmp_str = $openid_url;
-
                if ($using_invites) {
                        if (!$invite_id) {
-                               throw new Exception(t('An invitation is required.'));
+                               throw new Exception(L10n::t('An invitation is required.'));
                        }
-                       $r = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1", dbesc($invite_id));
-                       if (!results($r)) {
-                               throw new Exception(t('Invitation could not be verified.'));
+
+                       if (!dba::exists('register', ['hash' => $invite_id])) {
+                               throw new Exception(L10n::t('Invitation could not be verified.'));
                        }
                }
 
                if (!x($username) || !x($email) || !x($nickname)) {
                        if ($openid_url) {
-                               if (!validate_url($tmp_str)) {
-                                       throw new Exception(t('Invalid OpenID url'));
+                               if (!validate_url($openid_url)) {
+                                       throw new Exception(L10n::t('Invalid OpenID url'));
                                }
                                $_SESSION['register'] = 1;
                                $_SESSION['openid'] = $openid_url;
 
-                               $openid = new LightOpenID;
+                               $openid = new \LightOpenID;
                                $openid->identity = $openid_url;
                                $openid->returnUrl = System::baseUrl() . '/openid';
-                               $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-                               $openid->optional = array('namePerson/first', 'media/image/aspect11', 'media/image/default');
+                               $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
+                               $openid->optional = ['namePerson/first', 'media/image/aspect11', 'media/image/default'];
                                try {
                                        $authurl = $openid->authUrl();
                                } catch (Exception $e) {
-                                       throw new Exception(t("We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.") . EOL . EOL . t("The error message was:") . $e->getMessage(), 0, $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);
                                // NOTREACHED
                        }
 
-                       throw new Exception(t('Please enter the required information.'));
+                       throw new Exception(L10n::t('Please enter the required information.'));
                }
 
-               if (!validate_url($tmp_str)) {
+               if (!validate_url($openid_url)) {
                        $openid_url = '';
                }
 
@@ -213,10 +314,10 @@ class User
                $username = preg_replace('/ +/', ' ', $username);
 
                if (mb_strlen($username) > 48) {
-                       throw new Exception(t('Please use a shorter name.'));
+                       throw new Exception(L10n::t('Please use a shorter name.'));
                }
                if (mb_strlen($username) < 3) {
-                       throw new Exception(t('Name too short.'));
+                       throw new Exception(L10n::t('Name too short.'));
                }
 
                // So now we are just looking for a space in the full name.
@@ -224,181 +325,145 @@ class User
                if (!$loose_reg) {
                        $username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');
                        if (!strpos($username, ' ')) {
-                               throw new Exception(t("That doesn't appear to be your full \x28First Last\x29 name."));
+                               throw new Exception(L10n::t("That doesn't appear to be your full \x28First Last\x29 name."));
                        }
                }
 
                if (!allowed_email($email)) {
-                       throw new Exception(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) || !validate_email($email)) {
-                       throw new Exception(t('Not a valid email address.'));
+                       throw new Exception(L10n::t('Not a valid email address.'));
+               }
+
+               if (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.
-
-               $adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
-
-               //if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
-               if (x($a->config, 'admin_email') && in_array(strtolower($email), $adminlist) && strlen($openid_url)) {
-                       $r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
-                               dbesc($email)
-                       );
-                       if (DBM::is_result($r)) {
-                               $result['message'] .= t('Cannot use that email.') . EOL;
+               if (x($a->config, 'admin_email') && strlen($openid_url)) {
+                       $adminlist = explode(',', str_replace(' ', '', strtolower($a->config['admin_email'])));
+                       if (in_array(strtolower($email), $adminlist)) {
+                               throw new Exception(L10n::t('Cannot use that email.'));
                        }
                }
 
                $nickname = $data['nickname'] = strtolower($nickname);
 
-               if (!preg_match("/^[a-z0-9][a-z0-9\_]*$/", $nickname)) {
-                       throw new Exception(t('Your "nickname" can only contain "a-z", "0-9" and "_".'));
+               if (!preg_match('/^[a-z0-9][a-z0-9\_]*$/', $nickname)) {
+                       throw new Exception(L10n::t('Your nickname can only contain a-z, 0-9 and _.'));
                }
 
-               $r = q("SELECT `uid` FROM `user`
-                       WHERE `nickname` = '%s' LIMIT 1",
-                       dbesc($nickname)
-               );
-               if (DBM::is_result($r)) {
-                       throw new Exception(t('Nickname is already registered. Please choose another.'));
-               }
-
-               // Check deleted accounts that had this nickname. Doesn't matter to us,
-               // but could be a security issue for federated platforms.
-               $r = q("SELECT * FROM `userd`
-                       WHERE `username` = '%s' LIMIT 1",
-                       dbesc($nickname)
-               );
-               if (DBM::is_result($r)) {
-                       throw new Exception(t('Nickname was once registered here and may not be re-used. Please choose another.'));
+               // Check existing and deleted accounts for this nickname.
+               if (dba::exists('user', ['nickname' => $nickname])
+                       || dba::exists('userd', ['username' => $nickname])
+               ) {
+                       throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
                }
 
-               $new_password = strlen($password) ? $password : autoname(6) . mt_rand(100, 9999);
-               $new_password_encoded = hash('whirlpool', $new_password);
+               $new_password = strlen($password) ? $password : User::generateNewPassword();
+               $new_password_encoded = self::hashPassword($new_password);
 
                $return['password'] = $new_password;
 
-               $keys = new_keypair(4096);
+               $keys = Crypto::newKeypair(4096);
                if ($keys === false) {
-                       throw new Exception(t('SERIOUS ERROR: Generation of security keys failed.'));
+                       throw new Exception(L10n::t('SERIOUS ERROR: Generation of security keys failed.'));
                }
 
                $prvkey = $keys['prvkey'];
                $pubkey = $keys['pubkey'];
 
                // Create another keypair for signing/verifying salmon protocol messages.
-               $sres = new_keypair(512);
+               $sres = Crypto::newKeypair(512);
                $sprvkey = $sres['prvkey'];
                $spubkey = $sres['pubkey'];
 
-               $r = q("INSERT INTO `user` (`guid`, `username`, `password`, `email`, `openid`, `nickname`,
-                       `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `default-location`)
-                       VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '')",
-                       dbesc(generate_user_guid()),
-                       dbesc($username),
-                       dbesc($new_password_encoded),
-                       dbesc($email),
-                       dbesc($openid_url),
-                       dbesc($nickname),
-                       dbesc($pubkey),
-                       dbesc($prvkey),
-                       dbesc($spubkey),
-                       dbesc($sprvkey),
-                       dbesc(datetime_convert()),
-                       intval($verified),
-                       intval($blocked)
-               );
-
-               if ($r) {
-                       $r = q("SELECT * FROM `user`
-                               WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
-                               dbesc($username),
-                               dbesc($new_password_encoded)
-                       );
-                       if (DBM::is_result($r)) {
-                               $u = $r[0];
-                               $newuid = intval($r[0]['uid']);
-                       }
+               $insert_result = dba::insert('user', [
+                       'guid'     => generate_user_guid(),
+                       'username' => $username,
+                       'password' => $new_password_encoded,
+                       'email'    => $email,
+                       'openid'   => $openid_url,
+                       'nickname' => $nickname,
+                       'pubkey'   => $pubkey,
+                       'prvkey'   => $prvkey,
+                       'spubkey'  => $spubkey,
+                       'sprvkey'  => $sprvkey,
+                       'verified' => $verified,
+                       'blocked'  => $blocked,
+                       'timezone' => 'UTC',
+                       'register_date' => datetime_convert(),
+                       'default-location' => ''
+               ]);
+
+               if ($insert_result) {
+                       $uid = dba::lastInsertId();
+                       $user = dba::selectFirst('user', [], ['uid' => $uid]);
                } else {
-                       throw new Exception(t('An error occurred during registration. Please try again.'));
+                       throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
                }
 
-               /**
-                * if somebody clicked submit twice very quickly, they could end up with two accounts
-                * due to race condition. Remove this one.
-                */
-               $r = q("SELECT `uid` FROM `user`
-                       WHERE `nickname` = '%s' ",
-                       dbesc($nickname)
-               );
-               if (DBM::is_result($r) && count($r) > 1 && $newuid) {
-                       dba::delete('user', array('uid' => $newuid));
-
-                       throw new Exception(t('Nickname is already registered. Please choose another.'));
-               }
-
-               if (x($newuid) !== false) {
-                       $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
-                               VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
-                               intval($newuid),
-                               t('default'),
-                               1,
-                               dbesc($username),
-                               dbesc(System::baseUrl() . "/photo/profile/{$newuid}.jpg"),
-                               dbesc(System::baseUrl() . "/photo/avatar/{$newuid}.jpg"),
-                               intval($publish),
-                               intval($netpublish)
-                       );
-                       if ($r === false) {
-                               dba::delete('user', array('uid' => $newuid));
+               if (!$uid) {
+                       throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
+               }
 
-                               throw new Exception(t('An error occurred creating your default profile. Please try again.'));
-                       }
+               // 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]);
+               if ($user_count > 1) {
+                       dba::delete('user', ['uid' => $uid]);
 
-                       // Create the self contact
-                       if (!Contact::createSelfFromUserId($newuid)) {
-                               dba::delete('user', array('uid' => $newuid));
+                       throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
+               }
 
-                               throw new Exception(t('An error occurred creating your self contact. Please try again.'));
-                       }
+               $insert_result = dba::insert('profile', [
+                       'uid' => $uid,
+                       'name' => $username,
+                       'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",
+                       'thumb' => System::baseUrl() . "/photo/avatar/{$uid}.jpg",
+                       'publish' => $publish,
+                       'is-default' => 1,
+                       'net-publish' => $netpublish,
+                       'profile-name' => L10n::t('default')
+               ]);
+               if (!$insert_result) {
+                       dba::delete('user', ['uid' => $uid]);
+
+                       throw new Exception(L10n::t('An error occurred creating your default profile. Please try again.'));
+               }
 
-                       // Create a group with no members. This allows somebody to use it
-                       // right away as a default group for new contacts.
-                       if (!Group::create($newuid, t('Friends'))) {
-                               dba::delete('user', array('uid' => $newuid));
+               // Create the self contact
+               if (!Contact::createSelfFromUserId($uid)) {
+                       dba::delete('user', ['uid' => $uid]);
 
-                               throw new Exception(t('An error occurred creating your default contact group. Please try again.'));
-                       }
+                       throw new Exception(L10n::t('An error occurred creating your self contact. Please try again.'));
+               }
 
-                       $r = q("SELECT `id` FROM `group` WHERE `uid` = %d AND `name` = '%s'",
-                               intval($newuid),
-                               dbesc(t('Friends'))
-                       );
-                       if (DBM::is_result($r)) {
-                               $def_gid = $r[0]['id'];
+               // Create a group with no members. This allows somebody to use it
+               // 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]);
 
-                               q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d",
-                                       intval($r[0]['id']),
-                                       intval($newuid)
-                               );
-                       }
+                       throw new Exception(L10n::t('An error occurred creating your default contact group. Please try again.'));
+               }
 
-                       if (Config::get('system', 'newuser_private') && $def_gid) {
-                               q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d",
-                                       dbesc("<" . $def_gid . ">"),
-                                       intval($newuid)
-                               );
-                       }
+               $fields = ['def_gid' => $def_gid];
+               if (Config::get('system', 'newuser_private') && $def_gid) {
+                       $fields['allow_gid'] = '<' . $def_gid . '>';
                }
 
+               dba::update('user', $fields, ['uid' => $uid]);
+
                // if we have no OpenID photo try to look up an avatar
                if (!strlen($photo)) {
                        $photo = avatar_img($email);
                }
 
-               // unless there is no avatar-plugin loaded
+               // unless there is no avatar-addon loaded
                if (strlen($photo)) {
                        $photo_failure = false;
 
@@ -407,14 +472,13 @@ class User
                        // guess mimetype from headers or filename
                        $type = Image::guessType($photo, true);
 
-
                        $Image = new Image($img_str, $type);
                        if ($Image->isValid()) {
                                $Image->scaleToSquare(175);
 
                                $hash = photo_new_resource();
 
-                               $r = Photo::store($Image, $newuid, 0, $hash, $filename, t('Profile Photos'), 4);
+                               $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 4);
 
                                if ($r === false) {
                                        $photo_failure = true;
@@ -422,7 +486,7 @@ class User
 
                                $Image->scaleDown(80);
 
-                               $r = Photo::store($Image, $newuid, 0, $hash, $filename, t('Profile Photos'), 5);
+                               $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 5);
 
                                if ($r === false) {
                                        $photo_failure = true;
@@ -430,23 +494,21 @@ class User
 
                                $Image->scaleDown(48);
 
-                               $r = Photo::store($Image, $newuid, 0, $hash, $filename, t('Profile Photos'), 6);
+                               $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 6);
 
                                if ($r === false) {
                                        $photo_failure = true;
                                }
 
                                if (!$photo_failure) {
-                                       q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
-                                               dbesc($hash)
-                                       );
+                                       dba::update('photo', ['profile' => 1], ['resource-id' => $hash]);
                                }
                        }
                }
 
-               call_hooks('register_account', $newuid);
+               Addon::callHooks('register_account', $uid);
 
-               $return['user'] = $u;
+               $return['user'] = $user;
                return $return;
        }
 
@@ -460,18 +522,18 @@ class User
         */
        public static function sendRegisterPendingEmail($email, $sitename, $username)
        {
-               $body = deindent(t('
+               $body = deindent(L10n::t('
                        Dear %1$s,
                                Thank you for registering at %2$s. Your account is pending for approval by the administrator.
                '));
 
                $body = sprintf($body, $username, $sitename);
 
-               return notification(array(
+               return notification([
                        'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
-                       'subject'=> sprintf( t('Registration at %s'), $sitename),
-                       'body' => $body));
+                       'subject'=> L10n::t('Registration at %s', $sitename),
+                       'body' => $body]);
        }
 
        /**
@@ -488,26 +550,26 @@ class User
         */
        public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password)
        {
-               $preamble = deindent(t('
+               $preamble = deindent(L10n::t('
                        Dear %1$s,
                                Thank you for registering at %2$s. Your account has been created.
                '));
-               $body = deindent(t('
+               $body = deindent(L10n::t('
                        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
+                       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.
+                       ' . "\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" (very useful in making new friends) - 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.
 
@@ -521,12 +583,12 @@ class User
                $preamble = sprintf($preamble, $username, $sitename);
                $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
-               return notification(array(
+               return notification([
                        'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
-                       'subject'=> sprintf( t('Registration details for %s'), $sitename),
+                       'subject'=> L10n::t('Registration details for %s', $sitename),
                        'preamble'=> $preamble,
-                       'body' => $body));
+                       'body' => $body]);
        }
 
        /**
@@ -541,9 +603,9 @@ class User
 
                logger('Removing user: ' . $uid);
 
-               $user = dba::select('user', [], ['uid' => $uid], ['limit' => 1]);
+               $user = dba::selectFirst('user', [], ['uid' => $uid]);
 
-               call_hooks('remove_user', $user);
+               Addon::callHooks('remove_user', $user);
 
                // save username (actually the nickname as it is guaranteed
                // unique), so it cannot be re-registered in the future.