Evolution #614: Paramètrage de la vie personelle

app/Resources/translations/network.fr.yml

@@ -16,6 +16,7 @@ followed_by:          Ces utilisateurs suivent désormais vos publications
 favorites:
   your_favorites:     Vos favoris
   user_favorites:     Favoris de %name%
+  nopublic:           %user_username% n'a pas souhaité rendre ses favoris publiques
   
 nothing:    |
               Votre réseau n'est pas encore constitué. Utilisez la recherche pour

app/Resources/translations/userui.fr.yml

@@ -90,10 +90,18 @@ my_account:
                     La configuration de vos tags favoris permettrons de filtrer
                     la liste de partage selon vos goûts musicaux lors de chacunes de vos
                     visites. N'hésitez pas à en configurer beaucoups !
+  privacy:
+    title:          Vie privée
+    submit:         Mettre à jour
+    form:
+      favorites:    Les autres utilisateurs peuvent voir mes favoris
+      playlists:    Les autres utilisateurs peuvent voir mes listes de lecture
+    success:        Vos paramètres de vie privée ont bien été mises à jour
+    error:          Une erreur est survenue lors de la mise à jour de vos paramètres de vie privée
 
 change_username:
   submit:           Changer
-  warning:          Attention: une fois votre nom d'utilisateur modifié vous ne pourrez plus en changer !
+  warning:          "Attention: une fois votre nom d'utilisateur modifié vous ne pourrez plus en changer !"
 
 connexion:
   password_lost:    Récupérer mon mot de passe

src/Muzich/CoreBundle/Entity/User.php

@@ -10,9 +10,9 @@ use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\EntityManager;
 use Muzich\CoreBundle\Entity\UsersTagsFavorites;
 use Symfony\Component\Validator\Constraints as Assert;
-use Muzich\CoreBundle\Validator as MuzichAssert;
 use Muzich\CoreBundle\Entity\ElementTagsProposition;
 use Muzich\CoreBundle\Entity\Tag;
+use Muzich\CoreBundle\Managers\UserPrivacy as PrivacyManager;
 
 /**
  * Cet entité est l'utilisateur ayant effectué la requête.
@@ -295,6 +295,11 @@ class User extends BaseUser
   /** @ORM\Column(name="facebook_id", type="string", length=255, nullable=true) */
   protected $facebook_id;
   
+  /** 
+   * @ORM\Column(type="text", unique=false, nullable=true)
+   */
+  protected $privacy;
+
   /**
    * 
    */
@@ -1258,4 +1263,26 @@ class User extends BaseUser
     $this->playlists_owneds = $playlists_owneds;
   }
   
+  public function getPrivacy()
+  {
+    return json_decode($this->privacy, true);
+  }
+  
+  public function setPrivacy($privacy)
+  {
+    $this->privacy = json_encode($privacy);
+  }
+  
+  public function isFavoritesPublics()
+  {
+    $privacy_manager = new PrivacyManager($this);
+    return $privacy_manager->get(PrivacyManager::CONF_FAVORITES_PUBLIC);
+  }
+  
+  public function setFavoritesPublics($public)
+  {
+    $privacy_manager = new PrivacyManager($this);
+    return $privacy_manager->set(PrivacyManager::CONF_FAVORITES_PUBLIC, $public);
+  }
+  
 }

src/Muzich/CoreBundle/Extension/MyTwigExtension.php

@@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Translation\Translator;
 use Muzich\CoreBundle\Entity\Event;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\DependencyInjection\Container;
+use Muzich\CoreBundle\Entity\User;
 
 class MyTwigExtension extends \Twig_Extension {
 
@@ -29,7 +30,8 @@ class MyTwigExtension extends \Twig_Extension {
       'form_has_errors'        => new \Twig_Filter_Method($this, 'form_has_errors'),
       'format_score'           => new \Twig_Filter_Method($this, 'format_score'),
       'can_autoplay'           => new \Twig_Filter_Method($this, 'can_autoplay'),
-      'can_autoplay_type'      => new \Twig_Filter_Method($this, 'can_autoplay_type')
+      'can_autoplay_type'      => new \Twig_Filter_Method($this, 'can_autoplay_type'),
+      'userId'                 => new \Twig_Filter_Method($this, 'id_or_null')
     );
   }
   
@@ -233,5 +235,18 @@ class MyTwigExtension extends \Twig_Extension {
     }
     return false;
   }
