Evolution #404: Inscription: confirmation de l'email et conséquences

src/Muzich/CommentBundle/Controller/CommentController.php

@@ -5,6 +5,7 @@ namespace Muzich\CommentBundle\Controller;
 use Muzich\CoreBundle\lib\Controller;
 use Muzich\CoreBundle\Managers\CommentsManager;
 use Muzich\CoreBundle\Propagator\EventElement;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 class CommentController extends Controller
 {
@@ -299,9 +300,9 @@ class CommentController extends Controller
    */
   public function alertAction($element_id, $date, $token)
   {
-    if (($response = $this->mustBeConnected(true)))
+if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_COMMENT_ALERT)) !== false)
     {
-      return $response;
+      return $this->jsonResponseError($non_condition);
     }
     
     if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -20,6 +20,7 @@ use Muzich\CoreBundle\Managers\ElementReportManager;
 use Muzich\CoreBundle\Propagator\EventUser;
 use Muzich\CoreBundle\Entity\User;
 use Symfony\Component\HttpFoundation\Request;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 class CoreController extends Controller
 {
@@ -211,14 +212,14 @@ class CoreController extends Controller
    */
   public function elementAddAction($group_slug)
   {
-    if (($response = $this->mustBeConnected()))
+    if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_ELEMENT_ADD)) !== false)
     {
-      return $response;
+      return $this->jsonResponseError($non_condition);
     }
     
     if ($this->getRequest()->getMethod() != 'POST')
     {
-      throw $this->createNotFoundException('Cette ressource n\'est pas accessible');
+      throw $this->createNotFoundException();
     }
     
     $user = $this->getUser(true, array('join' => array('groups_owned_groups_tags')));
@@ -453,9 +454,9 @@ class CoreController extends Controller
    */
   public function addTagAction()
   {
-    if (($response = $this->mustBeConnected(true)))
+    if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_TAG_ADD)) !== false)
     {
-      return $response;
+      return $this->jsonResponseError($non_condition);
     }
     
     if (strlen((($tag_name = $this->getRequest()->request->get('tag_name')))) 
@@ -625,9 +626,9 @@ class CoreController extends Controller
    */
   public function reportElementAction($element_id, $token)
   {
-    if (($response = $this->mustBeConnected(true)))
+    if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_ELEMENT_ALERT)) !== false)
     {
-      return $response;
+      return $this->jsonResponseError($non_condition);
     }
     
     if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -450,9 +450,9 @@ class ElementController extends Controller
    */
   public function addVoteGoodAction($element_id, $token)
   {
-    if (($response = $this->mustBeConnected(true)))
+    if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_ELEMENT_NOTE)) !== false)
     {
-      return $response;
+      return $this->jsonResponseError($non_condition);
     }
     
     if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
@@ -509,9 +509,9 @@ class ElementController extends Controller
    */
   public function removeVoteGoodAction($element_id, $token)
   {
-    if (($response = $this->mustBeConnected(true)))
+    if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_ELEMENT_NOTE)) !== false)
     {
-      return $response;
+      return $this->jsonResponseError($non_condition);
     }
     
     if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
@@ -568,11 +568,6 @@ class ElementController extends Controller
    */
   public function proposeTagsOpenAction($element_id)
   {
-    if (($response = $this->mustBeConnected(true)))
-    {
-      return $response;
-    }
-    
     if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION)) !== false)
     {
       return $this->jsonResponseError($non_condition);

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -948,7 +948,7 @@ ul#favorite_tags li
   margin-right: 0px;
 }
 
-#element_add_link, #element_add_close_link, #group_add_link, #group_add_close_link, #registration_link, #login_link, #know_more
+#element_add_link, #element_add_close_link, #group_add_link, #group_add_link_disabled, #group_add_close_link, #registration_link, #login_link, #know_more
 {
   float: right;
   margin-top: -58px;
@@ -975,13 +975,13 @@ ul#favorite_tags li
   margin-top: -68px;
 }
 
-#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_close_link img, #registration_link img, #login_link img
+#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_link_disabled img, #group_add_close_link img, #registration_link img, #login_link img
 {
   margin-bottom: -5px;
     margin-right: -5px;
 }
 
