Evolution #788: Ajouter un élément a sa playlist

app/Resources/translations/elements.en.yml

@@ -142,9 +142,24 @@ playlist:
   contained:             Music already in playlist
   not_contained:         Music not already in playlist
   how_add_element:       |
-                          To add music in your playlists you have to use share buttons (at top right).
-                          You will choose or create playlist for the music.
+                          To add music in your playlists you have to use share buttons 
+                          (at top right in shares).
+                          You will choose or create playlist to add music in. You can also
+                          add private songs in playlists: When you add private songs 
+                          (youtube, soundcloud, ...) they are not publish in muzi.ch public network.
+                          
   edit:                  Edit
   update_submit:         Update
+  create_submit:         Create
   goback:                Back
-  edit_title:            Edit "%playlist_name%"
+  edit_title:            Edit "%playlist_name%"
+  create_title:          New playlist
+  add_private_links:     Add "privates" musics
+  add_private_links_help: |
+                          Add here your musics links (http://youtube... , http://soundcloud..., etc) to add them in
+                          the playlist. You can add multiples links (one by line).
+  add_private_links_submit: Add these links
+  add_private_links_cancel: Cancel
+  no_links_added:         No musics added
+  links_added:            Musics added
+  links_added_witherr:    Musics added but wom links was not useable

app/Resources/translations/elements.fr.yml

@@ -143,8 +143,24 @@ playlist:
   how_add_element:       |
                           Pour ajouter de la musique à vos listes de lectures vous devez utiliser
                           les boutons disponibles en haut à droite des partages. Vous pourrez ensuite
-                          choisir à quelle liste ajouter la musique en question.
+                          choisir à quelle liste ajouter la musique en question. Vous pouvez aussi
+                          constituer des playlists avec des liens "privés": C'est à dire que vous 
+                          pouvez ajouter des musiques (youtube, soundcloud, ...) afin de constituer 
+                          une liste de lecture sans que ces musiques ne soit ajoutés dans le réseau 
+                          publique de muzi.ch.
   edit:                  Modifier
   update_submit:         Mettre à jour
+  create_submit:         Créer
   goback:                Retour
   edit_title:            Modification de "%playlist_name%"
+  create_title:          Nouvelle liste de lecture
+  add_private_links:     Ajouter des musiques "privées"
+  add_private_links_help: |
+                          Saisissez ici les liens (http://) vers les pages (youtube, soundcloud, etc)
+                          des musiques à ajouter a cette liste de lecture. Vous pouvez en saisir
+                          plusieurs (une par ligne).
+  add_private_links_submit: Ajouter ces liens
+  add_private_links_cancel: Annuler
+  no_links_added:         Aucune musiques n'ont été ajoutés
+  links_added:            Les musiques ont été ajoutés
+  links_added_witherr:    Des musiques ont été ajoutés mais certains liens n'ont pu être interprétés

app/Resources/translations/flash.en.yml

@@ -50,4 +50,6 @@ playlist:
   delete:
     success:       Playlist deleted
   update:
-    success:       Playlist updaded
+    success:       Playlist updaded
+  create:
+    success:       Playlist created

app/Resources/translations/flash.fr.yml

@@ -54,3 +54,5 @@ playlist:
     success:       Playlist supprimée
   update:
     success:       La liste de lecture a été mise à jour
+  create:
+    success:       La liste de lecture a été créée

app/Resources/translations/users.en.yml

@@ -7,6 +7,7 @@ user:
   view_profile:                 See profile
   stop_follow:                  Stop follow
   view_playlists:               Playlists
+  new_playlist:                 Create new playlist
   show:
     title:                      %name% shares
   reputation:

app/Resources/translations/users.fr.yml

@@ -7,6 +7,7 @@ user:
   view_profile:                 Profil
   stop_follow:                  Ne plus suivre
   view_playlists:               Listes de lectures
+  new_playlist:                 Créer une nouvelle liste
   show:
     title:                      Diffusions de %name%
   reputation:

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -1081,7 +1081,8 @@ class ElementController extends Controller
   {
     $es = new ElementSearcher();
     $es->init(array(
-      'ids' => array($element_id)
+      'ids'              => array($element_id),
+      'display_privates' => true
     ));
     
     if (!($element = $es->getElements($this->getDoctrine(), $this->getUserId(true), 'single')))
@@ -1130,7 +1131,8 @@ class ElementController extends Controller
     // On prépare la récupèration de l'élèment
     $es = new ElementSearcher();
     $es->init(array(
-      'ids' => array($element_id)
+      'ids'              => array($element_id),
+      'display_privates' => true
     ));
     
     if (!($element = $es->getElements($this->getDoctrine(), $this->getUserId(true), 'single')))

src/Muzich/CoreBundle/Entity/Element.php

@@ -188,7 +188,7 @@ class Element
    * 
    * @ORM\Column(type = "string", length = 128)
    * @Assert\NotBlank(message = "error.element.name.notblank")
-   * @Assert\Length(min = 3, max = 84, minMessage = "error.element.name.toshort", maxMessage = "error.element.name.tolong")
+   * @Assert\Length(min = 3, max = 128, minMessage = "error.element.name.toshort", maxMessage = "error.element.name.tolong")
    * @var type string
    */
   protected $name;
@@ -200,6 +200,11 @@ class Element
   protected $slug;
   
   /**
+   * @ORM\Column(type="boolean")
+   */
+  protected $private = false;
+  
+  /**
    * Code d'embed
    * 
    * @ORM\Column(type="text", nullable=true)
@@ -260,27 +265,18 @@ class Element
   protected $count_report;
   
   /**
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> feature/v0.9.8.2/score
    * @ORM\Column(type="integer", nullable=true)
    * @var int 
    */
   protected $count_favorited;
   
   /**
-<<<<<<< HEAD
    * @ORM\Column(type="integer", nullable=true)
    * @var int 
    */
   protected $count_playlisted;
   
   /**
->>>>>>> Stashed changes
-=======
->>>>>>> feature/v0.9.8.2/score
    * @ORM\Column(type="boolean", nullable=false)
    * @var int 
    */
@@ -1129,4 +1125,58 @@ class Element
     $this->setCountPlaylisted($this->getCountPlaylisted()-1);
   }
   
+  public function isPrivate()
+  {
+    return ($this->private)?true:false;
+  }
+  
+  public function getPrivate()
+  {
+    return $this->isPrivate();
+  }
+  
+  public function setPrivate($private)
+  {
+    $this->private = ($private)?true:false;
+  }
+  
+  public function setNameWithData($clean = true)
+  {
+    $name = '';
+    if (($title = $this->getData(self::DATA_TITLE)))
+    {
+      if (($artist = $this->getData(self::DATA_ARTIST)))
+      {
+        $name = $title.' - '.$artist;
+      }
+      else
+      {
+        $name = $title;
+      }
+    }
+    
+    if ($clean)
+    {
+      if (strlen($name) < 3)
+      {
+        try
+        {
+          $str = file_get_contents($this->getUrl());
+          if (strlen($str) > 0)
+          {
+            preg_match("/\<title\>(.*)\<\/title\>/",$str,$title);
+            $name = $title[1];
+          }
+        }
+        catch (\Exception $e)
+        {
+          $name = $this->getUrl();
+        }
+      }
+      $name = substr($name, 0, 128);
+    }
+    
+    $this->setName($name);
+  }
+  
 }

src/Muzich/CoreBundle/Form/Playlist/PrivateLinksForm.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Muzich\CoreBundle\Form\Playlist;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class PrivateLinksForm extends AbstractType
+{
+  public function buildForm(FormBuilderInterface $builder, array $options)
+  {
+    $builder->add('links', 'textarea', array(
+      'required' => true,
+    ));
+  }
+
+  public function getName()
+  {
+    return 'playlist_private_links_form';
+  }
+}
+
+

src/Muzich/CoreBundle/Managers/PlaylistManager.php

@@ -9,6 +9,8 @@ use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Entity\UserPlaylistPicked;
 use \Doctrine\Common\Collections\ArrayCollection;
 use Muzich\CoreBundle\lib\Tag as TagLib;
+use Muzich\CoreBundle\Managers\ElementManager;
+use Symfony\Component\DependencyInjection\Container;
 
 class PlaylistManager
 {
@@ -73,11 +75,11 @@ class PlaylistManager
     ;
   }
   
-  public function getPlaylistElements(Playlist $playlist, $offset = null)
+  public function getPlaylistElements(Playlist $playlist, $offset = null, $user_id = null)
   {
     $element_ids = $playlist->getElementsIds();
     $query_builder = $this->entity_manager->getRepository('MuzichCoreBundle:Element')
-      ->getElementsWithIdsOrderingQueryBuilder($element_ids)
+      ->getElementsWithIdsOrderingQueryBuilder($element_ids, true, $user_id)
     ;
     
     if ($offset)
@@ -253,4 +255,40 @@ class PlaylistManager
       ->findById($playlist->getElementsIds());
   }
   
+  public function addPrivateLinks(Playlist $playlist, User $user, $links, Container $container)
+  {
+    // Pour le moment on le fait ici car le ElementManager est mal pensé.
+    $count_added = 0;
+    if (count($links))
+    {
+      foreach ($links as $link)
+      {
+        $link = trim($link);
+        if (filter_var($link, FILTER_VALIDATE_URL) !== false)
+        {
+          $element = new Element();
+          $element->setUrl($link);
+          $element->setType('none');
+          $element->setPrivate(true);
+
+          $factory = new ElementManager($element, $this->entity_manager, $container);
+          $factory->proceedFill($user);
+          
+          $element->setNameWithData(true);
+          
+          $this->entity_manager->persist($element);
+          $this->entity_manager->flush();
+          $this->addElementToPlaylist($element, $playlist);
+          
+          $count_added += 1;
+        }
+      }
+    }
+    
+    $this->entity_manager->persist($playlist);
+    $this->entity_manager->flush();
+    
+    return $count_added;
+  }
+  
 }

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -21,6 +21,7 @@ class ElementRepository extends EntityRepository
     return $this->getEntityManager()
       ->createQuery('
         SELECT e FROM MuzichCoreBundle:Element e 
+        WHERE e.private = 0
         ORDER BY e.name ASC'
       )
       ->getResult()
