From 529b80375f2d6e7133768a5cc66c4fff095bbc66 Mon Sep 17 00:00:00 2001
From: nox <daniel.leporini@gmail.com>
Date: Fri, 25 Oct 2019 20:46:05 +0200
Subject: [PATCH] Renvoi de la bonne config

---
 .gitignore                       |  3 ++-
 config/conf.php                  |  6 ++----
 public/index.php                 |  3 ++-
 src/Auth/Action/LogoutAction.php | 14 ++++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index fdaab5d..03c4c38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 config/config.php
-config/conf.php
 .idea
 /public/uploads
 /tmp
+vendor
+composer.json
 composer.lock
\ No newline at end of file
diff --git a/config/conf.php b/config/conf.php
index b8c7df8..32e0b2d 100644
--- a/config/conf.php
+++ b/config/conf.php
@@ -1,7 +1,5 @@
 <?php
    $host = 'localhost';
-   //$username = 'guser';
-   $username = 'root';
-   //$password = 'kptgT81U7nzYWHBdQ9';
-   $password = 'root';
+   $username = 'guser';
+   $password = 'kptgT81U7nzYWHBdQ9';
    $database_name = 'gmarche';
diff --git a/public/index.php b/public/index.php
index a30e5bb..933cb55 100644
--- a/public/index.php
+++ b/public/index.php
@@ -22,7 +22,8 @@ use Middlewares\Whoops;
 chdir(dirname(__DIR__));
 require 'vendor/autoload.php';
 $chemin = $_SERVER['DOCUMENT_ROOT'];
-$chemin_new = substr($chemin,0,-7);
+$chemin_new = substr($chemin,0,-6);
+
 $app = (new \Framework\App( $chemin_new .'/config/config.php'))
 //$app = (new \Framework\App( '../config/config.php'))
     ->addModule(AdminModule::class)
diff --git a/src/Auth/Action/LogoutAction.php b/src/Auth/Action/LogoutAction.php
index caa15f4..93b5f43 100644
--- a/src/Auth/Action/LogoutAction.php
+++ b/src/Auth/Action/LogoutAction.php
@@ -5,8 +5,13 @@ use App\Auth\DatabaseAuth;
 use Framework\Renderer\RendererInterface;
 use Framework\Response\RedirectResponse;
 use Framework\Session\FlashService;
+use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
+/**
+ * Class LogoutAction
+ * @package App\Auth\Action
+ */
 class LogoutAction
 {
 
@@ -23,17 +28,22 @@ class LogoutAction
      */
     private $flashService;
 
-    public function __construct(RendererInterface $renderer, DatabaseAuth $auth, FlashService $flashService)
+    private $container;
+
+    public function __construct(RendererInterface $renderer, DatabaseAuth $auth, FlashService $flashService
+        , ContainerInterface $container)
     {
         $this->renderer = $renderer;
         $this->auth = $auth;
         $this->flashService = $flashService;
+        $this->container = $container;
     }
 
     public function __invoke(ServerRequestInterface $request)
     {
+        $gmarchePrefix = $this->container->get('gmarche.prefix');
         $this->auth->logout();
         $this->flashService->success('Vous êtes maintenant déconnecté');
-        return new RedirectResponse('/gmarche');
+        return new RedirectResponse("$gmarchePrefix");
     }
 }