Merge branch 'master' of https://codefirst.iut.uca.fr/git/nathan.boileau/Scripted

WEB/Controller/UserController.php

@@ -217,6 +217,7 @@ class UserController
             require($rep . $vues['erreur']);
         }
     }
+<<<<<<< HEAD
     public function launchGame(){
         try {
             global $rep, $vues, $error;
@@ -224,7 +225,21 @@ class UserController
             $model->launchGame();
             require($rep . $vues['partie']);
         }
+        catch (Exception $e) {
+            $error = $e->getMessage();
+            require($rep . $vues['erreur']);
+        }
     }
+=======
+    // public function launchGame(){
+    //     try {
+    //         global $rep, $vues, $error;
+    //         $model = new UserModel();
+    //         $model->launchGame();
+    //         require($rep . $vues['partie']);
+    //     }
+    // }
+>>>>>>> ec72c626e295121e440c26605682865659b9012b
     public function logout()
     {
         $_SESSION['role'] = 'visitor';

WEB/Model/UserModel.php

@@ -26,7 +26,10 @@ class UserModel
     {
         echo '1';
         if ($this->utilisateur_gateway->isAlreadyInqueue($_SESSION['utilisateur'])) {
-            return;
+            if($this->utilisateur_gateway->queueFilled())
+            {
+                $_REQUEST['action']='launchGame';
+            }
         }
         echo '2';
         if (!$this->partie_gateway->partieInQueueExists()) {