@@ -39,7 +40,7 @@ class ElementRepository extends EntityRepository
         ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
       ;
     }
-     
+    
     $esqb = new ElementSearcherQueryBuilder($this->getEntityManager(), $searcher, $user_id, $params);
     
     // Si on demande une comptabilisation, on retourne juste la requete qui selectionne les ids
@@ -52,335 +53,6 @@ class ElementRepository extends EntityRepository
     return $esqb->getElementsQuery();
   }
   
-  
-  
-//  /**
-//   * TODO: Faire un bel objet pour gérer tout ça =)
-//   * => Utiliser l'objet ElementSearcher (ou du moin réorganiser ça en plusieurs 
-//   * objets)
-//   * 
-//   * 
-//   * @param ElementSearcher $searcher
-//   * @return Doctrine\ORM\Query
-//   */
-//  public function findBySearchOLD(ElementSearcher $searcher, $user_id, $exec_type = 'execute', $params = array())
-//  {
-//    // Tableaux des paramétres
-//    $params_ids = array();
-//    $params_select = array();
-//    $params_select['uid'] = $user_id;
-//    $order_by = "ORDER BY e_.created DESC, e_.id DESC";
-//    
-//    // Première chose, si on impose les element_ids on a pas besoin de faire 
-//    // le filtrage
-//    if ($searcher->hasIds())
-//    {
-//      // Dans ce cas ou les ids sont déjà donné, on ne peut pas avoir de nouveaux
-//      // éléments
-//      if ($searcher->isSearchingNew())
-//      {
-//        return $query = $this->getEntityManager()
-//          ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
-//        ;
-//      }
-//      
-//      if (($id_limit = $searcher->getIdLimit()))
-//      {
-//        return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), $id_limit, $searcher->getCount(), $searcher->getIdsDisplay());
-//      }
-//      return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), null, null, $searcher->getIdsDisplay());
-//    }
-//    
-//    // Booléen nous permettant de savoir si un where a déjà été écrit
-//    $is_where = false;
-//    
-//    // Si c'est une recherche string, les autres paramètres ne sont pas nécéssaire
-//    // TODO: Dans la nouvelle version ourquoi pas !!
-//    // TODOOO: Pas encore dans new version (string)
-//    $where_string = '';
-//    if (($string = $searcher->getString()))
-//    {
-//      // On prépare notre liste de mots
-//      $words = array_unique(array_merge(
-//        explode(' ', $string),
-//        explode('-', $string),
-//        explode('- ', $string),
-//        explode(' -', $string),
-//        explode(' - ', $string),
-//        explode(',', $string),
-//        explode(', ', $string),
-//        explode(' ,', $string),
-//        explode(' , ', $string)
-//      ));
-//      
-//      // On récupère les ids des elements correspondants
-//      $word_min_length = 0;
-//      if (isset($params['word_min_length']))
-//      {
-//        $word_min_length = $params['word_min_length'];
-//      }
-//      foreach ($words as $i => $word)
-//      {
-//        if (strlen($word) >= $word_min_length)
-//        {
-//          if ($where_string === '')
-//          {
-//            $where_string = ($is_where) ? ' AND (' : ' WHERE (';
-//            $is_where = true;
-//            $where_string .= "UPPER(e_.name) LIKE :str".$i;
-//          }
-//          else
-//          {
-//            $where_string .= " OR UPPER(e_.name) LIKE :str".$i;
-//          }
-//          $params_ids['str'.$i] = '%'.strtoupper($word).'%';
-//        }
-//      }
-//      $where_string .= ')';
-//      
-//    }
-//    
-//    
-//    // Construction des conditions pour la selection d'ids
-//    $where_tags = '';
-//    $join_tags  = '';
-//    
-//    /*
-//     * des fois on se retrouve avec un string au lieu d'un tableau
-//     */
-//    $tags = $searcher->getTags();
-//    
-//    if (!is_array($tags))
-//    {
-//      $tags_decoded = json_decode($tags);
-//      $tags = array();
-//      foreach ($tags_decoded as $tag_id)
-//      {
-//        $tags[$tag_id] = $tag_id;
-//      }
-//    }
-//    
-//    if (count($tags))
-//    {
-//      foreach ($tags as $tag_id => $tag_name)
-//      {
-//        // LEFT JOIN car un element n'est pas obligatoirement lié a un/des tags
-//        $join_tags = " LEFT JOIN e_.tags t_";
-//
-//        // Construction du chere pour les tags
-//        if ($where_tags == '')
-//        {
-//          $where_tags .= ' WHERE (t_.id = :tid'.$tag_id;
-//        }
-//        else
-//        {
-//          $where_tags .= ' OR t_.id = :tid'.$tag_id;
-//        }
-//        $params_ids['tid'.$tag_id] = $tag_id;
-//      }
-//      // Fermeture de la parenthése qui isole la condition des tags
-//      $where_tags .= ')';
-//      $is_where = true;
-//    }
-//    
-//    // Construction de la condition network
-//    $join_network  = '';
-//    $where_network = '';
-//    if ($searcher->getNetwork() == ElementSearcher::NETWORK_PERSONAL)
-//    {
-//      $join_network = 
-//        " JOIN e_.owner o_"
-//      // LEFT JOIN car l'element n'est pas obligatoirement lié a un groupe
-//      . " LEFT JOIN e_.group g_"
-//      // LEFT JOIN car owner n'est pas obligatoirement lié a des followers
-//      . " LEFT JOIN o_.followers_users f_"
-//      // LEFT JOIN car le groupe n'est pas obligatoirement lié a des followers
-//      . " LEFT JOIN g_.followers gf_"
-//      ;
-//      $where_network = ($is_where) ? ' AND' : ' WHERE';
-//      $is_where = true;
-//      // Le filtre applique: Soit le proprio fait partis des followeds de l'utilisateur
-//      // soit l'element est ajouté dans un groupe que l'utilisateur follow.
-//      $where_network .= ' (f_.follower = :userid OR gf_.follower = :useridg)';
-//      $params_ids['userid'] = $user_id;
-//      $params_ids['useridg'] = $user_id;
-//    }
-//    
-//    // ajout du filtre sur un user si c'est le cas
-//    $where_user = '';
-//    //                                                  Si c'est une recherche 
-//    //                de favoris, on ne filtre pas sur le proprio de l'element
-//    if (($search_user_id = $searcher->getUserId()) && !$searcher->isFavorite())
-//    {
-//      $where_user = ($is_where) ? ' AND' : ' WHERE';
-//      $is_where = true;
-//      $where_user .= ' e_.owner = :suid';
-//      $params_ids['suid'] = $search_user_id;
-//    }
-//    
-//    // ajout du filtre sur un user si c'est le cas
-//    $where_group = '';
-//    //                                                 Si c'est une recherche 
-//    //               de favoris, on ne filtre pas sur le proprio de l'element
-//    if (($search_group_id = $searcher->getGroupId()) && !$searcher->isFavorite())
-//    {
-//      $where_group = ($is_where) ? ' AND' : ' WHERE';
-//      $is_where = true;
-//      $where_group .= ' e_.group = :sgid';
-//      $params_ids['sgid'] = $search_group_id;
-//    }
-//    
-//    // Filtre pour afficher uniquement les elements mis en favoris
-//    $join_favorite = ''; 
-//    $where_favorite = '';
-//    if ($searcher->isFavorite())
-//    {
-//      $where_favorite = ($is_where) ? ' AND' : ' WHERE';
-//      $is_where = true;
-//      if (($favorite_user_id = $searcher->getUserId()) && !$searcher->getGroupId())
-//      {
-//        // Pas de LEFT JOIN car on ne veut que les elements mis en favoris
-//        $join_favorite = 'JOIN e_.elements_favorites fav2_';
-//        $where_favorite .= ' fav2_.user = :fuid';
-//        $params_ids['fuid'] = $favorite_user_id;
-//      }
-//      else if (($favorite_group_id = $searcher->getGroupId()) && !$searcher->getUserId())
-//      {
-//        // TODO: Faire en sorte que ça affiche les favoris des gens suivant
-//        // le groupe
-//      }
-//      else
-//      {
-//        throw new Exception('For use favorite search element, you must specify an user_id or group_id');
-//      }
-//    }
-//    
-//    // Si id_limit est précisé c'est que l'on demande "la suite" ou "les nouveaux"
-//    $where_id_limit = '';
-//    if (($id_limit = $searcher->getIdLimit()) && !$searcher->isSearchingNew())
-//    {
-//      $where_id_limit = ($is_where) ? ' AND' : ' WHERE';
-//      $is_where = true;
-//      $where_id_limit .= " e_.id < :id_limit";
-//      $params_ids['id_limit'] = $id_limit;
-//    }
-//    elseif ($id_limit && $searcher->isSearchingNew())
-//    {
-//      $where_id_limit = ($is_where) ? ' AND' : ' WHERE';
-//      $is_where = true;
-//      $where_id_limit .= " e_.id > :id_limit";
-//      $params_ids['id_limit'] = $id_limit;
-//      // Pour pouvoir charger les x nouveaux on doit organiser la liste 
-//      // de manière croissante
-//      $order_by = "ORDER BY e_.created ASC, e_.id ASC";
-//    }
-//    
-//    
-//    // Recherche strict ou non ?
-//    $where_tag_strict = '';
-//    if ($searcher->getTagStrict() && count($tags))
-//    {
-//      // On a besoin de récupérer la liste des element_id qui ont les tags
-//      // demandés.
-//      $tag_ids = '';
-//      foreach ($tags as $tag_id => $tag_name)
-//      {
-//        if ($tag_ids === '')
-//        {
-//          $tag_ids .= (int)$tag_id;
-//        }
-//        else
-//        {
-//          $tag_ids .= ','.(int)$tag_id;
-//        }
-//      }
-//      
-//      $sql = "SELECT et.element_id FROM elements_tag et "
-//      ."WHERE et.tag_id IN ($tag_ids) group by et.element_id "
-//      ."having count(distinct et.tag_id) = ".count($tags);
-//      $rsm = new \Doctrine\ORM\Query\ResultSetMapping;
-//      $rsm->addScalarResult('element_id', 'element_id');
-//      
-//      $strict_element_ids_result = $this->getEntityManager()
-//        ->createNativeQuery($sql, $rsm)
-//        //->setParameter('ids', $tag_ids)
-//        ->getScalarResult()
-//      ;
-//      
-//      $strict_element_ids = array();
-//      foreach ($strict_element_ids_result as $strict_id)
-//      {
-//        $strict_element_ids[] = $strict_id['element_id'];
-//      }
-//      
-//      if (count($strict_element_ids))
-//      {
-//        $where_tag_strict = ($is_where) ? ' AND' : ' WHERE';
-//        $where_tag_strict .= ' e_.id IN (:tag_strict_ids)';
-//        $params_ids['tag_strict_ids'] = $strict_element_ids;
-//      }
-//      // Ce else palie au bug du au cas ou $strict_element_ids est egal a array();
-//      else
-//      {
-//        $where_tag_strict = ($is_where) ? ' AND' : ' WHERE';
-//        $where_tag_strict .= ' 1 = 2';
-//      }
-//    }
-//    
-//    // Requête qui selectionnera les ids en fonction des critéres
-//    $id_query = $this->getEntityManager()
-//      ->createQuery(
-//        "SELECT e_.id
-//        FROM MuzichCoreBundle:Element e_
-//        $join_tags
-//        $join_network
-//        $join_favorite
-//        $where_tags
-//        $where_network
-//        $where_user
-//        $where_group
-//        $where_favorite
-//        $where_tag_strict
-//        $where_string
-//        $where_id_limit
-//        GROUP BY e_.id
-//        $order_by")
-//     ->setParameters($params_ids)
-//    ;
-//    
-//    // Si on a précisé que l'on voulait un count, pas de limite
-//    if ($exec_type != 'count')
-//    {
-//      $id_query->setMaxResults($searcher->getCount());
-//    }
-//    
-//    // si l'on a demandé un count
-//    if ($exec_type == 'count')
-//    {
-//      // On retourne cette query
-//      return $id_query;
-//    }
-//    
-//    $r_ids = $id_query->getArrayResult();
-//    
-//    $ids = array();
-//    
-//    if (count($r_ids))
-//    {
-//      foreach ($r_ids as $r_id)
-//      {
-//        $ids[] = $r_id['id'];
-//      }
-//
-//      return $this->getSelectElementForSearchQuery($params_select, $user_id, $ids);
-//    }
-//    
-//    // Il faut retourner une Query
-//    return $query = $this->getEntityManager()
-//      ->createQuery("SELECT e FROM MuzichCoreBundle:Element e WHERE 1 = 2")
-//    ;
-//  }
-  
   protected function getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit = null, $count_limit = null, $ids_display = null)
   {
     $where = "";
@@ -408,6 +80,7 @@ class ElementRepository extends EntityRepository
       $left_join
       JOIN e.owner o
       WHERE e.id IN (:ids) $where
+      AND WHERE e.private = 0
       ORDER BY e.created DESC, e.id DESC"
     ;
 
@@ -443,6 +116,7 @@ class ElementRepository extends EntityRepository
         JOIN e.group g
         JOIN e.tags t
         WHERE u.id = :uid
+        AND WHERE e.private = 0
         ORDER BY e.created DESC'
       )
       ->setParameter('uid', $user_id)
