Evolution #689: Faire disparaitre /hello

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -89,14 +89,7 @@ class CoreController extends Controller
   public function automaticLanguageAction()
   {
     $lang = $this->determineLocale();
-    if ($this->getUser() != 'anon.')
-    {
-      return $this->redirect($this->generateUrl('home', array('_locale' => $lang)));
-    }
-    else
-    {
-      return $this->redirect($this->generateUrl('index', array('_locale' => $lang)));
-    }
+    return $this->redirect($this->generateUrl('home', array('_locale' => $lang)));
   }
   
   /**

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -327,7 +327,7 @@ class ElementController extends Controller
   {
     if (!$this->getRequest()->isXmlHttpRequest())
     { 
-      return $this->redirect($this->generateUrl('index'));
+      return $this->redirect($this->generateUrl('home'));
     }
     
     if ($this->getRequest()->getMethod() != 'POST')
@@ -375,7 +375,7 @@ class ElementController extends Controller
   {
     if (!$this->getRequest()->isXmlHttpRequest())
     { 
-      return $this->redirect($this->generateUrl('index'));
+      return $this->redirect($this->generateUrl('home'));
     }
     
     if (($response = $this->mustBeConnected()))

src/Muzich/CoreBundle/Resources/public/js/TagPrompt.js

@@ -176,10 +176,11 @@ function TagPrompt(select_tag_callback, tag_prompt_connector)
         *
         */
   
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
   
         if (response.status == 'success')
         {

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -282,7 +282,7 @@ function JQueryJson(url, data, callback_success)
     {
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       callback_success(response);
@@ -361,7 +361,7 @@ $(document).ready(function(){
     $.getJSON(url_get_favorites_tags, function(response) {
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
         var tags = [];
@@ -541,7 +541,7 @@ $(document).ready(function(){
     $.getJSON($(this).attr('href'), function(response) {
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       var img = link.find('img');
@@ -616,7 +616,7 @@ $(document).ready(function(){
        success: function(response) {
           if (response.status == 'mustbeconnected')
            {
-             $(location).attr('href', url_index);
+             $(location).attr('href', url_home);
            }
 
           if (response.count)
@@ -662,7 +662,7 @@ $(document).ready(function(){
     
     if (response.status == 'mustbeconnected')
     {
-      $(location).attr('href', url_index);
+      $(location).attr('href', url_home);
     }
     
     $('ul.elements').html(response.html);
@@ -699,7 +699,7 @@ $(document).ready(function(){
       $.getJSON(link.attr('href'), function(response){
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
         
         if (response.status == 'success')
@@ -742,7 +742,7 @@ $(document).ready(function(){
       $.getJSON(link.attr('href'), function(response){
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
         
         if (response.status == 'success')
@@ -776,7 +776,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       // On prépare le tagBox
@@ -802,7 +802,7 @@ $(document).ready(function(){
         
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
         
         var li = $('li#'+response.dom_id);
@@ -908,7 +908,7 @@ $(document).ready(function(){
   //      success: function(data) {
   //      if (data.status == 'mustbeconnected')
   //      {
-  //        $(location).attr('href', url_index);
+  //        $(location).attr('href', url_home);
   //      }
   //      
   //      // Ce contrôle permet de ne pas continuer si une requete
@@ -1062,7 +1062,7 @@ $(document).ready(function(){
   //
   //      if (response.status == 'mustbeconnected')
   //      {
-  //        $(location).attr('href', url_index);
+  //        $(location).attr('href', url_home);
   //      }
   //
   //      if (response.status == 'success')
@@ -1347,7 +1347,7 @@ $(document).ready(function(){
 //        
 //        if (response.status == 'mustbeconnected')
 //        {
-//          $(location).attr('href', url_index);
+//          $(location).attr('href', url_home);
 //        }
 //
 //        if (response.status == 'success')
@@ -1420,7 +1420,7 @@ $(document).ready(function(){
   {
     if (response.status == 'mustbeconnected')
     {
-      $(location).attr('href', url_index);
+      $(location).attr('href', url_home);
     }
 
     if (response.status == 'success')
@@ -1600,7 +1600,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       $('ul.elements').html(response.html);
@@ -1753,7 +1753,7 @@ $(document).ready(function(){
 //          
 //          if (response.status == 'mustbeconnected')
 //          {
-//            $(location).attr('href', url_index);
+//            $(location).attr('href', url_home);
 //          }
 //
 //          if (response.status == 'success' && response.count)
@@ -1792,7 +1792,7 @@ $(document).ready(function(){
       
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
 
         if (response.status == 'success')
@@ -1820,7 +1820,7 @@ $(document).ready(function(){
 //      
 //      if (response.status == 'mustbeconnected')
 //      {
-//        $(location).attr('href', url_index);
+//        $(location).attr('href', url_home);
 //      }
 //      
 //      if (response.status == 'success')
@@ -1917,7 +1917,7 @@ $(document).ready(function(){
       li_element.find('form.add_comment').ajaxForm(function(response) {
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
 
         li_element.find('img.comments_loader').hide();
@@ -1998,7 +1998,7 @@ $(document).ready(function(){
         
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
         
         if (response.status == 'success')
@@ -2041,7 +2041,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       li.html(response.html);
@@ -2059,7 +2059,7 @@ $(document).ready(function(){
         
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
         
         if (response.status == 'success')
@@ -2125,7 +2125,7 @@ $(document).ready(function(){
         
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
       });
       
@@ -2159,7 +2159,7 @@ $(document).ready(function(){
     
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       if (response.status == 'success')
@@ -2261,7 +2261,7 @@ $(document).ready(function(){
         
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       if (response.status == 'success')
@@ -2327,7 +2327,7 @@ $(document).ready(function(){
 
           if (response.status == 'mustbeconnected')
           {
-            $(location).attr('href', url_index);
+            $(location).attr('href', url_home);
           }
 
           if (response.status == 'success')
@@ -2355,7 +2355,7 @@ $(document).ready(function(){
       
 //      if (response.status === 'mustbeconnected')
 //      {
-//        $(location).attr('href', url_index);
+//        $(location).attr('href', url_home);
 //      }
       
       
@@ -2380,7 +2380,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       li.find('img.element_loader').hide();
@@ -2407,7 +2407,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       li.find('img.element_loader').hide();
@@ -2433,7 +2433,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       li.find('img.element_loader').hide();
@@ -2498,7 +2498,7 @@ $(document).ready(function(){
         
         if (response.status == 'mustbeconnected')
         {
-          $(location).attr('href', url_index);
+          $(location).attr('href', url_home);
         }
         
         // On affiche l'élément que si on voit que le formulaire est sur la page
@@ -2745,7 +2745,7 @@ $(document).ready(function(){
       
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
        if (response.status == 'success')
@@ -2797,7 +2797,7 @@ $(document).ready(function(){
      
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       if (response.status == 'success')
@@ -2825,7 +2825,7 @@ $(document).ready(function(){
      
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       if (response.status == 'error')
@@ -2879,7 +2879,7 @@ $(document).ready(function(){
      
       if (response.status == 'mustbeconnected')
       {
-        $(location).attr('href', url_index);
+        $(location).attr('href', url_home);
       }
       
       if (response.status == 'success')

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -107,7 +107,6 @@
   string_removefromgroup_confirm_yes = "{{ 'element.group.remove_from.confirm.yes'|trans({}, 'elements') }}";
   string_removefromgroup_confirm_no = "{{ 'element.group.remove_from.confirm.no'|trans({}, 'elements') }}";
 
-  url_index = "{{ path('index') }}";
   url_home = "{{ path('home') }}";
   url_search_tag = "{{ path('search_tag') }}";
   url_get_favorites_tags = "{{ path('ajax_get_favorites_tags') }}";

src/Muzich/CoreBundle/Resources/views/Layout/header.html.twig

@@ -2,7 +2,7 @@
   
   {% include "MuzichCoreBundle:Language:languages.html.twig" %}
   
-  <a id="header_logo" href="{{ path('index') }}" title="">
+  <a id="header_logo" href="{{ path('home') }}" title="">
     <img src="{{ asset('img/header_logo.png') }}" alt="logo" />
   </a>
   

src/Muzich/CoreBundle/Resources/views/layout_old.html.twig

@@ -71,7 +71,6 @@
     string_search_tag_title = "{{ 'search_tag.title'|trans({}, 'userui') }}";
     {% endautoescape %}
     
-    url_index = "{{ path('index') }}";
     url_search_tag = "{{ path('search_tag') }}";
     url_get_favorites_tags = "{{ path('ajax_get_favorites_tags') }}";
     url_add_tag = "{{ path('ajax_add_tag') }}";

src/Muzich/CoreBundle/Security/Http/Authentication/AuthenticationFailureHandler.php

@@ -43,7 +43,7 @@ class AuthenticationFailureHandler implements AuthenticationFailureHandlerInterf
         return $response;
       }
       
-      return new RedirectResponse($this->router->generate('index'));
+      return new RedirectResponse($this->router->generate('home'));
    }
    
    protected function getResponseParameters(Request $request)

src/Muzich/CoreBundle/Tests/Controller/UserControllerTest.php

@@ -18,7 +18,7 @@ class UserControllerTest extends FunctionalTest
     $hardtek_id = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneByName('Hardtek')->getId();
     $tribe_id   = $this->getDoctrine()->getRepository('MuzichCoreBundle:Tag')->findOneByName('Tribe')->getId();
     
-    $this->crawler = $this->client->request('GET', $this->generateUrl('index'));
+    $this->crawler = $this->client->request('GET', $this->generateUrl('home'));
     $this->isResponseSuccess();
   
     $this->procedure_registration_success(

src/Muzich/CoreBundle/lib/Controller.php

@@ -493,7 +493,7 @@ class Controller extends BaseController
       }
       else
       {
-        return $this->redirect($this->generateUrl('index'));
+        return $this->redirect($this->generateUrl('home'));
       }
     }
   }

src/Muzich/IndexBundle/Controller/IndexController.php

@@ -75,68 +75,68 @@ class IndexController extends Controller
     );
   }
   
-  public function presubscriptionAction(Request $request)
-  {
-    $form = $this->getPreSubscriptionForm();
-    $form->bind($request);
-    if ($form->isValid())
-    {
-      $message = \Swift_Message::newInstance()
-        ->setSubject($this->trans('mail.presubscription.subject', array(), 'text'))
-        ->setFrom(array(
-          $this->container->getParameter('emails_from') => $this->container->getParameter('emails_from_name')
-        ))
-        ->setTo($form->getData()->getEmail())
-        ->setBody(
-          $this->renderView(
-            'MuzichIndexBundle:Presubscription:confirm.txt.twig',
-            array(
-              'url' => $this->generateUrl('presubscription_register_confirm', array(
-                'token' => $form->getData()->getToken()
-              ), true)
-            )
-          )
-        )
-      ;
-      $message->getHeaders()->addTextHeader('List-Unsubscribe', 'unsubscribe@muzi.ch');
-      
-      $this->get('mailer')->send($message);
-      
-      
-      $this->persist($form->getData());
-      $this->flush();
-      $this->setFlash('info', 'presubscription.success');
-      return $this->redirect($this->generateUrl('index'));
-    }
-    
-    $this->setFlash('error', 'presubscription.error');
-    return $this->render('MuzichIndexBundle:Index:index.html.twig', array(
-      'form' => $this->getRegistrationForm()->createView(),
-      'presubscription_form' => $form->createView(),
-      'last_username' => '',
-      'error'         => '',
-      'registration_errors_pers' => array()
-    ));
-  }
-  
-  public function presubscriptionConfirmAction($token)
-  {
-    $presubscription = $this->getDoctrine()->getRepository('MuzichCoreBundle:Presubscription')->findOneBy(array(
-      'token'     => $token,
-      'confirmed' => false
-    ));
-    
-    if (!$presubscription)
-    {
-      throw $this->createNotFoundException();
-    }
-    
-    $presubscription->setConfirmed(true);
-    $this->persist($presubscription);
-    $this->flush();
-    
-    $this->setFlash('success', 'presubscription.confirmed');
-    return $this->redirect($this->generateUrl('index'));
-  }
+//  public function presubscriptionAction(Request $request)
+//  {
+//    $form = $this->getPreSubscriptionForm();
+//    $form->bind($request);
+//    if ($form->isValid())
+//    {
+//      $message = \Swift_Message::newInstance()
+//        ->setSubject($this->trans('mail.presubscription.subject', array(), 'text'))
+//        ->setFrom(array(
+//          $this->container->getParameter('emails_from') => $this->container->getParameter('emails_from_name')
+//        ))
+//        ->setTo($form->getData()->getEmail())
+//        ->setBody(
+//          $this->renderView(
+//            'MuzichIndexBundle:Presubscription:confirm.txt.twig',
+//            array(
+//              'url' => $this->generateUrl('presubscription_register_confirm', array(
+//                'token' => $form->getData()->getToken()
+//              ), true)
+//            )
+//          )
+//        )
+//      ;
+//      $message->getHeaders()->addTextHeader('List-Unsubscribe', 'unsubscribe@muzi.ch');
+//      
+//      $this->get('mailer')->send($message);
+//      
+//      
+//      $this->persist($form->getData());
+//      $this->flush();
+//      $this->setFlash('info', 'presubscription.success');
+//      return $this->redirect($this->generateUrl('index'));
+//    }
+//    
+//    $this->setFlash('error', 'presubscription.error');
+//    return $this->render('MuzichIndexBundle:Index:index.html.twig', array(
+//      'form' => $this->getRegistrationForm()->createView(),
+//      'presubscription_form' => $form->createView(),
+//      'last_username' => '',
+//      'error'         => '',
+//      'registration_errors_pers' => array()
+//    ));
+//  }
+//  
+//  public function presubscriptionConfirmAction($token)
+//  {
+//    $presubscription = $this->getDoctrine()->getRepository('MuzichCoreBundle:Presubscription')->findOneBy(array(
+//      'token'     => $token,
+//      'confirmed' => false
+//    ));
+//    
+//    if (!$presubscription)
+//    {
+//      throw $this->createNotFoundException();
+//    }
+//    
+//    $presubscription->setConfirmed(true);
+//    $this->persist($presubscription);
+//    $this->flush();
+//    
+//    $this->setFlash('success', 'presubscription.confirmed');
+//    return $this->redirect($this->generateUrl('index'));
+//  }
   
 }

src/Muzich/IndexBundle/Resources/config/routing.yml

@@ -1,20 +1,20 @@
 ## Routing du Bundle Index
 
-presubscription_register:
-  pattern:  /hello/{_locale}/presubscription
-  defaults: { _controller: MuzichIndexBundle:Index:presubscription }
-  requirements:
-    _method:  POST
-
-presubscription_register_confirm:
-  pattern:  /hello/{_locale}/presubscription/confirm/{token}
-  defaults: { _controller: MuzichIndexBundle:Index:presubscriptionConfirm }
-  requirements:
-    _method:  GET
-
-index_without_locale:
-    pattern:  /hello/
-    defaults: { _controller: MuzichCoreBundle:Core:automaticLanguage }
+#presubscription_register:
+#  pattern:  /hello/{_locale}/presubscription
+#  defaults: { _controller: MuzichIndexBundle:Index:presubscription }
+#  requirements:
+#    _method:  POST
+#
+#presubscription_register_confirm:
+#  pattern:  /hello/{_locale}/presubscription/confirm/{token}
+#  defaults: { _controller: MuzichIndexBundle:Index:presubscriptionConfirm }
+#  requirements:
+#    _method:  GET
+#
+#index_without_locale:
+#    pattern:  /hello/
+#    defaults: { _controller: MuzichCoreBundle:Core:automaticLanguage }
     
 index:
     pattern:  /hello/{_locale}

src/Muzich/UserBundle/Controller/EventController.php

@@ -38,7 +38,7 @@ class EventController extends Controller
           'errors' => array('NotFound')
         ));
       }
-      return $this->redirect($this->generateUrl('index'));
+      return $this->redirect($this->generateUrl('home'));
     }
     
     if ($event->getUser()->getId() != $this->getUserId())