diff --git a/WEB/Config/Config.php b/WEB/Config/Config.php
index e26ff61f..f5dbc5d7 100644
--- a/WEB/Config/Config.php
+++ b/WEB/Config/Config.php
@@ -19,8 +19,8 @@ $vues['test'] = 'View/src/pages/FirstTests/FirstTest1.html';
$vues['next'] = 'View/src/pages/FirstTests/FirstTest';
$vues['admin'] = 'View/src/pages/Admin/Admin.php';
// Enigme
-// $vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html';
-$vues['enigme'] = 'View/src/pages/Enigme/EnigmePage.php';
+$vues['enigme'] = 'View/src/pages/Enigme/Palindrome.html';
+$vues['enigmePage'] = 'View/src/pages/Enigme/EnigmePage.php';
$vues['chouette'] = 'View/src/pages/Enigme/Chouette.html';
$vues['cesarEncrypt'] = 'View/src/pages/Enigme/CesarEncrypt.html';
$vues['cesarDecrypt'] = 'View/src/pages/Enigme/CesarDecrypt.html';
diff --git a/WEB/Controller/AdminController.php b/WEB/Controller/AdminController.php
index 2c52c656..8e200053 100644
--- a/WEB/Controller/AdminController.php
+++ b/WEB/Controller/AdminController.php
@@ -57,6 +57,9 @@ class AdminController extends UserController
case "logout":
$this->logout();
break;
+ case "addNewEnigme":
+ $this->addNewEnigme();
+ break;
default:
$error = "Action non valide";
require($rep . $vues['erreur']);
@@ -76,4 +79,9 @@ class AdminController extends UserController
global $rep, $vues;
require($rep . $vues['admin']);
}
+
+ function addNewEnigme()
+ {
+
+ }
}
\ No newline at end of file
diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php
index 057d1fc4..d7fdfec7 100644
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@@ -2,14 +2,10 @@
class UserController
{
- private UserModel $model;
- private Nettoyage $nettoyage;
function __construct()
{
try {
global $dsn, $rep, $vues, $error;
- $this->model = new UserModel();
- $this->nettoyage = new Nettoyage();
$action = $_REQUEST['action'];
//register_event_handler('add_to_queue',array($this,"onAddToQueue"));
switch ($action) {
@@ -185,8 +181,9 @@ class UserController
{
try {
global $rep, $vues, $error;
- $num = $this->nettoyage->cleanInt($_REQUEST['num']);
- require($rep . $vues['next'].$_REQUEST['num'].".html");
+ $nettoyage = new Nettoyage();
+ $num = $nettoyage->cleanInt($_REQUEST['num']);
+ require($rep . $vues['next'].$num.".html");
} catch (Exception $e) {
$error = "Erreur Inconnue";
require($rep . $vues['erreur']);
@@ -194,10 +191,11 @@ class UserController
}
public function goToQueue()
{
- try {
+ try {
global $rep, $vues, $error;
//require($rep . $vues['Queue']);
- $this->model->addToQueue();
+ $model = new UserModel();
+ $model->addToQueue();
} catch (Exception $e) {
$error = $e->getMessage();
require($rep . $vues['erreur']);
diff --git a/WEB/View/src/pages/Admin/EnigmeMultiManager.php b/WEB/View/src/pages/Admin/EnigmeMultiManager.php
index f55d2744..b625b958 100644
--- a/WEB/View/src/pages/Admin/EnigmeMultiManager.php
+++ b/WEB/View/src/pages/Admin/EnigmeMultiManager.php
@@ -1,4 +1,25 @@
-