From 2bcc090622c0e62dbff94e52bb6892a51b40ba2a Mon Sep 17 00:00:00 2001
From: maTh <1645099+math-GH@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:48:07 +0200
Subject: configurable notification timeout (#7942)
Ref #7931
Ref #5466
Ref #6409
added configuration in "Display"
* i18n: fr
* Update app/i18n/pl/conf.php
Co-authored-by: Inverle
* make fix-all
* max()
* Minor whitespace
(I am not a fan of excessive vertical indenting)
---------
Co-authored-by: Alexandre Alapetite
Co-authored-by: Inverle
---
app/Controllers/authController.php | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
(limited to 'app/Controllers/authController.php')
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index 1bdbc28b1..64526a884 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -56,7 +56,11 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
invalidateHttpCache();
if ($ok) {
- Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'auth', 'a' => 'index' ]);
+ Minz_Request::good(
+ _t('feedback.conf.updated'),
+ [ 'c' => 'auth', 'a' => 'index' ],
+ showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+ );
} else {
Minz_Request::bad(_t('feedback.conf.error'), [ 'c' => 'auth', 'a' => 'index' ]);
}
@@ -176,7 +180,11 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
if (empty($url)) {
$url = [ 'c' => 'index', 'a' => 'index' ];
}
- Minz_Request::good(_t('feedback.auth.login.success'), $url);
+ Minz_Request::good(
+ _t('feedback.auth.login.success'),
+ $url,
+ showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+ );
} else {
Minz_Log::warning("Password mismatch for user={$username}, nonce={$nonce}, c={$challenge}");
header('HTTP/1.1 403 Forbidden');
@@ -214,7 +222,11 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
Minz_Translate::init(FreshRSS_Context::userConf()->language);
- Minz_Request::good(_t('feedback.auth.login.success'), ['c' => 'index', 'a' => 'index']);
+ Minz_Request::good(
+ _t('feedback.auth.login.success'),
+ ['c' => 'index', 'a' => 'index'],
+ showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+ );
} else {
Minz_Log::warning('Unsafe password mismatch for user ' . $username);
Minz_Request::bad(
@@ -263,7 +275,11 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
invalidateHttpCache();
FreshRSS_Auth::removeAccess();
Minz_Session::regenerateID('FreshRSS');
- Minz_Request::good(_t('feedback.auth.logout.success'), [ 'c' => 'index', 'a' => 'index' ]);
+ Minz_Request::good(
+ _t('feedback.auth.logout.success'),
+ [ 'c' => 'index', 'a' => 'index' ],
+ showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+ );
} else {
Minz_Error::error(403);
}
--
cgit v1.2.3