<?php
+
/**
* @file src/Model/User.php
- * @brief This file includes the User class with user related database functions
+ * This file includes the User class with user related database functions
*/
+
namespace Friendica\Model;
use DivineOmega\PasswordExposed;
use Exception;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\TwoFactor\AppSpecificPassword;
use Friendica\Object\Image;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\Strings;
+use Friendica\Worker\Delivery;
use LightOpenID;
/**
- * @brief This class handles User related functions
+ * This class handles User related functions
*/
class User
{
return DBA::selectFirst('user', $fields, ['uid' => $uid]);
}
+ /**
+ * Returns a user record based on it's GUID
+ *
+ * @param string $guid The guid of the user
+ * @param array $fields The fields to retrieve
+ * @param bool $active True, if only active records are searched
+ *
+ * @return array|boolean User record if it exists, false otherwise
+ * @throws Exception
+ */
+ public static function getByGuid(string $guid, array $fields = [], bool $active = true)
+ {
+ if ($active) {
+ $cond = ['guid' => $guid, 'account_expired' => false, 'account_removed' => false];
+ } else {
+ $cond = ['guid' => $guid];
+ }
+
+ return DBA::selectFirst('user', $fields, $cond);
+ }
+
/**
* @param string $nickname
* @param array $fields
}
/**
- * @brief Returns the user id of a given profile URL
+ * Returns the user id of a given profile URL
*
* @param string $url
*
}
/**
- * Get a user based on it's email
+ * Get a user based on its email
*
* @param string $email
* @param array $fields
}
/**
- * @brief Get owner data by user id
+ * Get owner data by user id
*
* @param int $uid
+ * @param boolean $check_valid Test if data is invalid and correct it
* @return boolean|array
* @throws Exception
*/
- public static function getOwnerDataById($uid) {
- $r = DBA::fetchFirst("SELECT
+ public static function getOwnerDataById($uid, $check_valid = true)
+ {
+ $r = DBA::fetchFirst(
+ "SELECT
`contact`.*,
`user`.`prvkey` AS `uprvkey`,
`user`.`timezone`,
`user`.`page-flags`,
`user`.`account-type`,
`user`.`prvnets`,
- `user`.`account_removed`
+ `user`.`account_removed`,
+ `user`.`hidewall`
FROM `contact`
INNER JOIN `user`
ON `user`.`uid` = `contact`.`uid`
return false;
}
+ if (!$check_valid) {
+ return $r;
+ }
+
// 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']))) {
+ // Check for correct url and normalised nurl
+ $url = DI::baseUrl() . '/profile/' . $r['nickname'];
+ $repair = ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']));
+
+ if (!$repair) {
+ // Check if "addr" is present and correct
+ $addr = $r['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+ $repair = ($addr != $r['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']);
+ }
+ }
+
+ if ($repair) {
Contact::updateSelfFromUserID($uid);
+ // Return the corrected data and avoid a loop
+ $r = self::getOwnerDataById($uid, false);
}
return $r;
}
/**
- * @brief Get owner data by nick name
+ * Get owner data by nick name
*
* @param int $nick
* @return boolean|array
}
/**
- * @brief Returns the default group for a given user and network
+ * Returns the default group for a given user and network
*
* @param int $uid User id
* @param string $network network name
$default_group = 0;
if ($network == Protocol::OSTATUS) {
- $default_group = PConfig::get($uid, "ostatus", "default_group");
+ $default_group = DI::pConfig()->get($uid, "ostatus", "default_group");
}
if ($default_group != 0) {
/**
* Authenticate a user with a clear text password
*
- * @brief Authenticate a user with a clear text password
- * @param mixed $user_info
+ * @param mixed $user_info
* @param string $password
+ * @param bool $third_party
* @return int|boolean
* @deprecated since version 3.6
- * @see User::getIdFromPasswordAuthentication()
+ * @see User::getIdFromPasswordAuthentication()
*/
- public static function authenticate($user_info, $password)
+ public static function authenticate($user_info, $password, $third_party = false)
{
try {
- return self::getIdFromPasswordAuthentication($user_info, $password);
+ return self::getIdFromPasswordAuthentication($user_info, $password, $third_party);
} catch (Exception $ex) {
return false;
}
}
/**
+ * Authenticate a user with a clear text password
+ *
* Returns the user id associated with a successful password authentication
*
- * @brief Authenticate a user with a clear text password
- * @param mixed $user_info
+ * @param mixed $user_info
* @param string $password
+ * @param bool $third_party
* @return int User Id if authentication is successful
* @throws Exception
*/
- public static function getIdFromPasswordAuthentication($user_info, $password)
+ public static function getIdFromPasswordAuthentication($user_info, $password, $third_party = false)
{
$user = self::getAuthenticationInfo($user_info);
- if (strpos($user['password'], '$') === false) {
+ if ($third_party && DI::pConfig()->get($user['uid'], '2fa', 'verified')) {
+ // Third-party apps can't verify two-factor authentication, we use app-specific passwords instead
+ if (AppSpecificPassword::authenticateUser($user['uid'], $password)) {
+ return $user['uid'];
+ }
+ } elseif (strpos($user['password'], '$') === false) {
//Legacy hash that has not been replaced by a new hash yet
if (self::hashPasswordLegacy($password) === $user['password']) {
self::updatePasswordHashed($user['uid'], self::hashPassword($password));
return $user['uid'];
}
- throw new Exception(L10n::t('Login failed'));
+ throw new Exception(DI::l10n()->t('Login failed'));
}
/**
$user = $user_info;
}
- if (!isset($user['uid'])
+ if (
+ !isset($user['uid'])
|| !isset($user['password'])
|| !isset($user['legacy_password'])
) {
- throw new Exception(L10n::t('Not enough information to authenticate'));
+ throw new Exception(DI::l10n()->t('Not enough information to authenticate'));
}
} 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,
);
} else {
$fields = ['uid', 'password', 'legacy_password'];
- $condition = ["(`email` = ? OR `username` = ? OR `nickname` = ?)
+ $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_info, $user_info, $user_info
+ ];
$user = DBA::selectFirst('user', $fields, $condition);
}
if (!DBA::isResult($user)) {
- throw new Exception(L10n::t('User not found'));
+ throw new Exception(DI::l10n()->t('User not found'));
}
}
*/
public static function generateNewPassword()
{
- return ucfirst(Strings::getRandomName(8)) . mt_rand(1000, 9999);
+ return ucfirst(Strings::getRandomName(8)) . random_int(1000, 9999);
}
/**
*
* @param string $password
* @return bool
+ * @throws Exception
*/
public static function isPasswordExposed($password)
{
'cacheDirectory' => get_temppath() . '/password-exposed-cache/',
]);
- $PasswordExposedCHecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
+ try {
+ $passwordExposedChecker = new PasswordExposed\PasswordExposedChecker(null, $cache);
- return $PasswordExposedCHecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
+ return $passwordExposedChecker->passwordExposed($password) === PasswordExposed\PasswordStatus::EXPOSED;
+ } catch (\Exception $e) {
+ Logger::error('Password Exposed Exception: ' . $e->getMessage(), [
+ 'code' => $e->getCode(),
+ 'file' => $e->getFile(),
+ 'line' => $e->getLine(),
+ 'trace' => $e->getTraceAsString()
+ ]);
+
+ return false;
+ }
}
/**
public static function hashPassword($password)
{
if (!trim($password)) {
- throw new Exception(L10n::t('Password can\'t be empty'));
+ throw new Exception(DI::l10n()->t('Password can\'t be empty'));
}
return password_hash($password, PASSWORD_DEFAULT);
$password = trim($password);
if (empty($password)) {
- throw new Exception(L10n::t('Empty passwords are not allowed.'));
+ throw new Exception(DI::l10n()->t('Empty passwords are not allowed.'));
}
- if (!Config::get('system', 'disable_password_exposed', false) && self::isPasswordExposed($password)) {
- throw new Exception(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
+ if (!DI::config()->get('system', 'disable_password_exposed', false) && self::isPasswordExposed($password)) {
+ throw new Exception(DI::l10n()->t('The new password has been exposed in a public data dump, please choose another.'));
}
$allowed_characters = '!"#$%&\'()*+,-./;<=>?@[\]^_`{|}~';
if (!preg_match('/^[a-z0-9' . preg_quote($allowed_characters, '/') . ']+$/i', $password)) {
- throw new Exception(L10n::t('The password can\'t contain accentuated letters, white spaces or colons (:)'));
+ throw new Exception(DI::l10n()->t('The password can\'t contain accentuated letters, white spaces or colons (:)'));
}
return self::updatePasswordHashed($uid, self::hashPassword($password));
}
/**
- * @brief Checks if a nickname is in the list of the forbidden nicknames
+ * 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
*/
public static function isNicknameBlocked($nickname)
{
- $forbidden_nicknames = Config::get('system', 'forbidden_nicknames', '');
+ $forbidden_nicknames = DI::config()->get('system', 'forbidden_nicknames', '');
// if the config variable is empty return false
if (empty($forbidden_nicknames)) {
}
/**
- * @brief Catch-all user creation function
+ * Catch-all user creation function
*
* Creates a user from the provided data array, either form fields or OpenID.
* Required: { username, nickname, email } or { openid_url }
*/
public static function create(array $data)
{
- $a = \get_app();
$return = ['user' => null, 'password' => ''];
- $using_invites = Config::get('system', 'invitation_only');
+ $using_invites = DI::config()->get('system', 'invitation_only');
$invite_id = !empty($data['invite_id']) ? Strings::escapeTags(trim($data['invite_id'])) : '';
$username = !empty($data['username']) ? Strings::escapeTags(trim($data['username'])) : '';
$language = !empty($data['language']) ? Strings::escapeTags(trim($data['language'])) : 'en';
$publish = !empty($data['profile_publish_reg']);
- $netpublish = $publish && Config::get('system', 'directory');
+ $netpublish = $publish && DI::config()->get('system', 'directory');
if ($password1 != $confirm) {
- throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
+ throw new Exception(DI::l10n()->t('Passwords do not match. Password unchanged.'));
} elseif ($password1 != '') {
$password = $password1;
}
if ($using_invites) {
if (!$invite_id) {
- throw new Exception(L10n::t('An invitation is required.'));
+ throw new Exception(DI::l10n()->t('An invitation is required.'));
}
if (!Register::existsByHash($invite_id)) {
- throw new Exception(L10n::t('Invitation could not be verified.'));
+ throw new Exception(DI::l10n()->t('Invitation could not be verified.'));
}
}
+ /// @todo Check if this part is really needed. We should have fetched all this data in advance
if (empty($username) || empty($email) || empty($nickname)) {
if ($openid_url) {
if (!Network::isUrlValid($openid_url)) {
- throw new Exception(L10n::t('Invalid OpenID url'));
+ throw new Exception(DI::l10n()->t('Invalid OpenID url'));
}
$_SESSION['register'] = 1;
$_SESSION['openid'] = $openid_url;
- $openid = new LightOpenID($a->getHostName());
+ $openid = new LightOpenID(DI::baseUrl()->getHostname());
$openid->identity = $openid_url;
- $openid->returnUrl = System::baseUrl() . '/openid';
+ $openid->returnUrl = DI::baseUrl() . '/openid';
$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(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);
+ throw new Exception(DI::l10n()->t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.') . EOL . EOL . DI::l10n()->t('The error message was:') . $e->getMessage(), 0, $e);
}
System::externalRedirect($authurl);
// NOTREACHED
}
- throw new Exception(L10n::t('Please enter the required information.'));
+ throw new Exception(DI::l10n()->t('Please enter the required information.'));
}
if (!Network::isUrlValid($openid_url)) {
// collapse multiple spaces in name
$username = preg_replace('/ +/', ' ', $username);
- $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))));
+ $username_min_length = max(1, min(64, intval(DI::config()->get('system', 'username_min_length', 3))));
+ $username_max_length = max(1, min(64, intval(DI::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);
+ Logger::log(DI::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));
+ throw new Exception(DI::l10n()->tt('Username should be at least %s character.', 'Username should be at least %s characters.', $username_min_length));
}
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));
+ throw new Exception(DI::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');
+ $loose_reg = DI::config()->get('system', 'no_regfullname');
if (!$loose_reg) {
$username = mb_convert_case($username, MB_CASE_TITLE, 'UTF-8');
if (strpos($username, ' ') === false) {
- throw new Exception(L10n::t("That doesn't appear to be your full (First Last) name."));
+ throw new Exception(DI::l10n()->t("That doesn't appear to be your full (First Last) name."));
}
}
if (!Network::isEmailDomainAllowed($email)) {
- throw new Exception(L10n::t('Your email domain is not among those allowed on this site.'));
+ throw new Exception(DI::l10n()->t('Your email domain is not among those allowed on this site.'));
}
if (!filter_var($email, FILTER_VALIDATE_EMAIL) || !Network::isEmailDomainValid($email)) {
- throw new Exception(L10n::t('Not a valid email address.'));
+ throw new Exception(DI::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.'));
+ throw new Exception(DI::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])) {
- throw new Exception(L10n::t('Cannot use that email.'));
+ if (DI::config()->get('system', 'block_extended_register', false) && DBA::exists('user', ['email' => $email])) {
+ throw new Exception(DI::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 (Config::get('config', 'admin_email') && strlen($openid_url)) {
- $adminlist = explode(',', str_replace(' ', '', strtolower(Config::get('config', 'admin_email'))));
+ if (DI::config()->get('config', 'admin_email') && strlen($openid_url)) {
+ $adminlist = explode(',', str_replace(' ', '', strtolower(DI::config()->get('config', 'admin_email'))));
if (in_array(strtolower($email), $adminlist)) {
- throw new Exception(L10n::t('Cannot use that email.'));
+ throw new Exception(DI::l10n()->t('Cannot use that email.'));
}
}
$nickname = $data['nickname'] = strtolower($nickname);
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 _.'));
+ throw new Exception(DI::l10n()->t('Your nickname can only contain a-z, 0-9 and _.'));
}
// Check existing and deleted accounts for this nickname.
- if (DBA::exists('user', ['nickname' => $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(DI::l10n()->t('Nickname is already registered. Please choose another.'));
}
$new_password = strlen($password) ? $password : User::generateNewPassword();
$keys = Crypto::newKeypair(4096);
if ($keys === false) {
- throw new Exception(L10n::t('SERIOUS ERROR: Generation of security keys failed.'));
+ throw new Exception(DI::l10n()->t('SERIOUS ERROR: Generation of security keys failed.'));
}
$prvkey = $keys['prvkey'];
$uid = DBA::lastInsertId();
$user = DBA::selectFirst('user', [], ['uid' => $uid]);
} else {
- throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
+ throw new Exception(DI::l10n()->t('An error occurred during registration. Please try again.'));
}
if (!$uid) {
- throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
+ throw new Exception(DI::l10n()->t('An error occurred during registration. Please try again.'));
}
// if somebody clicked submit twice very quickly, they could end up with two accounts
if ($user_count > 1) {
DBA::delete('user', ['uid' => $uid]);
- throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
+ throw new Exception(DI::l10n()->t('Nickname is already registered. Please choose another.'));
}
$insert_result = DBA::insert('profile', [
'uid' => $uid,
'name' => $username,
- 'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",
- 'thumb' => System::baseUrl() . "/photo/avatar/{$uid}.jpg",
+ 'photo' => DI::baseUrl() . "/photo/profile/{$uid}.jpg",
+ 'thumb' => DI::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.'));
+ throw new Exception(DI::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]);
- throw new Exception(L10n::t('An error occurred creating your self contact. Please try again.'));
+ throw new Exception(DI::l10n()->t('An error occurred creating your self contact. Please try again.'));
}
// 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'));
+ $def_gid = Group::create($uid, DI::l10n()->t('Friends'));
if (!$def_gid) {
DBA::delete('user', ['uid' => $uid]);
- throw new Exception(L10n::t('An error occurred creating your default contact group. Please try again.'));
+ throw new Exception(DI::l10n()->t('An error occurred creating your default contact group. Please try again.'));
}
$fields = ['def_gid' => $def_gid];
- if (Config::get('system', 'newuser_private') && $def_gid) {
+ if (DI::config()->get('system', 'newuser_private') && $def_gid) {
$fields['allow_gid'] = '<' . $def_gid . '>';
}
$filename = basename($photo);
$img_str = Network::fetchUrl($photo, true);
// guess mimetype from headers or filename
- $type = Image::guessType($photo, true);
+ $type = Images::guessType($photo, true);
$Image = new Image($img_str, $type);
if ($Image->isValid()) {
$Image->scaleToSquare(300);
- $hash = Photo::newResource();
+ $resource_id = Photo::newResource();
- $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 4);
+ $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 4);
if ($r === false) {
$photo_failure = true;
$Image->scaleDown(80);
- $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 5);
+ $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 5);
if ($r === false) {
$photo_failure = true;
$Image->scaleDown(48);
- $r = Photo::store($Image, $uid, 0, $hash, $filename, L10n::t('Profile Photos'), 6);
+ $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 6);
if ($r === false) {
$photo_failure = true;
}
if (!$photo_failure) {
- Photo::update(['profile' => 1], ['resource-id' => $hash]);
+ Photo::update(['profile' => 1], ['resource-id' => $resource_id]);
}
}
}
}
/**
- * @brief Sends pending registration confirmation email
+ * Sends pending registration confirmation email
*
* @param array $user User record array
* @param string $sitename
*/
public static function sendRegisterPendingEmail($user, $sitename, $siteurl, $password)
{
- $body = Strings::deindent(L10n::t('
+ $body = Strings::deindent(DI::l10n()->t(
+ '
Dear %1$s,
Thank you for registering at %2$s. Your account is pending for approval by the administrator.
Login Name: %4$s
Password: %5$s
',
- $user['username'], $sitename, $siteurl, $user['nickname'], $password
+ $user['username'],
+ $sitename,
+ $siteurl,
+ $user['nickname'],
+ $password
));
return notification([
'type' => SYSTEM_EMAIL,
'uid' => $user['uid'],
'to_email' => $user['email'],
- 'subject' => L10n::t('Registration at %s', $sitename),
+ 'subject' => DI::l10n()->t('Registration at %s', $sitename),
'body' => $body
]);
}
/**
- * @brief Sends registration confirmation
+ * Sends registration confirmation
*
* It's here as a function because the mail is sent from different parts
*
- * @param array $user User record array
- * @param string $sitename
- * @param string $siteurl
- * @param string $password Plaintext password
+ * @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
+ *
* @return NULL|boolean from notification() and email() inherited
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function sendRegisterOpenEmail($user, $sitename, $siteurl, $password)
+ public static function sendRegisterOpenEmail(\Friendica\Core\L10n $l10n, $user, $sitename, $siteurl, $password)
{
- $preamble = Strings::deindent(L10n::t('
- Dear %1$s,
+ $preamble = Strings::deindent($l10n->t(
+ '
+ Dear %1$s,
Thank you for registering at %2$s. Your account has been created.
- ',
- $user['username'], $sitename
+ ',
+ $user['username'],
+ $sitename
));
- $body = Strings::deindent(L10n::t('
+ $body = Strings::deindent($l10n->t(
+ '
The login details are as follows:
Site Location: %3$s
If you ever want to delete your account, you can do so at %3$s/removeme
Thank you and welcome to %2$s.',
- $user['nickname'], $sitename, $siteurl, $user['username'], $password
+ $user['nickname'],
+ $sitename,
+ $siteurl,
+ $user['username'],
+ $password
));
return notification([
'language' => $user['language'],
'type' => SYSTEM_EMAIL,
'to_email' => $user['email'],
- 'subject' => L10n::t('Registration details for %s', $sitename),
+ 'subject' => DI::l10n()->t('Registration details for %s', $sitename),
'preamble' => $preamble,
'body' => $body
]);
// 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::utc('now + 7 day')], ['uid' => $uid]);
- Worker::add(PRIORITY_HIGH, 'Notifier', 'removeme', $uid);
+ Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid);
// Send an update to the directory
$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
if ($user['parent-uid'] == 0) {
// First add our own entry
- $identities = [['uid' => $user['uid'],
+ $identities = [[
+ 'uid' => $user['uid'],
'username' => $user['username'],
- 'nickname' => $user['nickname']]];
+ 'nickname' => $user['nickname']
+ ]];
// Then add all the children
- $r = DBA::select('user', ['uid', 'username', 'nickname'],
- ['parent-uid' => $user['uid'], 'account_removed' => false]);
+ $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]);
+ $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]);
+ $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`
+ $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` = ?",
$userStmt = DBA::p("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
FROM `user`
- INNER JOIN `profile` ON `profile`.`uid` = `user`.`uid` AND `profile`.`is-default`
+ 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`
+ WHERE `user`.`verified` AND `user`.`login_date` > '0001-01-01' AND NOT `user`.`account-type` = 3
AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
AND NOT `user`.`account_expired`");
while ($user = DBA::fetch($userStmt)) {
$statistics['total_users']++;
- if ((strtotime($user['login_date']) > $halfyear) ||
- (strtotime($user['last-item']) > $halfyear)) {
+ if ((strtotime($user['login_date']) > $halfyear) || (strtotime($user['last-item']) > $halfyear)
+ ) {
$statistics['active_users_halfyear']++;
}
- if ((strtotime($user['login_date']) > $month) ||
- (strtotime($user['last-item']) > $month)) {
+ if ((strtotime($user['login_date']) > $month) || (strtotime($user['last-item']) > $month)
+ ) {
$statistics['active_users_monthly']++;
}
}