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

Apply suggestions from code review

Browse source 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Michael Vogel 2021-11-07 16:45:36 +01:00 committed by GitHub
parent eb1b2256a0
commit b60c342a8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/api.php
View file

@ -239,11 +239,9 @@ function api_login(App $a)
} else {
try {
$user_id = User::getIdFromPasswordAuthentication(trim($user), trim($password), true);
if ($user_id !== false) {
$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
}
} catch (Exception $ex) {
$record = [];
$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
} catch (Exception $ex) {
$record = [];
}
}

6
mod/settings.php
View file

@ -309,12 +309,8 @@ function settings_post(App $a)
if ($email != $user['email']) {
// check for the correct password
try {
$authenticated = User::getIdFromPasswordAuthentication(intval(local_user()), $_POST['mpassword']);
User::getIdFromPasswordAuthentication(local_user(), $_POST['mpassword']);
} catch (Exception $ex) {
$authenticated = false;
}
if (!$authenticated) {
$err .= DI::l10n()->t('Wrong Password.');
$email = $user['email'];
}