@@ -467,6 +141,7 @@ class ElementRepository extends EntityRepository
         JOIN e.group g
         JOIN e.tags t
         WHERE g.id = :gid
+        AND WHERE e.private = 0
         ORDER BY e.created DESC'
       )
       ->setParameter('gid', $group_id)
@@ -513,20 +188,32 @@ class ElementRepository extends EntityRepository
   /**
    * WARNING: Seulement compatibel avec MySQL !!
    */
-  public function getElementsWithIdsOrderingQueryBuilder($element_ids)
+  public function getElementsWithIdsOrderingQueryBuilder($element_ids, $show_privates = false, $user_id = true)
   {
     $doctrineConfig = $this->getEntityManager()->getConfiguration();
     $doctrineConfig->addCustomStringFunction('FIELD', 'Muzich\CoreBundle\DoctrineExtensions\Query\Mysql\Field');
     
     if (count($element_ids))
     {
-      return $this->getEntityManager()->createQueryBuilder()
+      $qb =  $this->getEntityManager()->createQueryBuilder()
         ->select('e, field(e.id, ' . implode(', ', $element_ids) . ') as HIDDEN field')
         ->from('MuzichCoreBundle:Element', 'e')
         ->where('e.id IN (:element_ids)')
         ->setParameter('element_ids', $element_ids)
         ->orderBy('field')
       ;
+      
+      if (!$show_privates)
+      {
+        $qb->andWhere('e.private = 0');
+      }
+      else if ($user_id)
+      {
+        $qb->andWhere('(e.private = 0 OR (e.private = 1 AND e.owner = :owner_id))');
+        $qb->setParameter('owner_id', $user_id);
+      }
+      
+      return $qb;
     }
     
     return $this->getEntityManager()->createQueryBuilder()

src/Muzich/CoreBundle/Resources/config/security.yml

@@ -109,7 +109,7 @@ security:
         - { path: ^/(?:fr|en)/user, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/group, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/search, role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: ^/(?:fr|en)/playlist, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        #- { path: ^/(?:fr|en)/playlist, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/(?:fr|en)/my-groups/add, role: IS_AUTHENTICATED_ANONYMOUSLY }  
         - { path: ^/(?:fr|en)/song, role: IS_AUTHENTICATED_ANONYMOUSLY }                  
           

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

@@ -2533,6 +2533,28 @@ div.social_buttons ul li.googleplus {
     margin-left: -25px;
 }
 
+a.button.toplist:visited
+{
+  color: white;
+}
+
+a.button.toplist
+{
+  float: right;
+}
+
+div.private_links form div.inputs
+{
+  float: right;
+}
+
+div.private_links textarea
+{
+  height: 60px;
+  width: 435px;
+}
+
+
 /*
 *
 *

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

@@ -1328,7 +1328,7 @@ $(document).ready(function(){
         elements.prepend(response.html);
         $('div#share_from_content').append(elements);
         $('div#share_from_message').text(response.message);
-        //$('form[name="add"]').append($('<input type="hidden" name="shared_from_finished" id="shared_from_finished" value="1" />'));
+        $('form[name="add"]').append($('<input type="hidden" name="shared_from_finished" id="shared_from_finished" value="1" />'));
       }
       
       return true;
@@ -3370,6 +3370,20 @@ $(document).ready(function(){
     window.sidebar_topsticked = true;
   }
   
+  /*
+   * Playlist private links lien privés
+   * 
+   */
+  
+  $('a.open_playlist_private_links').click(function(){
+    $('div.private_links').slideDown();
+  });
+  
+  $('div.private_links input.cancel').click(function(){
+    $('div.private_links').slideUp();
+  });
+  
+  
 });
 
 function open_ajax_popin(url, callback, data)