-#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_close_link.justtopright
+#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_link_disabled.justtopright, #group_add_close_link.justtopright
 {
   margin-top: 0px;
   margin-right: 0px;
@@ -1707,7 +1707,7 @@ div.show_options {
     float: right;
 }
 
-#container #group_add_link, #container #group_add_close_link
+#container #group_add_link, #container #group_add_link_disabled, #container #group_add_close_link
 {
   font-size: 120%;
   float: right;

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

@@ -71,39 +71,34 @@ function TagPrompt(select_tag_callback, tag_prompt_connector)
       .attr('method', 'post')
       .attr('name', 'add_tag')
       .ajaxForm(function(response) {
-        /*
-        *
-        */
-  
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+       
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(response){
+            $('form[name="add_tag"]').find('ul.error_list').remove();
+            var ul_errors = $('<ul>').addClass('error_list');
+
+            for (i in response.errors)
+            {
+              ul_errors.append($('<li>').append(response.errors[i]));
+            }
+
+            $('form[name="add_tag"]').prepend(ul_errors);
+          }
+        );
   
-        if (response.status == 'success')
+        if (response.status === 'success')
         {
           var tag = new Tag(response.tag_id, response.tag_name);
           addTagToProposedTags(tag);
           addTagToSelectedTags(tag);
           _tag_prompt_connector.updateOutput(tags_selected);
-  
+
           $('#fade').fadeOut(400, function(){$('#fade').remove();});
           $('#add_tag').remove();
         }
   
-        if (response.status == 'error')
-        {
-          $('form[name="add_tag"]').find('ul.error_list').remove();
-          var ul_errors = $('<ul>').addClass('error_list');
-  
-          for (i in response.errors)
-          {
-            ul_errors.append($('<li>').append(response.errors[i]));
-          }
-  
-          $('form[name="add_tag"]').prepend(ul_errors);
-        }
-  
         return false;
       })
   

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

@@ -44,11 +44,11 @@ function ResponseController()
     propagate(response);
     if (response.status === 'success')
     {
-      success_callback();
+      success_callback(response);
     }
     else
     {
-      failure_callback();
+      failure_callback(response);
     }
   }
 }
@@ -1518,54 +1518,57 @@ $(document).ready(function(){
     $('form[name="add"]').find('img.tag_loader').show();
   });
   $('form[name="add"]').ajaxForm(function(response) {
-    if (response.status == 'mustbeconnected')
-    {
-      $(location).attr('href', url_index);
-    }
     
     $('form[name="add"] img.tag_loader').hide();
+    window.ResponseController.execute(
+      response,
+      function(){},
+      function(){}
+    );
     
-    // Si on en est a la promière étape la réponse sera des données récupérés auprès
-    // des apis
-    if ($('input#form_add_step').val() == '1')
+    if (response.status === 'success')
     {
-      if (element_add_proceed_data_apis(response))
+      // Si on en est a la première étape la réponse sera des données récupérés auprès
+      // des apis
+      if ($('input#form_add_step').val() == '1')
       {
-        // On a plus qu'a afficher les champs
-        $('div#form_add_second_part').slideDown();
-        $('div#form_add_first_part').slideUp();
-        form_add_hide_errors();
-        $('#form_add_loader').hide();
-        $('input#form_add_step').val('2');
-        
-        // On doit avoir le slug du groupe si on ajoute a un groupe
-        if (!$('input#add_element_group_page').length)
+        if (element_add_proceed_data_apis(response))
         {
-          $('form[name="add"]').attr('action', url_element_add);
+          // On a plus qu'a afficher les champs
+          $('div#form_add_second_part').slideDown();
+          $('div#form_add_first_part').slideUp();
+          form_add_hide_errors();
+          $('#form_add_loader').hide();
+          $('input#form_add_step').val('2');
+
+          // On doit avoir le slug du groupe si on ajoute a un groupe
+          if (!$('input#add_element_group_page').length)
+          {
+            $('form[name="add"]').attr('action', url_element_add);
+          }
+          else
+          {
+            $('form[name="add"]').attr('action', url_element_add+'/'+$('input#add_element_group_page').val());
+          }
+          $('span#add_url_title_url').html($('input#element_add_url').val());
+          // Mise a zero des tags
+          window.add_tag_prompt_connector.initializeTags([]);
+          $('input#element_add_need_tags').attr('checked', false);
         }
         else
         {
-          $('form[name="add"]').attr('action', url_element_add+'/'+$('input#add_element_group_page').val());
+          form_add_display_errors(response.errors);
+          $('#form_add_loader').hide();
         }
-        $('span#add_url_title_url').html($('input#element_add_url').val());
-        // Mise a zero des tags
-        window.add_tag_prompt_connector.initializeTags([]);
-        $('input#element_add_need_tags').attr('checked', false);
-      }
-      else
-      {
-        form_add_display_errors(response.errors);
-        $('#form_add_loader').hide();
       }
-    }
-    else if ($('input#form_add_step').val() == '2')
-    {
-      if (element_add_proceed_json_response(response))
+      else if ($('input#form_add_step').val() == '2')
       {
-        form_add_reinit();
+        if (element_add_proceed_json_response(response))
+        {
+          form_add_reinit();
+        }
       }
     }
-
     
     return false;
   });
