Evolution #673: Modération plus rapide/facile

src/Muzich/AdminBundle/Controller/Admin_element/EditController.php

@@ -7,6 +7,7 @@ use Symfony\Component\Form\Form;
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Managers\ElementManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditController extends BaseEditController
 {

src/Muzich/AdminBundle/Controller/Moderate_comment/EditController.php

@@ -6,6 +6,7 @@ use Muzich\CoreBundle\lib\Controller as BaseController;
 use Muzich\CoreBundle\Managers\CommentsManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditController extends BaseController
 {

src/Muzich/AdminBundle/Controller/Moderate_element/EditController.php

@@ -5,6 +5,7 @@ namespace Muzich\AdminBundle\Controller\Moderate_element;
 use Admingenerated\MuzichAdminBundle\BaseModerate_elementController\EditController as BaseEditController;
 use Muzich\CoreBundle\Propagator\EventElement;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditController extends BaseEditController
 {

src/Muzich/AdminBundle/Controller/Moderate_tag/EditController.php

@@ -6,6 +6,7 @@ use Admingenerated\MuzichAdminBundle\BaseModerate_tagController\EditController a
 use Muzich\CoreBundle\Managers\TagManager;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditController extends BaseEditController
 {

src/Muzich/AdminBundle/Controller/Moderate_user/EditController.php

@@ -0,0 +1,126 @@
+<?php
+
+namespace Muzich\AdminBundle\Controller\Moderate_user;
+
+use Muzich\CoreBundle\lib\Controller as BaseController;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class EditController extends BaseController
+{
+  
+  protected function getUserContext($user_id)
+  {
+    $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
+      ->findOneById($user_id)->getSingleResult();
+    
+    if (!$user) {
+        throw new NotFoundHttpException("The Muzich\CoreBundle\Entity\User with id $user_id can't be found");
+    }
+    return $user;
+  }
+  
+  public function disableAndDeleteAllHisElementsAction($pk)
+  {
+    $user = $this->getUserContext($pk);
+    $user->setEnabled(false);
+    $this->persist($user);
+    foreach ($user->getElements() as $element)
+    {
+      $this->remove($element);
+    }
+    
+    try
+    {
+      $this->flush();
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+    }
+    catch (\Exception $e)
+    {
+      throw $e;
+      $this->get('session')->setFlash('error', $this->get('translator')->trans("object.edit.error", array(), 'Admingenerator') );
+    }
+    
+    return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Admin_user_show", array(
+      'pk' => $pk
+    )));
+  }
+  
+  public function acceptAction($element_id, $date)
+  {
+    $element = $this->getElementContext($element_id); 
+    $cm = new CommentsManager($element->getComments());
+    // On nettoie le commentaire et on récupère les ids des "signaleurs"
+    $ids = $cm->cleanAlertsOnComment($date);
+    $element->setComments($cm->get());
+    $element->setCountCommentReport($cm->countCommentAlert());
+    
+    $this->getDoctrine()->getEntityManager()->persist($element);
+    
+    // On récupère les user qui ont signalés ce commentaire
+    $users = $this->getDoctrine()->getEntityManager()
+      ->createQuery('
+        SELECT u FROM MuzichCoreBundle:User u
+        WHERE u.id IN (:uids)'
+      )
+      ->setParameter('uids', $ids)
+      ->getResult()
+    ;
+    
+    // Pour chacun on augmente le compteur de signalements inutiles
+    foreach ($users as $user)
+    {
+      $user->addBadReport();
+      $this->getDoctrine()->getEntityManager()->persist($user);
+    }
+    
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_comment_list" ));
+    }
+    return $this->getJsonEmptyResponse();
+  }
+  
+  protected function getJsonEmptyResponse()
+  {
+    $response = new Response(json_encode(array()));
+    $response->headers->set('Content-Type', 'application/json; charset=utf-8');
+    return $response;
+  }
+  
+  public function refuseAction($element_id, $date)
+  {
+    $element = $this->getElementContext($element_id); 
+    $cm = new CommentsManager($element->getComments());
+    $comment = $cm->get($cm->getIndexWithDate($date));
+    // On supprime le commentaire
+    $cm->deleteWithDate($date);
+    $element->setComments($cm->get());
+    $element->setCountCommentReport($cm->countCommentAlert());
+    
+    // On récupère l'auteur du commentaire pour lui incrémenté son compteur
+    // de contenu modéré
+    $user = $this->getDoctrine()->getEntityManager()->getRepository('MuzichCoreBundle:User')
+      ->findOneBy(array(
+        'id' => $comment['u']['i']
+      ));
+    
+    $user->addModeratedCommentCount();
+    
+    $this->getDoctrine()->getEntityManager()->persist($user);
+    $this->getDoctrine()->getEntityManager()->persist($element);
+    $this->getDoctrine()->getEntityManager()->flush();
+    
+    if (!$this->getRequest()->isXmlHttpRequest())
+    {
+      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
+      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Moderate_comment_list" ));
+    }
+    return $this->getJsonEmptyResponse();
+  }
+  
+}