src/Muzich/CoreBundle/Resources/views/SearchElement/element.html.twig

@@ -1,6 +1,9 @@
 {% if display_edit_actions is not defined %}
   {% set display_edit_actions = true %}
 {% endif %}
+{% if display_social_buttons is not defined %}
+  {% set display_social_buttons = true %}
+{% endif %}
 {% if display_player is not defined %}
   {% set display_player = true %}
 {% endif %}
@@ -86,20 +89,24 @@
               {% endif %}
             </li>
         <li class="star">
-          {% if app.user %}
-            {% if element.hasFavoriteUser(app.user.id) %}
-              <a class="favorite_link" href="{{ path('favorite_remove', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
-                <img id="favorite_{{ element.id }}_is" src="{{ asset('img/icon_star_2_red.png') }}" title="{{ 'element.favorite.remove'|trans({}, 'elements') }}" alt="{{ 'element.favorite.remove'|trans({}, 'elements') }}"/>
-              </a>
+          {% if not element.private %}
+            {% if app.user %}
+              {% if element.hasFavoriteUser(app.user.id) %}
+                <a class="favorite_link" href="{{ path('favorite_remove', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
+                  <img id="favorite_{{ element.id }}_is" src="{{ asset('img/icon_star_2_red.png') }}" title="{{ 'element.favorite.remove'|trans({}, 'elements') }}" alt="{{ 'element.favorite.remove'|trans({}, 'elements') }}"/>
+                </a>
+              {% else %}
+                <a class="favorite_link" href="{{ path('favorite_add', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
+                  <img id="favorite_{{ element.id }}_isnot" src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
+                </a>
+              {% endif %}
             {% else %}