+  
+  public function id_or_null($user)
+  {
+    if ($user)
+    {
+      if ($user instanceof User)
+      {
+        return $user->getId();
+      }
+    }
+    
+    return null;
+  }
 
 }

src/Muzich/CoreBundle/Form/User/PrivacyForm.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Muzich\CoreBundle\Form\User;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Muzich\CoreBundle\Managers\UserPrivacy as UserPrivacyManager;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class PrivacyForm extends AbstractType
+{
+  protected $options;
+  
+  public function buildForm(FormBuilderInterface $builder, array $options)
+  {
+    $this->options = $options;
+    foreach (UserPrivacyManager::$configurations as $configuration_id => $configuration_default)
+    {
+      $builder->add($configuration_id, 'checkbox', array(
+        'required' => false
+      ));
+    }
+  }
+  
+  public function getName()
+  {
+    return 'user_privacy';
+  }
+  
+  public function setDefaultOptions(OptionsResolverInterface $resolver)
+  {
+    $defaults = array();
+    $alloweds = array();
+    
+    foreach (UserPrivacyManager::$configurations as $configuration_id => $configuration_default)
+    {
+      $defaults[$configuration_id] = $configuration_default;
+      $alloweds[$configuration_id] = array(true, false);
+    }
+    
+    $resolver->setDefaults($defaults);
+    $resolver->setAllowedValues($alloweds);
+  }
+
+}

src/Muzich/CoreBundle/Managers/UserPrivacy.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Muzich\CoreBundle\Managers;
+
+use Muzich\CoreBundle\Entity\User;
+
+class UserPrivacy
+{
+  
+  const CONF_FAVORITES_PUBLIC = 'favorites_publics';
+  
+  static public $configurations = array(
+    self::CONF_FAVORITES_PUBLIC => true
+  );
+  
+  protected $user;
+  
+  public function __construct(User $user)
+  {
+    $this->user = $user;
+  }
+
+  public function get($configuration)
+  {
+    $this->configurationKnew($configuration);
+    return $this->getConfigurationValue($configuration);
+  }
+  
+  public function configurationKnew($configuration)
+  {
+    if (!array_key_exists($configuration, self::$configurations))
+      throw new \Exception('Configuration is unknow');
+  }
+  
+  protected function getConfigurationValue($configuration)
+  {
+    $user_privacy = $this->getUserPrivacy();
+    if (!array_key_exists($configuration, $user_privacy))
+      return self::$configurations[$configuration];
+    
+    return $user_privacy[$configuration];
+  }
+  
+  protected function getUserPrivacy()
+  {
+    $privacy = $this->user->getPrivacy();
+    if (!is_array($privacy))
+      return array();
+    
+    return $privacy;
+  }
+
+
+  public function set($configuration, $value)
+  {
+    $this->configurationKnew($configuration);
+    $user_privacy = $this->getUserPrivacy();
+    $user_privacy[$configuration] = ($value)?true:false;
+    $this->user->setPrivacy($user_privacy);
+  }
+  
+}

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

@@ -1620,7 +1620,7 @@ form.changeemail input[type="text"]
   width: 388px;
 }
 
-form.changeemail input[type="submit"]
+form.changeemail input[type="submit"], form.privacy input[type="submit"]
 {
   float: right;
   margin-top: 5px;
@@ -2320,6 +2320,11 @@ div.playlists_prompt ul.form-errors li
   font-size: 85%;
 }
 
