mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-16 12:27:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix login (#5955)

Browse Source 
fix https://github.com/FreshRSS/FreshRSS/issues/5953
Regression due to https://github.com/FreshRSS/FreshRSS/pull/5946
This commit is contained in:
Alexandre Alapetite
2023-12-20 16:36:55 +01:00
committed by GitHub
parent a80a5f48a1
commit 79604aa4b3
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/javascriptController.php
View File

@@ -49,7 +49,7 @@ class FreshRSS_javascript_Controller extends FreshRSS_ActionController {
$user = $_GET['user'] ?? '';
FreshRSS_Context::initUser($user);
if (!FreshRSS_Context::hasUserConf()) {
if (FreshRSS_Context::hasUserConf()) {
try {
$salt = FreshRSS_Context::systemConf()->salt;
$s = FreshRSS_Context::userConf()->passwordHash;
@@ -64,7 +64,7 @@ class FreshRSS_javascript_Controller extends FreshRSS_ActionController {
Minz_Log::warning('Nonce failure: ' . $me->getMessage());
}
} else {
Minz_Log::notice('Nonce failure due to invalid username!');
Minz_Log::notice('Nonce failure due to invalid username! ' . $user);
}
//Failure: Return random data.
$this->view->salt1 = sprintf('$2a$%02d$', FreshRSS_password_Util::BCRYPT_COST);