diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php index c1676fa4..1881b51c 100644 --- a/WEB/Controller/UserController.php +++ b/WEB/Controller/UserController.php @@ -14,12 +14,6 @@ class UserController case NULL: $model->goToHome(); break; - case "signUp": - $model->signUp(); - break; - case "login": - $model->login(); - break; case "goToPresentation": $model->goToPresentation(); break; @@ -32,6 +26,9 @@ class UserController case "goToQueue": $model->goToQueue(); break; + case "logout": + $model->logout(); + break; default: $error = "Action non valide"; require($rep . $vues['erreur']); diff --git a/WEB/Controller/VisitorController.php b/WEB/Controller/VisitorController.php index a171c593..ec9d57bb 100644 --- a/WEB/Controller/VisitorController.php +++ b/WEB/Controller/VisitorController.php @@ -20,9 +20,6 @@ class VisitorController case "login": $model->login(); break; - case "goToPresentation": - $model->goToPresentation(); - break; case "goToHome": $model->goToHome(); break; @@ -32,12 +29,6 @@ class VisitorController case "goToSignUp": $model->goToSignUp(); break; - case "goToEnigme": - $model->goToEnigme(); - break; - case "goToQueue": - $model->goToQueue(); - break; default: $error = "Action non valide"; require($rep . $vues['erreur']); diff --git a/WEB/Model/UserModel.php b/WEB/Model/UserModel.php index db2e308c..99a3607f 100644 --- a/WEB/Model/UserModel.php +++ b/WEB/Model/UserModel.php @@ -61,4 +61,10 @@ class UserModel require($rep . $vues['erreur']); } } + + public function logout() + { + $_SESSION['role'] = 'visitor'; + header('Location: index.php'); + } } \ No newline at end of file diff --git a/WEB/Model/VisitorModel.php b/WEB/Model/VisitorModel.php index 6c864c82..23ffb231 100644 --- a/WEB/Model/VisitorModel.php +++ b/WEB/Model/VisitorModel.php @@ -82,17 +82,6 @@ class VisitorModel } } - public function goToPresentation() - { - global $rep, $vues, $error; - try { - require($rep . $vues['presentation']); - } catch (Exception $e) { - $error = "Erreur Inconnue"; - require($rep . $vues['erreur']); - } - } - public function goToHome() { global $rep, $vues, $error; @@ -125,62 +114,4 @@ class VisitorModel require($rep . $vues['erreur']); } } - - public function goToEnigme() - { - global $rep, $vues, $error; - try { - require($rep . $vues['enigme']); - } catch (Exception $e) { - $error = "404"; - require($rep . $vues['erreur']); - } - } - - public function goToQueue() - { - global $rep, $vues, $error; - try { - require($rep . $vues['Queue']); - } catch (Exception $e) { - $error = "404"; - require($rep . $vues['erreur']); - } - } - - public function logout() - { - session_unset(); - session_destroy(); - $_SESSION = null; - $this->goToHome(); - } - public function addEnigme() - { - global $rep, $vues, $error; - try{ - $solo = $_REQUEST['solo']; - if($solo) - $enigme = new Enigme($_REQUEST['enonce'],$_REQUEST['aide'],$_REQUEST['rappel'],$_REQUEST['solution'],$_REQUEST['test'],0,0); - else - $enigme = new Enigme($_REQUEST['enonce'],$_REQUEST['aide'],$_REQUEST['rappel'],$_REQUEST['solution'],$_REQUEST['test'],$_REQUEST['tempsDeResolution'],$_REQUEST['points']); - $this->enigme_gateway->insert($enigme); - } - catch(Exception $e) { - $error = "500"; - require($rep . $vues['erreur']); - } - } - - public function deleteEnigme() - { - global $rep, $vues, $error; - try{ - $this->enigme_gateway->delete($_REQUEST['id']); - } - catch(Exception $e) { - $error = "500"; - require($rep . $vues['erreur']); - } - } } \ No newline at end of file