oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-07 15:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Welcome version 2025.02-dev!

Browse source 
# Conflicts:
#	CHANGELOG
#	VERSION
#	database.sql
#	src/App.php
#	view/lang/C/messages.po
This commit is contained in:
Hypolite Petovan 2025-01-01 12:16:35 -05:00
commit 8b47378720
52 changed files with 18753 additions and 18556 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Security/Authentication.php
View file

@ -254,7 +254,7 @@ class Authentication
$record = $this->dba->selectFirst(
'user',
[],
['uid' => User::getIdFromPasswordAuthentication($username, $password)]
['uid' => User::getIdFromPasswordAuthentication($username, $password, false, true)]
);
} catch (Exception $e) {
$this->logger->warning('authenticate: failed login attempt', ['action' => 'login', 'username' => $username, 'ip' => $this->remoteAddress]);
@ -262,6 +262,12 @@ class Authentication
$this->baseUrl->redirect();
}
if ($record['blocked']) {
$this->logger->warning('authenticate: user is blocked', ['action' => 'login', 'username' => $username, 'ip' => $this->remoteAddress]);
DI::sysmsg()->addNotice($this->l10n->t('Login failed because your account is blocked.'));
$this->baseUrl->redirect();
}
if (!$remember) {
$trusted = $this->cookie->get('2fa_cookie_hash') ?? null;
$this->cookie->clear();