aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/javascriptController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2023-12-20 16:36:55 +0100
committerGravatar GitHub <noreply@github.com> 2023-12-20 16:36:55 +0100
commit79604aa4b3051f083d1734bd9e82c6a89d785c5a (patch)
treeb0b239c679191cfc6768eb437e851ab26679e329 /app/Controllers/javascriptController.php
parenta80a5f48a16e7d232168a7aaa68e9a1804235ce1 (diff)
Fix login (#5955)
fix https://github.com/FreshRSS/FreshRSS/issues/5953 Regression due to https://github.com/FreshRSS/FreshRSS/pull/5946
Diffstat (limited to 'app/Controllers/javascriptController.php')
-rw-r--r--app/Controllers/javascriptController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index a9c4993df..74e4a0dd9 100644
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -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);