src/Muzich/AdminBundle/Resources/config/Admin_user-generator.yml

@@ -12,7 +12,7 @@ builders:
   list:
     params:
       title: List for Users
-      display: [ id, username, email, reputation, enabled ]
+      display: [ id, username, email, reputation, bad_count, enabled ]
       actions:
         new: ~
       object_actions:
@@ -50,9 +50,15 @@ builders:
       display:
         "General": [ username, email, town, country ]
         "Resettings": [ email_requested, email_requested_datetime ]
-        "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
+        "Moderation": [ enabled, bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
         "System": [ cgu_accepted, mail_newsletter, mail_partner ]
       actions:
+        Disable_and_delete_elements:
+          route: Muzich_AdminBundle_Moderate_user_disable_and_delete_elements
+          params:
+            pk: "{{ User.id }}"
+          confirm: Sure to DISABLE user and DELETE ALL HIS ELEMENTS ?
+          icon: icon-trash
         list: ~
         new: ~
   delete: ~

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

@@ -46,3 +46,8 @@ Muzich_AdminBundle_Moderate_comment_refuse:
   requirements:
     _method:  GET
 
+Muzich_AdminBundle_Moderate_user_disable_and_delete_elements:
+  pattern:  /Moderate_user/{pk}/disable-and-delete-elements
+  defaults: { _controller:Muzich\AdminBundle\Controller\Moderate_user\EditController::disableAndDeleteAllHisElementsAction }
+  requirements:
+    _method:  GET

src/Muzich/CoreBundle/Entity/Element.php

@@ -151,7 +151,7 @@ class Element
   /**
    * Propositions de tags
    * 
-   * @ORM\OneToMany(targetEntity="ElementTagsProposition", mappedBy="element")
+   * @ORM\OneToMany(targetEntity="ElementTagsProposition", mappedBy="element", cascade={"remove"})
    */
   protected $tags_propositions;
   

src/Muzich/CoreBundle/Entity/User.php

@@ -134,6 +134,12 @@ class User extends BaseUser
   protected $groups_owned;
   
   /**
+   * @ORM\Column(type="integer", nullable=true)
+   * @var int 
+   */
+  protected $bad_count;
+  
+  /**
    * Compteur de signalements inutiles
    * 
    * @ORM\Column(type="integer", nullable=true)
@@ -494,6 +500,7 @@ class User extends BaseUser
   public function setBadReportCount($count)
   {
     $this->bad_report_count = $count;
+    $this->updateBadCount();
   }
   
   public function addBadReport()
@@ -557,6 +564,7 @@ class User extends BaseUser
   public function setModeratedElementCount($count)
   {
     $this->moderated_element_count = $count;
+    $this->updateBadCount();
   }
   
   public function addModeratedElementCount()
@@ -576,6 +584,7 @@ class User extends BaseUser
   public function setModeratedTagCount($count)
   {
     $this->moderated_tag_count = $count;
+    $this->updateBadCount();
   }
   
   public function addModeratedTagCount()
@@ -595,6 +604,7 @@ class User extends BaseUser
   public function setModeratedCommentCount($count)
   {
     $this->moderated_comment_count = $count;
+    $this->updateBadCount();
   }
   
   public function addModeratedCommentCount()
@@ -1061,4 +1071,23 @@ class User extends BaseUser
     $this->setHelpTour($help_tour_status);
   }
   
+  public function getBadCount()
+  {
+    if (is_null($this->bad_count))
+    {
+      return 0;
+    }
+    
+    return $this->bad_count;
+  }
+  
+  public function updateBadCount()
+  {
+    $this->bad_count = $this->getBadReportCount()
+      + $this->getModeratedCommentCount()
+      + $this->getModeratedElementCount()
+      + $this->getModeratedTagCount()
+    ;
+  }
+  
 }

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -16,7 +16,7 @@ class UserRepository extends EntityRepository
    * @param array $join
    * @return  Doctrine\ORM\Query
    */
-  public function findOneById($user_id, $join_list)
+  public function findOneById($user_id, $join_list = array())
   {
     $select = 'u';
     $join = '';