+p.solop
+{
+  margin: 15px;
+}
+
 /*
 *
 *

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

@@ -3,7 +3,6 @@
 namespace Muzich\CoreBundle\Tests\Controller;
 
 use Muzich\CoreBundle\lib\FunctionalTest;
-use Muzich\CoreBundle\Entity\RegistrationToken;
 
 class UserControllerTest extends FunctionalTest
 {
@@ -546,4 +545,47 @@ class UserControllerTest extends FunctionalTest
     $this->assertEquals(false, $paul->mail_partner);
   }
   
+  public function testPrivacyUpdate()
+  {
+    $this->client = self::createClient();
+    
+    $bux = $this->findUserByUsername('bux');
+    
+    $this->checkFavoritesViewable($bux, true);
+    $this->connectUser('bux', 'toor');
+    $this->updateFavoritePrivacy(false);
+    $this->disconnectUser();
+    $this->checkFavoritesViewable($bux, false);
+    $this->connectUser('paul', 'toor');
+    $this->checkFavoritesViewable($bux, false);
+    $this->disconnectUser();
+    $this->connectUser('bux', 'toor');
+    $this->checkFavoritesViewable($bux, true);
+  }
+  
+  protected function checkFavoritesViewable($user, $public)
+  {
+    $this->goToPage($this->generateUrl('favorite_user_list', array('slug' => $user->getSlug(), '_locale' => 'fr')));
+    $this->isResponseSuccess();
+    if ($public)
+      $this->notExist('p.favorites_no_publics');
+    if (!$public)
+      $this->exist('p.favorites_no_publics');
+  }
+  
+  protected function updateFavoritePrivacy($public)
+  {
+    $this->goToPage($this->generateUrl('my_account'));
+    $form = $this->selectForm('form.privacy input[type="submit"]');
+    if ($public)
+      $form['user_privacy[favorites_publics]']->tick();
+    if (!$public)
+      $form['user_privacy[favorites_publics]']->untick();
+    $this->submit($form);
+    
+    $this->isResponseRedirection();
+    $this->followRedirection();
+    $this->isResponseSuccess();
+  }
+  
 }

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -11,11 +11,6 @@ use Muzich\CoreBundle\Entity\User;
 use Muzich\CoreBundle\lib\Tag as TagLib;
 use Muzich\CoreBundle\Security\Context as SecurityContext;
 
-//use Muzich\CoreBundle\Entity\Group;
-//use Muzich\CoreBundle\Form\Group\GroupForm;
-//use Symfony\Component\HttpFoundation\Request;
-//use Muzich\CoreBundle\Managers\GroupManager;
-
 class FavoriteController extends Controller
 {
   
@@ -205,20 +200,28 @@ class FavoriteController extends Controller
   {
     $viewed_user = $this->findUserWithSlug($slug);
     
-    $search_object = $this->createSearchObject(array(
-      'user_id'  => $viewed_user->getId(),
-      'favorite' => true,
-      'count'    => $this->container->getParameter('search_default_count')
-    ));
-    
-    $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($viewed_user->getId(), $this->getUserId(true))      
-    ;
-    
+    $tags = array();
     $tags_id = array();
-    foreach ($tags as $tag)
+    $elements = array();
+    if ($viewed_user->isFavoritesPublics() || $viewed_user->getId() == $this->getUserId(true))
     {
-      $tags_id[] = $tag->getId();
+      $search_object = $this->createSearchObject(array(
+        'user_id'  => $viewed_user->getId(),
+        'favorite' => true,
+        'count'    => $this->container->getParameter('search_default_count')
+      ));
+
+      $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
+        ->getTags($viewed_user->getId(), $this->getUserId(true))      
+      ;
+
+      $tags_id = array();
+      foreach ($tags as $tag)
+      {
+        $tags_id[] = $tag->getId();
+      }
+      
+      $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
     }
     
     return array(
@@ -226,7 +229,7 @@ class FavoriteController extends Controller
       'tags_id_json'  => json_encode($tags_id),
       'user'          => $this->getUser(),
       'viewed_user'   => $viewed_user,
-      'elements'      => $search_object->getElements($this->getDoctrine(), $this->getUserId(true))
+      'elements'      => $elements
     );
   }
   

src/Muzich/FavoriteBundle/Resources/views/Favorite/userList.html.twig

@@ -23,10 +23,18 @@
     
   </div>
 
-  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with{
-      'display_autoplay'     : true,
-      'autoplay_context'     : 'favorite_user'
-  } %}
+  {% if not viewed_user.favoritesPublics and viewed_user.id != app.user|userId %}
+    
+    <p class="solop favorites_no_publics">{{ 'favorites.nopublic'|trans({'%user_username%' : viewed_user.name}, 'network') }}</p>
+    
+  {% else %}
+    
+    {% include "MuzichCoreBundle:SearchElement:default.html.twig" with{
+        'display_autoplay'     : true,
+        'autoplay_context'     : 'favorite_user'
+    } %}
+    
+  {% endif %}
     
   {% if elements|length %}
     {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {

src/Muzich/UserBundle/Controller/UserController.php

@@ -14,6 +14,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Muzich\UserBundle\Form\Type\RegistrationFormType;
 use Muzich\CoreBundle\Entity\User;
 use Muzich\CoreBundle\Form\User\PasswordForm;
+use Muzich\CoreBundle\Form\User\PrivacyForm;
 
 class UserController extends Controller
 {
@@ -44,6 +45,11 @@ class UserController extends Controller
     ;
   }
   
+  protected function getPrivacyForm()
+  {
+    return $this->createForm(new PrivacyForm(), $this->getUser());
+  }
+  
   protected function getTagsFavoritesForm($user)
   {
     $ids = array();
@@ -91,7 +97,8 @@ class UserController extends Controller
       'favorite_tags_id'         => $this->getTagsFavorites(),
       'change_email_form'        => $change_email_form->createView(),
       'avatar_form'              => $this->getAvatarForm()->createView(),
-      'preferences_form'         => $this->getPreferencesForm()->createView()
+      'preferences_form'         => $this->getPreferencesForm()->createView(),
+      'privacy_form'             => $this->getPrivacyForm()->createView()
     );
   }
   
@@ -263,7 +270,8 @@ class UserController extends Controller
         'favorite_tags_id'         => $this->getTagsFavorites(),
         'change_email_form'        => $change_email_form->createView(),
         'avatar_form'              => $this->getAvatarForm()->createView(),
-        'preferences_form'         => $this->getPreferencesForm()->createView()
+        'preferences_form'         => $this->getPreferencesForm()->createView(),
+        'privacy_form'             => $this->getPrivacyForm()->createView()
       )
     );
   }
@@ -441,7 +449,8 @@ class UserController extends Controller
         'favorite_tags_id'         => $this->getTagsFavorites(),
         'change_email_form'        => $change_email_form->createView(),
         'avatar_form'              => $this->getAvatarForm()->createView(),
-        'preferences_form'         => $this->getPreferencesForm()->createView()
+        'preferences_form'         => $this->getPreferencesForm()->createView(),
+        'privacy_form'             => $this->getPrivacyForm()->createView()
       )
     );
   }
@@ -566,6 +575,26 @@ class UserController extends Controller
     return $this->redirect($this->generateUrl('my_account'));
   }
   
+  public function updatePrivacyAction(Request $request)
+  {
+    $form = $this->getPrivacyForm();
+    $form->bind($request);
+    
+    if ($form->isValid()) {
+      $em = $this->getEntityManager();
+      $em->persist($form->getData());
+      $em->flush();
+
+      $this->setFlash('success',
+        $this->trans('my_account.privacy.success', array(), 'userui'));
+      return $this->redirect($this->generateUrl('my_account'));
+    }
+    
+    $this->setFlash('error',
+      $this->trans('my_account.privacy.error', array(), 'userui'));
+    return $this->redirect($this->generateUrl('my_account'));
+  }
+  
   public function updateHelpViewedAction($help_id, $token)
   {
     if ($this->getUser()->getPersonalHash('updateHelpAction') != $token)

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

@@ -62,6 +62,12 @@ user_update_preferences:
   defaults: { _controller: MuzichUserBundle:User:updatePreferences }
   requirements:
     _method:  POST
+
+user_update_privacy:
+  pattern:  /account/update-privacy
+  defaults: { _controller: MuzichUserBundle:User:updatePrivacy }
+  requirements:
+    _method:  POST
   
 user_hide_help:
   pattern: /account/update-help/hide/{help_id}/{token}

src/Muzich/UserBundle/Resources/views/User/account.html.twig

@@ -127,5 +127,28 @@
     </div>
     <div style="clear:both;"></div>
     
+    <h2 data-open="myaccount_privacy">{{ 'my_account.privacy.title'|trans({}, 'userui') }}</h2>
+  
+    <div id="myaccount_privacy" class="myaccount_part"
+       style="display: none;"
+    >
+      <form
+        class="privacy"
+        action="{{ path('user_update_privacy') }}"
+        method="post"
+      >
+        
+        <div class="field">
+          <label for="user_privacy_favorites_publics" >{{ 'my_account.privacy.form.favorites'|trans({}, 'userui') }}</label>
+          {{ form_widget(privacy_form.favorites_publics) }}
+        </div>
+        
+        {{ form_rest(privacy_form) }}
+      
+          <input type="submit" class="button" value="{{ 'my_account.privacy.submit'|trans({}, 'userui') }}" />
+      </form>
+    </div>
+    <div style="clear:both;"></div>
+    
   </div>
 {% endblock %}