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 (!DBM::is_result($user)) {
+ return false;
+ }
+ return self::getOwnerDataById($user['uid']);
+ }
+
/**
* @brief Returns the default group for a given user and network
*
{
$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'])) {
+ //New password hash
if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
self::updatePassword($user['uid'], $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);
}
$confirm = x($data, 'confirm') ? trim($data['confirm']) : '';
$blocked = x($data, 'blocked') ? intval($data['blocked']) : 0;
$verified = x($data, 'verified') ? intval($data['verified']) : 0;
+ $language = x($data, 'language') ? notags(trim($data['language'])) : 'en';
$publish = x($data, 'profile_publish_reg') && intval($data['profile_publish_reg']) ? 1 : 0;
$netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
$_SESSION['register'] = 1;
$_SESSION['openid'] = $openid_url;
- $openid = new LightOpenID;
+ $openid = new LightOpenID($a->get_hostname());
$openid->identity = $openid_url;
$openid->returnUrl = System::baseUrl() . '/openid';
$openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
'sprvkey' => $sprvkey,
'verified' => $verified,
'blocked' => $blocked,
+ 'language' => $language,
'timezone' => 'UTC',
'register_date' => DateTimeFormat::utcNow(),
'default-location' => ''
'));
$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
+ 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.
' . "\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.
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.'));