keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Swap if / elseif

Browse source 
https://github.com/friendica/friendica/pull/4782#discussion_r179947984
This commit is contained in:
Alexandre Alapetite 2018-04-08 16:02:25 +02:00
parent 82f1f2f00e
commit e860cdf6a8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Model/User.php
View file

@ -127,18 +127,18 @@ class User
{ {
$user = self::getAuthenticationInfo($user_info); $user = self::getAuthenticationInfo($user_info);
if (password_verify($password, $user['password'])) { if (strpos($user['password'], '$') === false) {
if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
self::updatePassword($user['uid'], $password);
}
return $user['uid'];
} elseif (strpos($user['password'], '$') === false) {
if (self::hashPasswordLegacy($password) === $user['password']) { if (self::hashPasswordLegacy($password) === $user['password']) {
self::updatePassword($user['uid'], $password); self::updatePassword($user['uid'], $password);
return $user['uid']; 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'];
} }
throw new Exception(L10n::t('Login failed')); throw new Exception(L10n::t('Login failed'));