Evolution #127: Refact: isConnected

src/Muzich/AdminBundle/Controller/ModerateController.php

@@ -45,18 +45,9 @@ class ModerateController extends Controller
   
   public function tagAcceptAction($tag_id)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $tagManager = new TagManager();
@@ -75,18 +66,9 @@ class ModerateController extends Controller
   
   public function tagRefuseAction($tag_id)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $tagManager = new TagManager();
@@ -113,18 +95,9 @@ class ModerateController extends Controller
    */
   public function tagReplaceAction($tag_id, $tag_new_id)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $tag_array = json_decode($tag_new_id);

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -145,21 +145,9 @@ class CoreController extends Controller
    */
   public function elementAddAction($group_slug)
   {   
-    
-    //die(var_dump($this->getRequest()->getParameter()));
-    
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     if ($this->getRequest()->getMethod() != 'POST')
@@ -355,18 +343,9 @@ class CoreController extends Controller
   
   public function getFavoriteTagsAction()
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     // On construit l'element searcher avec les tags favoris
@@ -383,18 +362,9 @@ class CoreController extends Controller
    */
   public function addTagAction($name, $arguments = null)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $tagManager = new TagManager();

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -34,18 +34,9 @@ class ElementController extends Controller
    */
   public function editAction($element_id)
   {    
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $element = $this->checkExistingAndOwned($element_id);
@@ -91,18 +82,9 @@ class ElementController extends Controller
    */
   public function updateAction($element_id)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     /**
@@ -186,18 +168,9 @@ class ElementController extends Controller
   
   public function removeAction($element_id)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     try {
@@ -285,18 +258,9 @@ class ElementController extends Controller
       return $this->redirect($this->generateUrl('index'));
     }
     
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $es = $this->getElementSearcher();
@@ -331,18 +295,9 @@ class ElementController extends Controller
       return $this->redirect($this->generateUrl('index'));
     }
     
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $es = $this->getElementSearcher();

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -43,18 +43,9 @@ class SearchController extends Controller
    */
   public function searchElementsAction($id_limit = null, $invertcolors = false)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $request = $this->getRequest();
@@ -178,18 +169,9 @@ class SearchController extends Controller
    */
   public function searchTagAction($string_search, $timestamp)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     if ($this->getRequest()->isXmlHttpRequest())

src/Muzich/CoreBundle/lib/Controller.php

@@ -312,4 +312,25 @@ class Controller extends BaseController
     return $this->get('translator')->trans($string, $params, $package);
   }
   
+  /**
+   *
+   * @return Response
+   */
+  protected function mustBeConnected()
+  {
+    if ($this->getUser() == 'anon.')
+    {
+      if ($this->getRequest()->isXmlHttpRequest())
+      {
+        return $this->jsonResponse(array(
+          'status' => 'mustbeconnected'
+        ));
+      }
+      else
+      {
+        return $this->redirect($this->generateUrl('index'));
+      }
+    }
+  }
+  
 }

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -22,18 +22,9 @@ class FavoriteController extends Controller
    */
   public function addAction($id, $token)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $user = $this->getUser();
@@ -100,18 +91,9 @@ class FavoriteController extends Controller
    */
   public function removeAction($id, $token)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $user = $this->getUser();
@@ -221,18 +203,9 @@ class FavoriteController extends Controller
   
   public function getElementsAction($user_id, $tags_ids_json, $id_limit = null, $invert = false)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     $tag_ids = json_decode($tags_ids_json);

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -97,18 +97,9 @@ class ShowController extends Controller
   
   public function getElementsAction($type, $object_id, $tags_ids_json, $id_limit = null, $invert = false)
   {
-    if ($this->getUser() == 'anon.')
+    if (($response = $this->mustBeConnected()))
     {
-      if ($this->getRequest()->isXmlHttpRequest())
-      {
-        return $this->jsonResponse(array(
-          'status' => 'mustbeconnected'
-        ));
-      }
-      else
-      {
-        return $this->redirect($this->generateUrl('index'));
-      }
+      return $response;
     }
     
     if ($type != 'user' && $type != 'group')