@@ -2193,10 +2196,12 @@ $(document).ready(function(){
       
       $.getJSON(link.attr('href'), function(response){
         
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
+          
       });
       
       $('div.question').fadeOut();
@@ -2218,21 +2223,28 @@ $(document).ready(function(){
     
     var img = $(this).find('img');
     var link = $(this);
+    var old_img_url = img.attr('src');
     img.attr('src', url_img_ajax_loader);
     
     $.getJSON(link.attr('href'), function(response){
-        
-      if (response.status == 'mustbeconnected')
-      {
-        $(location).attr('href', url_index);
-      }
       
-      if (response.status == 'success')
+      window.ResponseController.execute(
+        response,
+        function(){},
+        function(){}
+      );
+        
+      if (response.status === 'success')
       {
         link.attr('href', response.data.a.href);
         img.attr('src', response.data.img.src);
         link.parents('ul.element_thumb_actions').find('li.score').text(response.data.element.points);
       }
+        
+      if (response.status === 'error')
+      {
+        img.attr('src', old_img_url);
+      }
       
     });
     
@@ -2286,22 +2298,27 @@ $(document).ready(function(){
       li.find('img.element_loader').hide();
       window.ResponseController.execute(
         response,
-        function(){
-          // On prépare le tagBox
-          var table = li.find('table:first');
-          li.find('div.tag_proposition').remove();
-          table.after(response.html);
+        function(){},
+        function(){}
+      );
+      
+      if (response.status === 'success')
+      {
+        // On prépare le tagBox
+        var table = li.find('table:first');
+        li.find('div.tag_proposition').remove();
+        table.after(response.html);
 
-          // Pour le click sur l'input de saisie de tag
-          //li.find('ul.tagbox li.input input[type="text"]').formDefaults();
+        // Pour le click sur l'input de saisie de tag
+        //li.find('ul.tagbox li.input input[type="text"]').formDefaults();
 
-          var options = new Array();
-          options.form_name  = response.form_name;
-          options.tag_init   = response.tags;
+        var options = new Array();
+        options.form_name  = response.form_name;
+        options.tag_init   = response.tags;
 
-          ajax_query_timestamp = null;
+        ajax_query_timestamp = null;
 
-          //$("#tags_prompt_list_"+response.form_name).tagBox(options);
+        //$("#tags_prompt_list_"+response.form_name).tagBox(options);
 
         // On rend ce formulaire ajaxFormable
         $('form[name="'+response.form_name+'"] input[type="submit"]').live('click', function(){
@@ -2335,13 +2352,8 @@ $(document).ready(function(){
 
             li.find('div.tag_proposition div.tags_prompt').prepend(ul_errors);
           }
-
         });
-        },
-        function(){
-          
-        }
-      );
+      }
       
 //      if (response.status === 'mustbeconnected')
 //      {
@@ -2453,10 +2465,12 @@ $(document).ready(function(){
       
       $.getJSON(link.attr('href'), function(response){
         
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
+        
       });
       
       $('div.question').fadeOut();
@@ -2961,6 +2975,14 @@ $(document).ready(function(){
      });
    });
    
+   /*
+    * Buttons for open email confirmation request
+    */
+   
+   $('a#group_add_link_disabled.mustconfirmemail').click(function(){
+     open_ajax_popin(url_email_not_confirmed, function(){});
+   });
+   
 });
 
 function open_ajax_popin(url, callback)
@@ -2985,6 +3007,7 @@ function open_ajax_popin(url, callback)
       }
     }
   });
+  $('html, body').animate({ scrollTop: 0 }, 'fast');
 }
 
 function open_connection_or_subscription_window(open_login_part)

src/Muzich/GroupBundle/Controller/DefaultController.php

@@ -8,6 +8,7 @@ use Muzich\CoreBundle\Entity\Group;
 use Muzich\CoreBundle\Form\Group\GroupForm;
 use Symfony\Component\HttpFoundation\Request;
 use Muzich\CoreBundle\Managers\GroupManager;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 class DefaultController extends Controller
 {
@@ -53,6 +54,11 @@ class DefaultController extends Controller
   {
     $user = $this->getUser();
     
+if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_GROUP_ADD)) !== false)
+    {
+      throw $this->createNotFoundException();
+    }
+    
     /**
      * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
      * Docrine le voit si on faire une requete directe.

src/Muzich/GroupBundle/Resources/views/Default/myList.html.twig

@@ -7,14 +7,21 @@
 
   <div class="top_tools">
     
-    <a href="#" id="group_add_link" class="button gradient justtopright">
-      {{ 'group.add_group'|trans({}, 'navigationui') }}
-      <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
-    </a>
-    <a href="#" id="group_add_close_link" class="button gradient justtopright" style="display: none;">
-      {{ 'group.add_group_box.close'|trans({}, 'navigationui') }}
-      <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
-    </a>
+    {% if app.user.emailConfirmed %}
+      <a href="#" id="group_add_link" class="button gradient justtopright">
+        {{ 'group.add_group'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+      </a>
+      <a href="#" id="group_add_close_link" class="button gradient justtopright" style="display: none;">
+        {{ 'group.add_group_box.close'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_left_white.png') }}" alt="" />
+      </a>
+    {% else %}
+      <a href="#" id="group_add_link_disabled" class="button gradient justtopright mustconfirmemail">
+        {{ 'group.add_group'|trans({}, 'navigationui') }}
+        <img src="{{ asset('/img/icon_dart_right_white.png') }}" alt="" />
+      </a>
+    {% endif %}
     
   </div>