From f6fc22f5ac2dd39009eb9bc57a24e40d7938041f Mon Sep 17 00:00:00 2001
From: Moreau Elise <moreau.elise13@gmail.com>
Date: Sat, 31 Oct 2020 16:16:15 +0100
Subject: [PATCH] rename flash messages
---
src/Application/Actions/Group/AddUserGroupAction.php | 2 +-
src/Application/Actions/Group/CreateGroupAction.php | 4 ++--
src/Application/Actions/Group/DeleteGroupAction.php | 2 +-
src/Application/Actions/Group/ViewModifyGroupForm.php | 2 +-
src/Application/Actions/User/CreateUserAction.php | 6 +++---
src/Application/Actions/User/LogInUserAction.php | 6 +++---
src/Application/Actions/User/NearContaminatedUsers.php | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Application/Actions/Group/AddUserGroupAction.php b/src/Application/Actions/Group/AddUserGroupAction.php
index 9a37f61..bd68c65 100755
--- a/src/Application/Actions/Group/AddUserGroupAction.php
+++ b/src/Application/Actions/Group/AddUserGroupAction.php
@@ -15,7 +15,7 @@ class AddUserGroupAction extends GroupAction
protected function action(): Response
{
if(!isset($_SESSION['userId'])){
- $this->flash->addMessage('message', 'Please log in or sign up.');
+ $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
return $this->response
->withHeader('Location', '/login')
diff --git a/src/Application/Actions/Group/CreateGroupAction.php b/src/Application/Actions/Group/CreateGroupAction.php
index 7d2b69a..1cbb90d 100755
--- a/src/Application/Actions/Group/CreateGroupAction.php
+++ b/src/Application/Actions/Group/CreateGroupAction.php
@@ -17,7 +17,7 @@ class CreateGroupAction extends GroupAction
$parsedRequestBody = (array)$this->request->getParsedBody();
if(!isset($_SESSION['userId'])){
- $this->flash->addMessage('message', 'Please log in or sign up.');
+ $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
return $this->response
->withHeader('Location', '/login')
@@ -36,7 +36,7 @@ class CreateGroupAction extends GroupAction
"name" => $groupname,
"description" => $description,
"private" => $private,
- "message" => "Groupname already exist",
+ "flashMessages" => [["Groupname already exist"]],
"formstatus" => "error"
)
);
diff --git a/src/Application/Actions/Group/DeleteGroupAction.php b/src/Application/Actions/Group/DeleteGroupAction.php
index f0c91a4..272181d 100755
--- a/src/Application/Actions/Group/DeleteGroupAction.php
+++ b/src/Application/Actions/Group/DeleteGroupAction.php
@@ -15,7 +15,7 @@ class DeleteGroupAction extends GroupAction
protected function action(): Response
{
if(!isset($_SESSION['userId'])){
- $this->flash->addMessage('message', 'Please log in or sign up.');
+ $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
return $this->response
->withHeader('Location', '/login')
diff --git a/src/Application/Actions/Group/ViewModifyGroupForm.php b/src/Application/Actions/Group/ViewModifyGroupForm.php
index 509d42c..85d5abd 100644
--- a/src/Application/Actions/Group/ViewModifyGroupForm.php
+++ b/src/Application/Actions/Group/ViewModifyGroupForm.php
@@ -14,7 +14,7 @@ class ViewModifyGroupForm extends GroupAction
protected function action(): Response
{
if(!isset($_SESSION['userId'])){
- $this->flash->addMessage('message', 'Please log in or sign up.');
+ $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
return $this->response
->withHeader('Location', '/login')
diff --git a/src/Application/Actions/User/CreateUserAction.php b/src/Application/Actions/User/CreateUserAction.php
index 0f71786..686cf73 100755
--- a/src/Application/Actions/User/CreateUserAction.php
+++ b/src/Application/Actions/User/CreateUserAction.php
@@ -56,7 +56,7 @@ class CreateUserAction extends UserAction
"contaminated" => $contaminated,
"password" => null,
"confirmpassword" => null,
- "message" => "Username already used",
+ "flashMessages" => [["Username already used"]],
"formstatus" => "error"
)
);
@@ -73,7 +73,7 @@ class CreateUserAction extends UserAction
"contaminated" => $contaminated,
"password" => null,
"confirmpassword" => null,
- "message" => "Mail already used",
+ "flashMessages" => [["Mail already used"]],
"formstatus" => "error"
)
);
@@ -89,7 +89,7 @@ class CreateUserAction extends UserAction
$this->logger->info("User has been created.");
- $this->flash->addMessage('message', 'Your account has been created. Please log in.');
+ $this->flash->addMessage('creation', 'Your account has been created. Please log in.');
return $this->response
->withHeader('Location', '/login')
->withStatus(302);
diff --git a/src/Application/Actions/User/LogInUserAction.php b/src/Application/Actions/User/LogInUserAction.php
index 69a1c05..b730269 100644
--- a/src/Application/Actions/User/LogInUserAction.php
+++ b/src/Application/Actions/User/LogInUserAction.php
@@ -20,15 +20,15 @@ class LogInUserAction extends UserAction
$user = $this->userRepository->findOneBy(array('username' => $username));
if (!isset($user)) {
- $this->flash->addMessage('signup', 'Please sign up.');
+ $this->flash->addMessage('flashMessages', 'Unknown username or password.');
return $this->response
- ->withHeader('Location', '/signup')
+ ->withHeader('Location', '/login')
->withStatus(302);
}
if (!password_verify($password, $user->getPassword())) {
- $_SESSION['message'] = 'Username or password unknown.';
+ $_SESSION['message'] = 'Unknown username or password.';
return $this->twig->render($this->response, "/user/log_in.twig", ["formstatus" => "error", "session" => $_SESSION]);
}
diff --git a/src/Application/Actions/User/NearContaminatedUsers.php b/src/Application/Actions/User/NearContaminatedUsers.php
index 1780bab..b402551 100644
--- a/src/Application/Actions/User/NearContaminatedUsers.php
+++ b/src/Application/Actions/User/NearContaminatedUsers.php
@@ -30,7 +30,7 @@ class NearContaminatedUsers extends UserAction
protected function action(): Response
{
if(!isset($_SESSION['userId'])){
- $this->flash->addMessage('login', 'Please log in or sign up.');
+ $this->flash->addMessage('flashMessages', 'Please log in or sign up.');
return $this->response
->withHeader('Location', '/login')
--
GitLab