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

src/Muzich/CoreBundle/Command/RecalculateReputationCommand.php

@@ -88,8 +88,8 @@ class RecalculateReputationCommand extends ContainerAwareCommand
       $count_favs = 0;
       $fav = $em->createQuery(
         "SELECT COUNT(f) FROM MuzichCoreBundle:UsersElementsFavorites f"
-        . " JOIN f.element e"
-        . " WHERE e.owner = :uid AND f.user != :uid"
+        . " JOIN f.element e JOIN f.user fu"
+        . " WHERE e.owner = :uid AND f.user != :uid AND fu.email_confirmed = 1"
       )->setParameter('uid', $user->getId())
        ->getScalarResult()      
       ;
@@ -109,7 +109,8 @@ class RecalculateReputationCommand extends ContainerAwareCommand
       $count_follow = 0;
       $fol = $em->createQuery(
         "SELECT COUNT(f) FROM MuzichCoreBundle:FollowUser f"
-        . " WHERE f.followed = :uid"
+        . " JOIN f.follower fu"
+        . " WHERE f.followed = :uid AND fu.email_confirmed = 1"
       )->setParameter('uid', $user->getId())
        ->getScalarResult()      
       ;

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -157,7 +157,7 @@ class CoreController extends Controller
       {
         // L'utilisateur suis déjà, on doit détruire l'entité
         $event = new EventUser($this->container);
-        $event->removeFromFollow($Follow->getFollowed());
+        $event->removeFromFollow($Follow->getFollowed(), $this->getUser());
         $em->persist($Follow->getFollowed());
       }
       

src/Muzich/CoreBundle/Propagator/EventElement.php

@@ -12,6 +12,7 @@ use Muzich\CoreBundle\Managers\CommentsManager;
 use Muzich\CoreBundle\Entity\ElementTagsProposition;
 use Muzich\CoreBundle\Managers\EventArchiveManager;
 use Muzich\CoreBundle\Entity\EventArchive;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 /**
  * Propagateur d'événement concernant les éléments
@@ -102,12 +103,16 @@ class EventElement extends EventPropagator
    * 
    * @param Element $element 
    */
-  public function addedToFavorites(Element $element)
+  public function addedToFavorites(Element $element, User $added_by_user)
   {
     $ur = new UserReputation($element->getOwner());
-    $ur->addPoints(
-      $this->container->getParameter('reputation_element_favorite_value')
-    );
+    $security_context = new SecurityContext($added_by_user);
+    if (!$security_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES))
+    {
+      $ur->addPoints(
+        $this->container->getParameter('reputation_element_favorite_value')
+      );
+    }
     
     $uea = new UserEventAction($element->getOwner(), $this->container);
     $event = $uea->proceed(Event::TYPE_FAV_ADDED_ELEMENT, $element->getId());
@@ -119,12 +124,16 @@ class EventElement extends EventPropagator
    * 
    * @param Element $element 
    */
-  public function removedFromFavorites(Element $element)
+  public function removedFromFavorites(Element $element, User $removed_by_user)
   {
     $ur = new UserReputation($element->getOwner());
-    $ur->removePoints(
-      $this->container->getParameter('reputation_element_favorite_value')
-    );
+    $security_context = new SecurityContext($removed_by_user);
+    if (!$security_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES))
+    {
+      $ur->removePoints(
+        $this->container->getParameter('reputation_element_favorite_value')
+      );
+    }
   }
   
   /**

src/Muzich/CoreBundle/Propagator/EventUser.php

@@ -7,6 +7,7 @@ use Muzich\CoreBundle\Entity\User;
 use Muzich\CoreBundle\Actions\User\Event as UserEventAction;
 use Muzich\CoreBundle\Actions\User\Reputation as UserReputation;
 use Muzich\CoreBundle\Entity\Event;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 /**
  * Propagateur d'événement concernant les users
@@ -25,9 +26,13 @@ class EventUser extends EventPropagator
   {
     // Points de réputation
     $ur = new UserReputation($user);
-    $ur->addPoints(
-      $this->container->getParameter('reputation_element_follow_value')
-    );
+    $security_context = new SecurityContext($follower);
+    if (!$security_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_USER_FOLLOW))
+    {
+      $ur->addPoints(
+        $this->container->getParameter('reputation_element_follow_value')
+      );
+    }
     
     // Event de suivis
     $uea = new UserEventAction($user, $this->container);
@@ -40,12 +45,16 @@ class EventUser extends EventPropagator
    * 
    * @param User $user Utilisateur plus suivis
    */
-  public function removeFromFollow(User $user)
+  public function removeFromFollow(User $user, User $old_follower)
   {
     $ur = new UserReputation($user);
-    $ur->removePoints(
-      $this->container->getParameter('reputation_element_follow_value')
-    );
+    $security_context = new SecurityContext($old_follower);
+    if (!$security_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_USER_FOLLOW))
+    {
+      $ur->removePoints(
+        $this->container->getParameter('reputation_element_follow_value')
+      );
+    }
   }
   
 }

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

@@ -1526,8 +1526,6 @@ $(document).ready(function(){
       function(){}
     );
     
-    if (response.status === 'success')
-    {
       // 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')
@@ -1568,7 +1566,7 @@ $(document).ready(function(){
           form_add_reinit();
         }
       }
-    }
+    
     
     return false;
   });

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -70,7 +70,7 @@ class FavoriteController extends Controller
       {
         // On déclenche les événements liés a cette action
         $event = new EventElement($this->container);
-        $event->addedToFavorites($element);
+        $event->addedToFavorites($element, $user);
         $em->persist($user);
       }
       
@@ -134,7 +134,7 @@ class FavoriteController extends Controller
       {
         // On déclenche les événements liés a cette action
         $event = new EventElement($this->container);
-        $event->removedFromFavorites($element);
+        $event->removedFromFavorites($element, $user);
       }
       
       // On signale que cet user a modifié sa liste de favoris