From 0007bf58be1de14b3a902096589957a2a3bf9e3d Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Mon, 12 Jan 2015 15:10:46 +0100
Subject: [PATCH] PHRAS-350 Deprecate client

---
 .../Controller/Client/RootController.php        | 17 ++++++++++++++++-
 templates/web/common/menubar.html.twig          |  2 +-
 templates/web/prod/index.html.twig              |  1 -
 .../Phrasea/Controller/Client/RootTest.php      |  9 +++++----
 www/skins/prod/000000/prodcolor.css             |  2 +-
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Client/RootController.php b/lib/Alchemy/Phrasea/Controller/Client/RootController.php
index e79bf389a1..e288d5e997 100644
--- a/lib/Alchemy/Phrasea/Controller/Client/RootController.php
+++ b/lib/Alchemy/Phrasea/Controller/Client/RootController.php
@@ -13,6 +13,7 @@ use Alchemy\Phrasea\Controller\Controller;
 use Alchemy\Phrasea\Security\Firewall;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Session;
 
 class RootController extends Controller
 {
@@ -25,13 +26,27 @@ class RootController extends Controller
     }
 
     /**
-     * Gets client main page
+     * @return Session
+     */
+    private function getSession()
+    {
+        return $this->app['session'];
+    }
+
+    /**
+     * /!\/!\/!\/!\/!\/!\/!\/!\/!\
+     *
+     * Client is no longer used
+     *
+     * Redirect to production with a nice message
      *
      * @param Request $request
      * @return Response
      */
     public function getClientAction(Request $request)
     {
+        $this->getSession()->getFlashBag()->add('client_deprecated');
+
         if (!$this->getAuthenticator()->isAuthenticated() && null !== $request->query->get('nolog')) {
             return $this->app->redirectPath('login_authenticate_as_guest', ['redirect' => 'client']);
         }
diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index 6aa912eb11..bc524865b3 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -174,7 +174,7 @@
     </div>
 </div>
 
- {% if app.getAuthenticator().isAuthenticated()  and (module == "client" or module == "prod") %}
+ {% if app.getAuthenticator().isAuthenticated()  and module == "prod" %}
     <div style="display:none;z-index:30000;" id="notification_box">
         {% set notifications = app['events-manager'].get_notifications %}
         {% include 'prod/notifications.html.twig' %}
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index b0aa038914..59ab26440b 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -185,7 +185,6 @@
                 $('#clientModal').modal();
             </script>
         {% endif %}
-        
         {% set ratio = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'search_window') %}
         {% if ratio == 0 %}
             {% set ratio = '0.333' %}
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
index 2e74f0afa5..4bbb1da0b0 100644
--- a/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Alchemy\Tests\Phrasea\Controller\Client;
+use Symfony\Bundle\FrameworkBundle\Client;
 
 /**
  * @group functional
@@ -10,12 +11,12 @@ namespace Alchemy\Tests\Phrasea\Controller\Client;
  */
 class RootTest extends \PhraseanetAuthenticatedWebTestCase
 {
-    protected $client;
-
     public function testGetClient()
     {
         $this->authenticate(self::$DI['app']);
-        self::$DI['client']->request("GET", "/client/");
-        $this->assertTrue(self::$DI['client']->getResponse()->isRedirect());
+        /** @var Client $client */
+        $client = self::$DI['client'];
+        $client->request("GET", "/client/");
+        $this->assertTrue($client->getResponse()->isRedirect());
     }
 }
diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index 40e9c094b0..7c866cf1af 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -4983,4 +4983,4 @@ ui-dialog-titlebar {
     margin-right: 8px;
     width: 26px;
   }
-}
\ No newline at end of file
+}