-              <a class="favorite_link" href="{{ path('favorite_add', { 'id': element.id, 'token': app.user.personalHash(element.id) }) }}" >
-                <img id="favorite_{{ element.id }}_isnot" src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
+              <a class="mustbeconnected" href="#" >
+                <img src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
               </a>
             {% endif %}
           {% else %}
-            <a class="mustbeconnected" href="#" >
-              <img src="{{ asset('img/icon_star_2.png') }}" title="{{ 'element.favorite.add'|trans({}, 'elements') }}" alt="{{ 'element.favorite.add'|trans({}, 'elements') }}" />
-            </a>
+            <img src="{{ asset('img/icon_star_2_gray.png') }}" alt="favorite" />
           {% endif %}
         </li>
       </ul>
@@ -270,6 +277,7 @@
           </li>
         {% endif %}
         
+        {% if not element.private %} 
         <li>
           <a
             class="add_to_playlist"
@@ -279,6 +287,7 @@
             <img src="{{ asset('/img/playlist_add_gray.png') }}" alt="add to playlist" />
           </a>
         </li>
+        {% endif %}
         
       </ul>
       
@@ -403,37 +412,38 @@
       
       {% endif %}
       
-      
-      <div class="social_buttons">
-        <ul>
-          <li class="facebook">
-            {{ facebookButton( {
-              'locale': 'fr_FR', 
-              'url': 'http:' ~ url('element_show_one', {
-                'element_id' : element.id,
-                'element_slug' : element.slug
-              }, true) })
-            }}
-          </li>
-          <li class="twitter">
-            {{ twitterButton( {
-              'locale': 'fr_FR', 
-              'url': 'http:' ~ url('element_show_one', {
-                'element_id' : element.id
-              }, true) }) 
-            }}
-          </li>
-          <li class="googleplus">
-            {{ googlePlusButton( {
-              'locale': 'fr_FR', 'url': 
-              'http:' ~ url('element_show_one', {
-                'element_id' : element.id,
-                'element_slug' : element.slug
-              }, true) }) 
-            }}
-          </li>
-        </ul>
-      </div>
+      {% if display_social_buttons %}
+        <div class="social_buttons">
+          <ul>
+            <li class="facebook">
+              {{ facebookButton( {
+                'locale': 'fr_FR', 
+                'url': 'http:' ~ url('element_show_one', {
+                  'element_id' : element.id,
+                  'element_slug' : element.slug
+                }, true) })
+              }}
+            </li>
+            <li class="twitter">
+              {{ twitterButton( {
+                'locale': 'fr_FR', 
+                'url': 'http:' ~ url('element_show_one', {
+                  'element_id' : element.id
+                }, true) }) 
+              }}
+            </li>
+            <li class="googleplus">
+              {{ googlePlusButton( {
+                'locale': 'fr_FR', 'url': 
+                'http:' ~ url('element_show_one', {
+                  'element_id' : element.id,
+                  'element_slug' : element.slug
+                }, true) }) 
+              }}
+            </li>
+          </ul>
+        </div>
+      {% endif %}
       
     </td>
   </tr>

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -115,6 +115,8 @@ class ElementSearcher extends Searcher implements SearcherInterface
    */
   protected $need_tags = false;
   
