aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2020-10-05 19:03:33 +0200
committerGravatar GitHub <noreply@github.com> 2020-10-05 19:03:33 +0200
commit76523693592a58c7b15c2860ad95133f551d86a5 (patch)
treea0fc3605396921dbbb225b2ec04559a014d6f156 /app/Controllers
parent2f88b267805c71e9859c41bb50c348b1566cfc06 (diff)
Minz: Attach a notification to a request (#3208)
* Minz: Attach a notification to a request Notifications should be attached to a request, not to a global session. Fix https://github.com/FreshRSS/FreshRSS/pull/3096#issuecomment-654891906 Prepare https://github.com/FreshRSS/FreshRSS/pull/3096 * Rename array * Avoid string constants Implement https://github.com/FreshRSS/FreshRSS/pull/3208#issuecomment-703243863 * Improved logic * Simplify storage https://github.com/FreshRSS/FreshRSS/pull/3208#discussion_r499511213 * Fix notification bug in configuration/system
Diffstat (limited to 'app/Controllers')
-rw-r--r--app/Controllers/authController.php5
-rwxr-xr-xapp/Controllers/configureController.php5
-rwxr-xr-xapp/Controllers/feedController.php6
-rw-r--r--app/Controllers/userController.php20
4 files changed, 13 insertions, 23 deletions
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index cef8f9d2d..e7bff363e 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -166,10 +166,7 @@ class FreshRSS_auth_Controller extends Minz_ActionController {
header('HTTP/1.1 403 Forbidden');
Minz_Session::_param('POST_to_GET', true); //Prevent infinite internal redirect
- Minz_View::_param('notification', [
- 'type' => 'bad',
- 'content' => _t('feedback.auth.login.invalid'),
- ]);
+ Minz_Request::setBadNotification(_t('feedback.auth.login.invalid'));
Minz_Request::forward(['c' => 'auth', 'a' => 'login'], false);
return;
}
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 78b939a91..f0e636eef 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -374,10 +374,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
invalidateHttpCache();
- Minz_Session::_param('notification', array(
- 'type' => 'good',
- 'content' => _t('feedback.conf.updated')
- ));
+ Minz_Request::good(_t('feedback.conf.updated'), [ 'c' => 'configure', 'a' => 'system' ]);
}
}
}
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 2fc0734db..73faf8dce 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -544,11 +544,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
// Most of the time, ajax request is for only one feed. But since
// there are several parallel requests, we should return that there
// are several updated feeds.
- $notif = array(
- 'type' => 'good',
- 'content' => _t('feedback.sub.feed.actualizeds')
- );
- Minz_Session::_param('notification', $notif);
+ Minz_Request::setGoodNotification(_t('feedback.sub.feed.actualizeds'));
// No layout in ajax request.
$this->view->_layout(false);
} else {
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php
index 6e7908df3..4dfd11751 100644
--- a/app/Controllers/userController.php
+++ b/app/Controllers/userController.php
@@ -356,11 +356,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
FreshRSS_Auth::giveAccess();
}
- $notif = array(
- 'type' => $ok ? 'good' : 'bad',
- 'content' => _t('feedback.user.created' . (!$ok ? '.error' : ''), $new_user_name)
- );
- Minz_Session::_param('notification', $notif);
+ if ($ok) {
+ Minz_Request::setGoodNotification(_t('feedback.user.created', $new_user_name));
+ } else {
+ Minz_Request::setBadNotification(_t('feedback.user.created.error', $new_user_name));
+ }
}
$redirect_url = urldecode(Minz_Request::param('r', false, true));
@@ -546,11 +546,11 @@ class FreshRSS_user_Controller extends Minz_ActionController {
}
invalidateHttpCache();
- $notif = array(
- 'type' => $ok ? 'good' : 'bad',
- 'content' => _t('feedback.user.deleted' . (!$ok ? '.error' : ''), $username)
- );
- Minz_Session::_param('notification', $notif);
+ if ($ok) {
+ Minz_Request::setGoodNotification(_t('feedback.user.deleted', $username));
+ } else {
+ Minz_Request::setBadNotification(_t('feedback.user.deleted.error', $username));
+ }
}
Minz_Request::forward($redirect_url, true);