From 31257c93c717276e4a5beab2accb47e6339ef1f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Garnier?= Date: Thu, 1 Dec 2022 09:09:38 +0100 Subject: [PATCH 1/2] Correction de bug --- WEB/Config/Config.php | 2 +- WEB/Controller/UserController.php | 2 +- WEB/View/src/pages/Palindrome.html | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php index 78c5f776..9853af16 100644 --- a/WEB/Config/Config.php +++ b/WEB/Config/Config.php @@ -25,7 +25,7 @@ $vues['main'] = 'View/src/pages/Main.php'; $vues['presentation'] = 'View/src/pages/Presentation.html'; $vues['login'] = '../View/src/pages/LogSign/Login.php'; $vues['signUp'] = 'View/src/pages/LogSign/SignUp.php'; -$vues['enigme'] = 'View/src/pages/Enigme/palindrome.html'; +$vues['enigme'] = 'View/src/pages/Palindrome.html'; //Error $vues['erreur'] = 'View/src/pages/Erreur.php'; diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index bd6b4c53..f5d34a33 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -69,7 +69,7 @@ class UserController throw(new Exception("Mot de passe non valide")); } $j = $gateway->getUtilisateurByEmail($_REQUEST['email']); - if ($j != null) { + if ($j->getEmail() != "null") { $error = "Email déjà utilisé."; throw (new Exception("Email déjà utilisé")); } diff --git a/WEB/View/src/pages/Palindrome.html b/WEB/View/src/pages/Palindrome.html index 880c301e..554bd486 100644 --- a/WEB/View/src/pages/Palindrome.html +++ b/WEB/View/src/pages/Palindrome.html @@ -24,7 +24,7 @@ rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> - +
@@ -49,7 +49,7 @@ onclick="displayHelp()" > Logo - - + + From 1f345b8d123a690095d4a6a4046d1db28266dcac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Garnier?= Date: Thu, 1 Dec 2022 09:40:41 +0100 Subject: [PATCH 2/2] Correction de bug --- WEB/Controller/EnigmeGateway.php | 1 - WEB/Controller/PartieGateway.php | 2 -- 2 files changed, 3 deletions(-) diff --git a/WEB/Controller/EnigmeGateway.php b/WEB/Controller/EnigmeGateway.php index 6cf7de12..68679e16 100644 --- a/WEB/Controller/EnigmeGateway.php +++ b/WEB/Controller/EnigmeGateway.php @@ -1,5 +1,4 @@