+  protected $display_privates = false;
+  
   /**
    * @see SearcherInterface
    * @param array $params 
@@ -159,7 +161,8 @@ class ElementSearcher extends Searcher implements SearcherInterface
       'ids_display' => $this->getIdsDisplay(),
       'tag_strict'  => $this->getTagStrict(),
       'need_tags'   => $this->getNeedTags(),
-      'string'      => $this->getString()
+      'string'      => $this->getString(),
+      'display_privates' => $this->getDisplayPrivates()
     );
   }
   
@@ -382,4 +385,14 @@ class ElementSearcher extends Searcher implements SearcherInterface
     $this->network = $network;
   }
   
+  public function getDisplayPrivates()
+  {
+    return ($this->display_privates)?true:false;
+  }
+  
+  public function setDisplayPrivates($display)
+  {
+    $this->display_privates = ($display)?true:false;
+  }
+  
 }

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -319,6 +319,16 @@ class ElementSearcherQueryBuilder
       ->addOrderBy('e.id', 'DESC')
     ;
     
+    if ($this->es->getDisplayPrivates() && $this->user_id)
+    {
+      $this->query_ids->andWhere('(e.private = 0 OR (e.private = 1 AND e.owner = :owner_id))');
+      $this->parameters_ids['owner_id'] = $this->user_id;
+    }
+    else
+    {
+      $this->query_ids->andWhere('e.private = 0');
+    }
+    
     if (!$disable_limit)
     {
       $this->query_ids->setMaxResults($this->es->getCount());

src/Muzich/CoreBundle/Twig/Extensions/MyTwigExtension.php

@@ -7,6 +7,7 @@ use Muzich\CoreBundle\Entity\Event;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\DependencyInjection\Container;
 use Muzich\CoreBundle\Entity\User;
+use Muzich\CoreBundle\Entity\Playlist;
 
 class MyTwigExtension extends \Twig_Extension {
 
@@ -43,7 +44,8 @@ class MyTwigExtension extends \Twig_Extension {
       'token'                  => new \Twig_Function_Method($this, 'token'),
       'path_token'             => new \Twig_Function_Method($this, 'path_token'),
       'token'                  => new \Twig_Function_Method($this, 'getToken'),
-      'token_or_unknow'        => new \Twig_Function_Method($this, 'getTokenOrUnknown')
+      'token_or_unknow'        => new \Twig_Function_Method($this, 'getTokenOrUnknown'),
+      'playlist_element_displayable' => new \Twig_Function_Method($this, 'displayElementPlaylist')
     );
   }
   
@@ -269,4 +271,23 @@ class MyTwigExtension extends \Twig_Extension {
     return 'unknown';
   }
   
+  public function displayElementPlaylist(Playlist $playlist, $user_id, $element_data)
+  {
+    if (!$playlist->isPublic() && $playlist->getOwner()->getId() != $user_id)
+      return false;
+    
+    if (!$playlist->isPublic() && $playlist->getOwner()->getId() == $user_id)
+      return true;
+    
+    if ($playlist->isPublic() && !array_key_exists('private', $element_data))
+      return true;
+    
+    if ($playlist->isPublic() && array_key_exists('private', $element_data))
+    {
+      if ($element_data['private'] && $playlist->getOwner()->getId() != $user_id)
+        return false;
+      return true;
+    }
+  }
+  
 }

src/Muzich/CoreBundle/lib/Collection/ElementCollectionManager.php

@@ -8,12 +8,14 @@ class ElementCollectionManager extends CollectionManager
   const ATTRIBUTE_ID   = 'Id';
   const ATTRIBUTE_NAME = 'Name';
   const ATTRIBUTE_TYPE = 'Type';
+  const ATTRIBUTE_PRIVATE = 'Private';
   
   protected $allow_duplicates = true;
   protected $schema = array(
     self::ATTRIBUTE_ID,
     self::ATTRIBUTE_NAME,
-    self::ATTRIBUTE_TYPE
+    self::ATTRIBUTE_TYPE,
+    self::ATTRIBUTE_PRIVATE
   );
   
   protected $object_reference_attribute = self::ATTRIBUTE_ID;

src/Muzich/CoreBundle/lib/Tag.php

@@ -21,18 +21,21 @@ class Tag
     
     foreach ($elements as $element)
     {
-      foreach ($element->getTags() as $tag)
+      if (count($element->getTags()))
       {
-        // Si on a déjà un compteur pour ce tag
-        if (array_key_exists($tag->getId(), $tags_count))
+        foreach ($element->getTags() as $tag)
         {
-          // On incrémente
-          $tags_count[$tag->getId()] = $tags_count[$tag->getId()] + 1;
-        }
-        else
-        {
-          // On commence le compteur
-          $tags_count[$tag->getId()] = 1;
+          // Si on a déjà un compteur pour ce tag
+          if (array_key_exists($tag->getId(), $tags_count))
+          {
+            // On incrémente
+            $tags_count[$tag->getId()] = $tags_count[$tag->getId()] + 1;
+          }
+          else
+          {
+            // On commence le compteur
+            $tags_count[$tag->getId()] = 1;
+          }
         }
       }
     }
@@ -62,9 +65,12 @@ class Tag
     $tags_ordered = array();
     foreach ($elements as $element)
     {
-      foreach ($element->getTags() as $tag)
+      if (count($element->getTags()))
       {
-        $tags[$tag->getId()] = $tag;
+        foreach ($element->getTags() as $tag)
+        {
+          $tags[$tag->getId()] = $tag;
+        }
       }
     }
     

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -6,6 +6,7 @@ use Muzich\CoreBundle\lib\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Muzich\CoreBundle\Security\Context as SecurityContext;
 use Muzich\CoreBundle\Propagator\EventElement;
+use Muzich\CoreBundle\Form\Playlist\PrivateLinksForm;
 
 class EditController extends Controller
 {
@@ -33,6 +34,10 @@ class EditController extends Controller
       return $this->jsonNotFoundResponse();
     
     $element = $playlist_manager->getElementWithIndex($playlist, $index);
+    
+    if (!$element)
+      return $this->jsonNotFoundResponse();
+    
     $playlist_manager->removePlaylistElementWithIndex($playlist, $index);
     
     $event = new EventElement($this->container);
@@ -178,6 +183,32 @@ class EditController extends Controller
     return $this->redirect($this->generateUrl('playlists_user', array('user_slug' => $this->getUser()->getSlug())));
   }
   
+  public function createAction(Request $request)
+  {
+    $playlist_form = $this->getPlaylistForm($this->getPlaylistManager()
+      ->getNewPlaylist($this->getUser()));
+    
+    if ($request->getMethod() == 'POST')
+    {
+      $playlist_form->bind($request);
+      if ($playlist_form->isValid())
+      {
+        $this->persist($playlist_form->getData());
+        $this->flush();
+        
+        $this->setFlash('success', $this->trans('playlist.create.success', array(), 'flash'));
+        return $this->redirect($this->generateUrl('playlist', array(
+          'user_slug'   => $this->getUser()->getSlug(),
+          'playlist_id' => $playlist_form->getData()->getId()
+        )));
+      }
+    }
+    
+    return $this->render('MuzichPlaylistBundle:Edit:create.html.twig', array(
+      'form'          => $playlist_form->createView()
+    ));
+  }
+  
   public function editAction($playlist_id)
   {
     if (!($playlist = $this->getPlaylistManager()->findOwnedPlaylistWithId($playlist_id, $this->getUser())))
@@ -223,4 +254,39 @@ class EditController extends Controller
     ));
   }
   
+  public function addPrivateLinksAction(Request $request, $playlist_id)
+  {
+    if (!($playlist = $this->getPlaylistManager()->findOneAccessiblePlaylistWithId($playlist_id, $this->getUser())))
+      throw $this->createNotFoundException();
+    
+    $form = $this->createForm(new PrivateLinksForm());
+    $form->bind($request);
+    $data = $form->getData();
+    
+    if (!$data['links'])
+    {
+      $this->setFlash('warning', $this->trans('playlist.no_links_added', array(), 'elements'));
+      return $this->redirect($this->generateUrl('playlist', array(
+        'user_slug'   => $this->getUser()->getSlug(),
+        'playlist_id' => $playlist_id
+      )));
+    }
+    
+    $count_added = $this->getPlaylistManager()->addPrivateLinks($playlist, $this->getUser(), explode("\n", $data['links']), $this->container);
+    
+    if ($count_added == count(explode("\n", $data['links'])))
+    {
+      $this->setFlash('success', $this->trans('playlist.links_added', array(), 'elements'));
+    }
+    else
+    {
+      $this->setFlash('warning', $this->trans('playlist.links_added_witherr', array(), 'elements'));
+    }
+    
+    return $this->redirect($this->generateUrl('playlist', array(
+      'user_slug'   => $this->getUser()->getSlug(),
+      'playlist_id' => $playlist_id
+    )));
+  }
+  
 }

src/Muzich/PlaylistBundle/Controller/ShowController.php

@@ -5,6 +5,7 @@ namespace Muzich\PlaylistBundle\Controller;
 use Muzich\CoreBundle\lib\Controller;
 use Muzich\CoreBundle\lib\AutoplayManager;
 use Muzich\CoreBundle\Security\Context as SecurityContext;
+use Muzich\CoreBundle\Form\Playlist\PrivateLinksForm;
 
 class ShowController extends Controller
 {
@@ -36,7 +37,8 @@ class ShowController extends Controller
     
     return $this->render('MuzichPlaylistBundle:Show:show.html.twig', array(
       'playlist'    => $playlist,
-      'viewed_user' => $viewed_user
+      'viewed_user' => $viewed_user,
+      'links_form'  => $this->createForm(new PrivateLinksForm())->createView()
     ));
   }
   
@@ -49,7 +51,7 @@ class ShowController extends Controller
     if (!($playlist = $playlist_manager->findOneAccessiblePlaylistWithId($playlist_id, $this->getUserOrNullIfVisitor())))
       return $this->jsonNotFoundResponse();
     
-    $autoplaym = new AutoplayManager($playlist_manager->getPlaylistElements($playlist, $offset), $this->container);
+    $autoplaym = new AutoplayManager($playlist_manager->getPlaylistElements($playlist, $offset, $this->getUserId(true)), $this->container);
     
     if ($shuffle)
       $autoplaym->shuffle();

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

@@ -5,27 +5,37 @@ playlists_user:
 playlist:
   pattern: /user/{user_slug}/playlist/{playlist_id}
   defaults: { _controller: MuzichPlaylistBundle:Show:show }
+  requirements:
+    playlist_id:  \d+
+
+playlist_new:
+  pattern: /private/user/{user_slug}/playlist/new
+  defaults: { _controller: MuzichPlaylistBundle:Edit:create }
 
 playlist_edit:
-  pattern: /user/{user_slug}/playlist/{playlist_id}/edit
+  pattern: /private/user/{user_slug}/playlist/{playlist_id}/edit
   defaults: { _controller: MuzichPlaylistBundle:Edit:edit }
   
 playlist_update:
-  pattern: /user/{user_slug}/playlist/{playlist_id}/update
+  pattern: /private/user/{user_slug}/playlist/{playlist_id}/update
   defaults: { _controller: MuzichPlaylistBundle:Edit:update }
 
 playlist_delete:
-  pattern: /playlist/delete/{playlist_id}/{token}
+  pattern: /private/playlist/delete/{playlist_id}/{token}
   defaults: { _controller: MuzichPlaylistBundle:Edit:delete }
 
 playlist_unpick:
-  pattern: /playlist/unpick/{playlist_id}/{token}/{redirect_owner}
+  pattern: /private/playlist/unpick/{playlist_id}/{token}/{redirect_owner}
   defaults: { _controller: MuzichPlaylistBundle:Edit:unpick, redirect_owner: false }
 
 playlist_pick:
-  pattern: /playlist/pick/{playlist_id}/{token}/{redirect_owner}
+  pattern: /private/playlist/pick/{playlist_id}/{token}/{redirect_owner}
   defaults: { _controller: MuzichPlaylistBundle:Edit:pick, redirect_owner: false }
 
+playlist_add_private_links:
+  pattern: /private/playlist/add-private-links/{playlist_id}
+  defaults: { _controller: MuzichPlaylistBundle:Edit:addPrivateLinks }
+  
 playlist_datas_for_autoplay:
   pattern: /ajax/autoplay/playlist/datas/{playlist_id}/{offset}
   defaults: { _controller: MuzichPlaylistBundle:Show:getAutoplayData, offset: null, shuffle: false }

src/Muzich/PlaylistBundle/Resources/views/Edit/create.html.twig

@@ -0,0 +1,32 @@
+{% extends "MuzichFavoriteBundle::layout.html.twig" %}
+
+{% block title %}{{ 'playlist.create_title'|trans({}, 'elements') }}{% endblock %}
+{% block mainbox_classes %}{% endblock %}
+
+{% block content %}
+  
+  <div class="top_tools">
+    <div class="show_options">
+      
+      <a class="button darkbutton" href="{{ path('playlists_user', {
+        'user_slug' : app.user.slug,
+      }) }}" >
+        {{ 'playlist.goback'|trans({}, 'elements') }}
+      </a>
+      
+    </div>
+    
+    <h1>{{ 'playlist.create_title'|trans({}, 'elements') }}</h1>
+    
+    <form class="playlist_create playlist_edit" action="{{ path('playlist_new', {
+      'user_slug' : app.user.slug
+    }) }}" method="post">
+      {% include 'MuzichPlaylistBundle:Show:form.html.twig' with {
+        'display_public_widget' : true,
+        'submit_value'          : 'playlist.create_submit'|trans({}, 'elements')
+      } %}
+    </form>
+  
+  </div>
+  
+{% endblock %}

src/Muzich/PlaylistBundle/Resources/views/Show/show.html.twig

@@ -60,71 +60,101 @@
       {% endif %}
     {% endif %}
     
-    
+    {% if app.user %}
+      {% if playlist.owned(app.user) %}
+        <a class="button darkbutton toplist open_playlist_private_links" href="#" >
+          {{ 'playlist.add_private_links'|trans({}, 'elements') }}
+        </a>
+      {% endif %}
+    {% endif %}
+        
     {% include "MuzichCoreBundle:Tag:tag_cloud.html.twig" with {
       'tags' : playlist.tags
     } %}
+        
+    {% if app.user %}
+      {% if playlist.owned(app.user) %}
+        <div class="private_links" style="display: none;">
+          <form action="{{ path_token('playlist_add_private_links', { 'playlist_id' : playlist.id }) }}" method="post">
+
+            <p class="help">{{ 'playlist.add_private_links_help'|trans({}, 'elements') }}</p>
+
+            <div class="inputs">
+              <input class="button" type="submit" value="{{ 'playlist.add_private_links_submit'|trans({}, 'elements') }}" />
+              <br />
+              <input class="button cancel" type="button" value="{{ 'playlist.add_private_links_cancel'|trans({}, 'elements') }}" />
+            </div>
+
+            {{ form_widget(links_form.links) }}
+            {{ form_rest(links_form) }}
+
+          </form>
+        </div>
+      {% endif %}
+    {% endif %}
     
     {% if playlist.elements|length %}
       <form action="{{ path_token('playlist_update_order', { 'playlist_id' : playlist.id }) }}" method="post">
         <ul class="playlist_elements {% if app.user%}{% if playlist.owned(app.user) %}owned{% endif %}{% endif %}">
           {% for element in playlist.elements %}
-            <li class="playlist_element">
-              
-              <input type="hidden" name="elements[]"  value="{{ element.id }}" />
-              
-              
-              <div class="actions">
-                
-                {% if app.user%}
-                  {% if playlist.owned(app.user) %}
-                    <a class="drag" href="#">
-                      <img src="{{ asset('/img/drag3.png') }}" alt="drag" />
-                    </a>
+            {% if playlist_element_displayable(playlist, app.user|userId, element) %}
+              <li class="playlist_element">
+
+                <input type="hidden" name="elements[]"  value="{{ element.id }}" />
+
+
+                <div class="actions">
+
+                  {% if app.user%}
+                    {% if playlist.owned(app.user) %}
+                      <a class="drag" href="#">
+                        <img src="{{ asset('/img/drag3.png') }}" alt="drag" />
+                      </a>
+                    {% endif %}
                   {% endif %}
-                {% endif %}
-                
-                {% if element.type|can_autoplay_type %}
-                  <a class="autoplay_playlist" 
-                    href="{{ path('playlist_datas_for_autoplay', { 'playlist_id' : playlist.id, 'offset' : loop.index0 }) }}"
-                    title="{{ 'playlist.start_here'|trans({}, 'elements') }}"
-                  >
-                    <img src="{{ asset('/img/1361037350_control_play.png') }}" alt="playlist" />
-                  </a>
-                {% else %}
-                  <img class="autoplay_off" src="{{ asset('/img/1361037350_control_play_off.png') }}" alt="playlist" />
-                {% endif %}
-                
-                {% if app.user%}
-                  {% if playlist.owned(app.user) %}
-                    <a 
-                      class="remove_element" 
-                      href="{{ path_token('playlist_remove_element', { 'playlist_id' : playlist.id, 'index' : loop.index0 }) }}"
-                      title="{{ 'playlist.remove_element'|trans({}, 'elements') }}"
+
+                  {% if element.type|can_autoplay_type %}
+                    <a class="autoplay_playlist" 
+                      href="{{ path('playlist_datas_for_autoplay', { 'playlist_id' : playlist.id, 'offset' : loop.index0 }) }}"
+                      title="{{ 'playlist.start_here'|trans({}, 'elements') }}"
                     >
-                      <img src="{{ asset('/img/icon_close_2.png') }}" alt="delete" />
+                      <img src="{{ asset('/img/1361037350_control_play.png') }}" alt="playlist" />
                     </a>
+                  {% else %}
+                    <img class="autoplay_off" src="{{ asset('/img/1361037350_control_play_off.png') }}" alt="playlist" />
                   {% endif %}
-                {% endif %}
-              </div>
-              
-              <div class="actions_right">
-                <a 
-                  class="open_element" 
-                  href="{{ path('element_get_one', { 'element_id' : element.id }) }}" data-id="{{ element.id }}"
-                  title="{{ 'playlist.open'|trans({}, 'elements') }}"
-                  >
-                  <img src="{{ asset('/img/icon_more_2.png') }}" alt="open" />
-                </a>
-              </div>
-              
-              <div class="title">
-                {{ element.name }}
-              </div>
-              
-              <div class="content_opened"></div>
-              
-            </li>
+
+                  {% if app.user%}
+                    {% if playlist.owned(app.user) %}
+                      <a 
+                        class="remove_element" 
+                        href="{{ path_token('playlist_remove_element', { 'playlist_id' : playlist.id, 'index' : loop.index0 }) }}"
+                        title="{{ 'playlist.remove_element'|trans({}, 'elements') }}"
+                      >
+                        <img src="{{ asset('/img/icon_close_2.png') }}" alt="delete" />
+                      </a>
+                    {% endif %}
+                  {% endif %}
+                </div>
+
+                <div class="actions_right">
+                  <a 
+                    class="open_element" 
+                    href="{{ path('element_get_one', { 'element_id' : element.id }) }}" data-id="{{ element.id }}"
+                    title="{{ 'playlist.open'|trans({}, 'elements') }}"
+                    >
+                    <img src="{{ asset('/img/icon_more_2.png') }}" alt="open" />
+                  </a>
+                </div>
+
+                <div class="title">
+                  {{ element.name }}
+                </div>
+
+                <div class="content_opened"></div>
+
+              </li>
+            {% endif %}
           {% endfor %}
         </ul>
       </form>

src/Muzich/PlaylistBundle/Resources/views/Show/user.html.twig

@@ -9,6 +9,14 @@
     
     <div class="show_options">
       
+      {% if app.user %}
+        {% if viewed_user.id == app.user.id %}
+          <a class="button darkbutton" href="{{ path('playlist_new', {'user_slug' : app.user.slug}) }}" >
+            {{ 'user.new_playlist'|trans({}, 'users') }}
+          </a>
+        {% endif %}
+      {% endif %}
+      
       <a class="button darkbutton" href="{{ path('show_user', {'slug' : viewed_user.slug}) }}" >
         {{ 'user.view_profile'|trans({}, 'users') }}
       </a>