Merge branch 'feature/factory' into unstable

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -7,6 +7,9 @@ use Muzich\CoreBundle\lib\Controller;
 use Muzich\CoreBundle\Entity\FollowUser;
 use Muzich\CoreBundle\Entity\FollowGroup;
 //use Doctrine\ORM\Query;
+use Muzich\CoreBundle\Form\Element\ElementAddForm;
+use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Entity\Element;
 
 class CoreController extends Controller
 {
@@ -73,4 +76,49 @@ class CoreController extends Controller
     }
   }
   
+  public function elementAddAction()
+  {
+    $user = $this->getUser();
+    $em = $this->getDoctrine()->getEntityManager();
+    
+    $form = $this->createForm(
+      new ElementAddForm(),
+      array(),
+      array('tags' => $this->getTagsArray())
+    );
+    
+    if ($this->getRequest()->getMethod() == 'POST')
+    {
+      $form->bindRequest($this->getRequest());
+      if ($form->isValid())
+      {
+        $data = $form->getData();
+        $element = new Element();
+        
+        $factory = new ElementManager($element, $em, $this->container);
+        $factory->proceedFill($data, $user);
+        
+        $em->persist($element);
+        $em->flush();
+      }
+      
+    }
+    
+    if ($this->getRequest()->isXmlHttpRequest())
+    {
+      
+    }
+    else
+    {
+      return $this->redirect($this->generateUrl('home'));
+    }
+    
+  }
+  
+//  protected function proceedElement(Element $element)
+//  {
+//    $factory = new ElementFactory();
+//    $factory->proceed($element, $form->getData());
+//  }
+  
 }

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php

@@ -76,10 +76,10 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $joelle  = $this->entity_manager->merge($this->getReference('user_joelle'));
 
     // 'youtube', 'soundclound', 'son2teuf', 'jamendo'
-    $youtube     = $this->entity_manager->merge($this->getReference('element_type_youtube'));
-    $soundclound = $this->entity_manager->merge($this->getReference('element_type_soundclound'));
-    $son2teuf    = $this->entity_manager->merge($this->getReference('element_type_son2teuf'));
-    $jamendo     = $this->entity_manager->merge($this->getReference('element_type_jamendo'));
+    $youtube     = $this->entity_manager->merge($this->getReference('element_type_youtube.com'));
+    $soundclound = $this->entity_manager->merge($this->getReference('element_type_soundcloud.com'));
+    $son2teuf    = $this->entity_manager->merge($this->getReference('element_type_son2teuf.org'));
+    $jamendo     = $this->entity_manager->merge($this->getReference('element_type_jamendo.com'));
     
     $this->createElement('youtube_heretik_1', 'Heretik System Popof - Resistance', 
       'http://www.youtube.com/watch?v=tq4DjQK7nsM',

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementTypeData.php

@@ -39,10 +39,10 @@ class LoadElementTypeData  extends AbstractFixture implements OrderedFixtureInte
   public function load($entity_manager)
   {
     $this->entity_manager = $entity_manager;
-
+    
     foreach (array(
-      'youtube' => 'Youtube', 'soundclound' => 'SoundCloud', 
-      'son2teuf' => 'Son2Teuf', 'jamendo' => 'jamendo'
+      'youtube.com' => 'Youtube', 'soundcloud.com' => 'SoundCloud', 
+      'son2teuf.org' => 'Son2Teuf', 'jamendo.com' => 'jamendo'
       ) as $id => $name)
     {
       $this->createElementType($id, $name);

src/Muzich/CoreBundle/ElementFactory/ElementManager.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory;
+
+use Muzich\CoreBundle\Entity\Element;
+use Muzich\CoreBundle\Entity\User;
+use Doctrine\ORM\EntityManager;
+use Symfony\Component\DependencyInjection\Container;
+
+use Muzich\CoreBundle\ElementFactory\Site\YoutubeFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class ElementManager
+{
+  
+  protected $types = array(
+    'youtube.com', 
+    'soundcloud.com', 
+    'son2teuf.org', 
+    'jamendo.com'
+  );
+  
+  protected $em;
+  protected $element;
+  protected $container;
+  
+  /**
+   * Procédure chargé de retourner des information destiné au 
+   * formulaire d'ajout d'un element.
+   * 
+   * @param string $url
+   * @return array
+   */
+  public static function collect($url)
+  {
+    
+    return array(
+      'name' => null,
+      'tags' => array()
+    );
+  }
+  
+  public function __construct(Element $element, EntityManager $em, Container $container)
+  {
+    $this->element = $element;
+    $this->em = $em;
+    $this->container = $container;
+    
+    $evm = new \Doctrine\Common\EventManager();
+    $timestampableListener = new \Gedmo\Timestampable\TimestampableListener();
+    $evm->addEventSubscriber($timestampableListener);
+    
+    $this->em->getEventManager()->addEventSubscriber($timestampableListener);
+  }
+  
+  /**
+   * Procédure chargé de construire le contenu de l'élément.
+   *  nom, Code d'embed, [...]
+   * 
+   * @param Element $element
+   * @param array $params
+   * @param User $owner
+   * @return Element 
+   */
+  public function proceedFill($params, User $owner)
+  {
+    $this->element->setName($params['name']);
+    $this->element->setUrl($params['url']);
+    $this->element->setOwner($owner);
+    $this->element->setTagsWithIds($this->em, $params['tags']);
+    $this->determineType();
+    $this->proceedExtraFields();
+  }
+  
+  /**
+   * Determine le type d'objet auquel on a affaire.
+   */
+  protected function determineType()
+  {
+    preg_match("/^(http:\/\/)?([^\/]+)/i", $this->element->getUrl(), $chaines);
+    $host = $chaines[2];
+    // Repérer les derniers segments
+    preg_match("/[^\.\/]+\.[^\.\/]+$/",$host,$chaines);
+    
+    $type = null;
+    
+    
+    if (in_array($chaines[0], $this->types))
+    {
+      $type = $this->em->getRepository('MuzichCoreBundle:ElementType')->find($chaines[0]);
+    }
+    
+    $this->element->setType($type);
+  }
+  
+  /**
+   * Construction des autres champs tel que embed.
+   * 
+   * 
+   */
+  protected function proceedExtraFields()
+  {
+   
+    // Instanciation d'un objet factory correspondant au type, par exemple
+    // YoutubeFactory, qui répondant a une implementation retournera ces infos.
+  
+    if ($this->element->getType())
+    {
+      $site_factory = $this->getFactory();
+      $this->element->setEmbed($site_factory->getEmbedCode());
+    }
+    
+  }
+  
+  protected function getFactory()
+  { 
+    switch ($this->element->getType()->getId())
+    {
+      case 'youtube.com':
+        return new YoutubeFactory($this->element, $this->container);
+      break;
+      case 'soundcloud.com':
+        return new SoundCloudFactory($this->element, $this->container);
+      break;
+      case 'son2teuf.org':
+        return new Son2TeufFactory($this->element, $this->container);
+      break;
+      case 'jamendo.com':
+        return new JamendoFactory($this->element, $this->container);
+      break;
+    
+      default:
+        throw new Exception("La Factory n'est pas connu pour ce type.");
+      break;
+    }
+  }
+    
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/JamendoFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class JamendoFactory extends BaseFactory
+{
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/Son2TeufFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class Son2TeufFactory extends BaseFactory
+{
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/SoundCloudFactory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class SoundCloudFactory extends BaseFactory
+{
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/YoutubeFactory.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site;
+
+use Muzich\CoreBundle\ElementFactory\Site\base\VideoSiteFactory;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class YoutubeFactory extends VideoSiteFactory
+{
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/base/BaseFactory.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site\base;
+
+use Muzich\CoreBundle\Entity\Element;
+use Symfony\Component\DependencyInjection\Container;
+use \Exception;
+
+/**
+ *
+ * @author bux
+ */
+class BaseFactory implements FactoryInterface
+{
+  
+  protected $element;
+  
+  public function __construct(Element $element, Container $container)
+  {
+    $this->element = $element;
+  }
+  
+  public function getEmbedCode()
+  {
+    return null;
+  }
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/base/FactoryInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site\base;
+
+use Muzich\CoreBundle\Entity\Element;
+use Symfony\Component\DependencyInjection\Container;
+
+interface FactoryInterface
+{
+  
+  public function __construct(Element $element, Container $container);
+  
+  public function getEmbedCode();
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/Site/base/VideoSiteFactory.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\Site\base;
+
+use Muzich\CoreBundle\Entity\Element;
+use Symfony\Component\DependencyInjection\Container;
+use Muzich\CoreBundle\ElementFactory\Site\base\BaseFactory;
+use Muzich\CoreBundle\ElementFactory\lib\VideoEmbed;
+
+/**
+ * 
+ *
+ * @author bux
+ */
+class VideoSiteFactory extends BaseFactory
+{
+  
+  protected $video_engine = null;
+  
+  public function __construct(Element $element, Container $container)
+  {
+    parent::__construct($element, $container);
+    
+    // Configuration de VideoEmbed
+    define('SITEBASE', $container->getParameter('sitebase'));
+    define('VIDEO_EMBED_CONFIG_FILE', SITEBASE.$container->getParameter('video_embed_config_file'));
+    //to activate debug mode and false for production usage. it will write 
+    //to a log file when something goes wrong but should not produce 
+    //exceptions in production enviroment
+    define('DEBUG', $container->getParameter('video_embed_debug')); 
+    
+    try {
+      $this->video_engine =  new VideoEmbed($this->element->getUrl());
+    } catch (Exception $exc) {
+      
+    }
+  }
+  
+  public function getEmbedCode()
+  {
+    if ($this->video_engine)
+    {
+      return $this->video_engine->embed;
+    }
+    return null;
+  }
+  
+}
+
+?>

src/Muzich/CoreBundle/ElementFactory/lib/VideoEmbed.php

@@ -0,0 +1,362 @@
+<?php
+
+namespace Muzich\CoreBundle\ElementFactory\lib;
+
+//require_once (SITEBASE . '/src/Muzich/CoreBundle/ElementFactory/lib/spyc.php');
+use Muzich\CoreBundle\ElementFactory\lib\Spyc;
+use \Exception;
+
+/**
+* Copyright (c) 2008, AF83
+*   All rights reserved.
+*
+*   Redistribution and use in source and binary forms, with or without modification,
+*   are permitted provided that the following conditions are met:
+*
+*   1° Redistributions of source code must retain the above copyright notice,
+*   this list of conditions and the following disclaimer.
+*
+*   2° Redistributions in binary form must reproduce the above copyright notice,
+*   this list of conditions and the following disclaimer in the documentation
+*   and/or other materials provided with the distribution.
+*
+*   3° Neither the name of AF83 nor the names of its contributors may be used
+*   to endorse or promote products derived from this software without specific
+*   prior written permission.
+*
+*   THIS SOFTWARE IS PROVIDED BY THE COMPANY AF83 AND CONTRIBUTORS "AS IS"
+*   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+*   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+*   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+*   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+*   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+*   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+*   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+*   OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+*   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+*   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* @copyright 2008 AF83 http://dev.af83.com
+* @author Ori Pekelman
+* @license BSD License (3 Clause) http://www.opensource.org/licenses/bsd-license.php
+* @package Video
+* @version $Id$
+* @access public
+* @todo thumbnails should be cached locally
+*
+* VideoEmbed class  can be used to safely and cleanly embed videos from different sources
+*
+* The different sources are configured in the video_embed.yaml file
+*
+* NB: The embed code may be also a url
+*
+* Usage: set the configuration variables (refer to readme for details):
+*  VIDEO_EMBED_CONFIG_FILE -- path of video embed config file
+*
+*                     $videoEmbed = new VideoEmbed($embed); optional width and height may be passed to the constructor
+*                      //print($videoEmbed->embed);
+*                      $videoEmbed->width = 240; // resize
+*                      $videoEmbed->height = 120;
+*                      //print($videoEmbed->embed);
+*                      //print($videoEmbed->thumb);
+
+*
+* This class requires the SpyC library to read the cobnfiguration file. please adjust the path of the include on the first line of this file
+* The video services are configured in the configuration file (video_embed.conf.inc), example for youtube google and daily motion:
+*/
+
+class VideoEmbed {
+    private $_video_embed_conf = array();
+    private $_embedSource;
+    private $_embed;
+    private $_id;
+    private $_type;
+    private $_thumb;
+    private $_url;
+    private $_width;
+    private $_height;
+    private $_readOnly = array ('thumb', 'url', 'id', 'type');
+    private $_readWrite = array ('width', 'height', 'embed');
+
+    /**
+    * VideoEmbed::__construct() Only embed is mandatory
+    *
+    * @param mixed $embed
+    * @param mixed $width
+    * @param mixed $height
+    */
+    function __construct($embed, $width = null, $height = null)
+    {
+        // load configuration
+//        if (!class_exists('Spyc')) {
+//            throw new exception ('Could not find SpyC library ');
+//        }
+            
+        $this->_video_embed_conf = Spyc::YAMLLoad(VIDEO_EMBED_CONFIG_FILE);
+        
+        if (!$this->_video_embed_conf) {
+            debug_log ("Could not read configruation file or config file empty  " . SITE_BASE . VIDEO_EMBED_CONFIG_FILE);
+            if (DEBUG) {
+                throw new exception ("Could not read configruation file or config file empty " . SITE_BASE . VIDEO_EMBED_CONFIG_FILE);
+            }
+        }
+
+        if (!$embed) {
+            debug_log ('This must be instantiated with a non empty embed code');
+            if (DEBUG) {
+                throw new exception ('This must be instantiated with a non empty embed code');
+            }
+        }
+        // load arguments
+        $this->_embedSource = $embed;
+        $this->_width = $width?$width: $this->_video_embed_conf['defaultWidth'];
+        $this->_height = $height?$height:$this->_video_embed_conf['defaultHeight'];
+
+        $this->setup();
+    }
+    /**
+    * VideoEmbed::__set() Make some variables read only
+    *
+    * @param mixed $n
+    * @param mixed $val
+    * @return
+    */
+    function __set($n, $val)
+    {
+        if (in_array($n, $this->_readOnly)) {
+            debug_log ("Trying to set a read only property $n $val");
+            if (DEBUG) {
+                throw new exception ("Trying to set  a read only property" . "$n $val");
+            }
+            return false;
+        } elseif (in_array($n, $this->_readWrite)) {
+            if ($n == "embed") {
+                $property = '_embedSource';
+            } else $property = "_" . $n;
+
+            $this->$property = $val;
+            $this->setup(); // recalculate stuff if we changed a RW  property
+            return true;
+        }
+        return false;
+    }
+
+    /**
+    * VideoEmbed::__get()
+    *
+    * @param mixed $n
+    * @return
+    */
+    function __get($n)
+    {
+        if (in_array($n, array_merge($this->_readOnly, $this->_readWrite))) {
+            $propertyName = "_$n";
+            return $this->$propertyName;
+        } else {
+            debug_log('Trying to get a non readble property ' . $n);
+            if (DEBUG) {
+                throw new exception ('Trying to get a non readble property ' . $n);
+            }
+            return false;
+        }
+    }
+
+    /**
+    * VideoEmbed::setup()
+    *
+    * @return
+    */
+    private function setup ()
+    {      
+        if (!$this->video_embed_type()) {
+            //debug_log ('Could not get embed type :' . $this->_embedSource);
+            if (DEBUG) {
+                throw new exception ('Could not get embed type :' . $this->_embedSource);
+            }
+        }
+        if (!$this->video_embed_id()) {
+            //debug_log ('Could not get embed id :' . $this->_embedSource);
+            if (DEBUG) {
+                throw new exception ('Could not get embed id :' . $this->_embedSource);
+            }
+        }
+        if (!$this->video_embed_url()) {
+            //debug_log ('Problem generating embed url :' . $this->_embedSource);
+            if (DEBUG) {
+                throw new exception ('Problem generating embed url :' . $this->_embedSource);
+            }
+        }
+        if (!$this->video_embed_thumb()) {
+            //debug_log ('Problem generating thumb code :' . $this->_embedSource);
+            if (DEBUG) {
+                throw new exception ('Problem generatingembed code :' . $this->_embed);
+            }
+        }
+        if (!$this->video_embed_embed()) {
+            //debug_log ('Problem generating embed code :' . $this->_embedSource);
+            if (DEBUG) {
+                throw new exception ('Problem generatingembed code :' . $this->_embedSource);
+            }
+        }
+    }
+
+    /**
+    * VideoEmbed::video_emebd_type()
+    *
+    * @param mixed $embed
+    * @return
+    */
+    private function video_embed_type()
+    {
+        $type = null;
+        $this->_type = "";
+        foreach($this->_video_embed_conf['services'] as $serviceName => $config) {
+            if (strpos(strtolower($this->_embedSource), strtolower($config['urlPattern']))) {
+                $type = $serviceName;
+            }
+        }
+        if ($type) {
+            $this->_type = $type;
+            return $this->_type;
+        }
+        return false;
+    }
+
+    /**
+    * VideoEmbed::video_embed_id()
+    *
+    * @return
+    */
+    private function video_embed_id()
+    {
+        $this->_id = "";
+
+        if (($this->_type)) {
+            $regexp = $this->_video_embed_conf['services'][$this->_type]['extractPattern'];
+            preg_match($regexp, $this->_embedSource , $match);
+
+            if ($match[count($match)-1]) $this->_id = $match[count($match)-1];
+            return $this->_id;
+        }
+        return false;
+    }
+
+    /**
+    * VideoEmbed::video_embed_url()
+    *
+    * @return
+    */
+    private function video_embed_url()
+    {
+        $this->_url = "";
+        if ($this->_type) {
+            if ($this->_id) $url = sprintf($this->_video_embed_conf['services'][$this->_type]['embedUrlTemplate'], $this->_id);
+            if ($url) $this->_url = $url;
+            return $this->_url;
+        }
+        return false;
+    }
+
+    /**
+    * VideoEmbed::video_embed_thumb()
+    *
+    * @return
+    */
+    private function video_embed_thumb()
+    {
+        $conf = $this->_video_embed_conf['services'][$this->_type]; // just here for readability
+        $this->_thumb = "";
+        if ($this->_type && $this->_id) {
+            if (isset($conf['thumbnailUrlExtractPattern'])) { // if we need to parse the response:
+                $thumburl = $this->extractThumbUrl($conf['thumbnailUrlTemplate'], $conf['thumbnailUrlExtractPattern']);
+            } else $thumburl = sprintf($conf['thumbnailUrlTemplate'], $this->_id);
+
+            if ($thumburl) $this->_thumb = $thumburl;
+            return $this->_thumb;
+        }
+        return false;
+    }
+
+    /**
+    * VideoEmbed::video_embed_embed()
+    *
+    * @param mixed $width
+    * @param mixed $height
+    * @return
+    */
+    private function video_embed_embed()
+    {
+        if ($this->_type) {
+            $template = isset($this->_video_embed_conf['services'][$this->_type]['embedTemplate']) ? $this->_video_embed_conf['services'][$this->_type]['embedTemplate']:$this->_video_embed_conf['embedTemplate'];
+            if ($template && $this->_url) {
+                $width = $this->_width?$this->_width:$this->_video_embed_conf['services'][$video_type]['defaultWidth'];
+                $height = $this->_height?$this->_height:$this->_video_embed_conf['services'][$video_type]['defaultHeight'];
+                $embed = sprintf($template, $this->_url, $width, $height);
+                if ($embed) $this->_embed = $embed;
+                return $this->_embed;
+            }
+        }
+
+        return false;
+    }
+    /**
+    * extractThumbUrl()
+    *
+    * @param mixed $url
+    * @param mixed $videoid
+    * @param mixed $extractPattern
+    * @return
+    */
+    private function extractThumbUrl($url, $extractPattern)
+    {
+        $vrss = file_get_contents(sprintf($url, $this->_id));
+        if (!empty($vrss)) {
+            preg_match($extractPattern, $vrss, $thumbnail_array);
+            $thumbnail = $thumbnail_array[1];
+            // Remove amp;
+            $thumbnail = str_replace('amp;', '', $thumbnail);
+        }
+
+        return $thumbnail;
+    }
+}
+
+/**
+* test_VideoEmbed() test all is well
+*
+* @return
+*/
+function test_VideoEmbed()
+{
+    $embeds[] = '<div><object width="420" height="365"><param name="movie" value="http://www.dailymotion.com/swf/x3wq9a&v3=1&related=0"></param><param name="allowFullScreen" value="true"></param><param name="allowScriptAccess" value="always"></param><embed src="http://www.dailymotion.com/swf/x3wq9a&v3=1&related=0" type="application/x-shockwave-flash" width="420" height="365" allowFullScreen="true" allowScriptAccess="always"></embed></object><br /><b><a href="http://www.dailymotion.com/video/x3wq9a_defi-decorer-les-camions-de-pq_fun">Defi: décorer les camions de PQ</a></b><br /><i>Uploaded by <a href="http://www.dailymotion.com/gonzaguetv">gonzaguetv</a></i></div>';
+    $embeds[] = '<object width="425" height="355"><param name="movie" value="http://www.youtube.com/v/1mXh_tyLlAY&rel=1"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/1mXh_tyLlAY&rel=1" type="application/x-shockwave-flash" wmode="transparent" width="425" height="355"></embed></object>';
+    $embeds[] = '<embed style="width:400px; height:326px;" id="VideoPlayback" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId=-1182786924290841590&hl=fr" flashvars=""> </embed>';
+    foreach($embeds as $embed) {
+        $videoEmbed = new VideoEmbed($embed, 420, 365);
+        
+        // Mise en commentaire pour opasser le pre-commit:
+        
+//        echo "<h2> Type:</h2>\n";
+//        print ($videoEmbed->type);
+//        echo "<h2> ID:</h2>\n";
+//        print($videoEmbed->id);
+//        echo "<h2> Video Url:</h2>\n";
+//        print($videoEmbed->url);
+//        echo "<h2> Embed:</h2>\n";
+//        print($videoEmbed->embed);
+//        echo "<h2> Embed resized:</h2>\n";
+//        $videoEmbed->width = 240;
+//        $videoEmbed->height = 120;
+//        print($videoEmbed->embed);
+//        echo "<h2> thumb url:</h2>\n";
+//        print($videoEmbed->thumb);
+//        echo "<h2> thumb image:</h2>\n";
+//        print('<img src="' . $videoEmbed->thumb . '" />');
+        
+        
+        // this should fail
+        // $videoEmbed->thumb = "qsdqsdsq";
+        // this should fail
+        // print('<img src="' . $videoEmbed->image . '" />');
+    }
+}

src/Muzich/CoreBundle/Entity/Element.php

@@ -5,7 +5,7 @@ namespace Muzich\CoreBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 use \Doctrine\Common\Collections\ArrayCollection;
 use Gedmo\Mapping\Annotation as Gedmo;
-
+use Doctrine\ORM\EntityManager;
 
 /**
  * L'Element est l'Element central de l'application. C'est cet
@@ -84,6 +84,14 @@ class Element
   protected $name;
   
   /**
+   * Code d'embed
+   * 
+   * @ORM\Column(type="text", nullable=true)
+   * @var type string
+   */
+  protected $embed;
+  
+  /**
    * @var datetime $created
    *
    * @Gedmo\Timestampable(on="create")
@@ -155,7 +163,7 @@ class Element
    *
    * @param ElementType $type
    */
-  public function setType(ElementType $type)
+  public function setType(ElementType $type = null)
   {
     $this->type = $type;
   }
@@ -171,9 +179,10 @@ class Element
   }
   
   
-  public function __construct()
+  public function __construct($url = null)
   {
     $this->tags = new ArrayCollection();
+    $this->url = $url;
   }
   
   /**
@@ -258,6 +267,26 @@ class Element
   }
 
   /**
+   * Set embed
+   *
+   * @param string $code
+   */
+  public function setEmbed($code)
+  {
+      $this->embed = $code;
+  }
+
+  /**
+   * Get embed
+   *
+   * @return string 
+   */
+  public function getEmbed()
+  {
+      return $this->embed;
+  }
+
+  /**
    * Set created
    *
    * @param date $created
@@ -296,4 +325,20 @@ class Element
   {
       return $this->updated;
   }
+  
+  /**
+   * Ajoute des relation vers des tags.
+   * 
+   * @param array $ids 
+   */
+  public function setTagsWithIds(EntityManager $em, $ids)
+  {
+    $tags = $em->getRepository('MuzichCoreBundle:Tag')->findByIds($ids)->execute();
+
+    // Pour les nouveaux ids restants
+    foreach ($tags as $tag)
+    {      
+      $this->addTag($tag);
+    }
+  }
 }

src/Muzich/CoreBundle/Entity/ElementType.php

@@ -19,7 +19,7 @@ class ElementType
   
   /**
    * @ORM\Id
-   * @ORM\Column(type="string", length=12)
+   * @ORM\Column(type="string", length=18)
    * @var type string
    */
   protected $id;

src/Muzich/CoreBundle/Form/Element/ElementAddForm.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Muzich\CoreBundle\Form\Element;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilder;
+
+class ElementAddForm extends AbstractType
+{
+  public function buildForm(FormBuilder $builder, array $options)
+  {
+    $builder->add('name', 'text', array(
+      'required' => true,
+    ));
+    
+    $builder->add('url', 'text', array(
+      'required' => true,
+    ));
+        
+    $builder->add('tags', 'choice', array(
+      'choices'           => $options['tags'],
+      'expanded'          => true,
+      'multiple'          => true
+    ));
+  }
+
+  public function getName()
+  {
+    return 'element_add';
+  }
+  
+  public function getDefaultOptions(array $options)
+  {
+    return array(
+      'name' => '',
+      'url' => '',
+      'tags' => array(),
+      'data_class' => 'Muzich\CoreBundle\Entity\Element'
+    );
+  }
+}

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -78,7 +78,7 @@ class ElementRepository extends EntityRepository
     $query_string = "SELECT e, et, t2, eu, g
       FROM MuzichCoreBundle:Element e 
       LEFT JOIN e.group g 
-      JOIN e.type et 
+      LEFT JOIN e.type et 
       LEFT JOIN e.tags t 
       LEFT JOIN e.tags t2 
       JOIN e.owner eu $join_personal

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

@@ -1,11 +1,14 @@
 
 
 search_elements:
-   pattern:  /search-elements
-   defaults: { _controller: MuzichCoreBundle:Search:searchElements }
+  pattern:  /search-elements
+  defaults: { _controller: MuzichCoreBundle:Search:searchElements }
    
 follow:
-   pattern:  /follow/{type}/{id}/{token}
-   defaults: { _controller: MuzichCoreBundle:Core:follow }
+  pattern:  /follow/{type}/{id}/{token}
+  defaults: { _controller: MuzichCoreBundle:Core:follow }
    
-     
+element_add:
+  pattern:  /element/add
+  defaults: { _controller: MuzichCoreBundle:Core:elementAdd }
+  

src/Muzich/CoreBundle/Resources/config/video_embed.yaml

@@ -0,0 +1,28 @@
+---
+embedTemplate: <object width="%2$s" height="%3$s" ><param name="movie" value="%1$s"></param><param name="wmode" value="transparent"></param><embed src="%1$s" type="application/x-shockwave-flash" wmode="transparent" width="%2$s" height="%3$s"></embed></object>
+defaultWidth: 425
+defaultHeight: 350
+services:
+    youtube:
+        urlPattern: youtube.com
+        embedUrlTemplate: http://www.youtube.com/v/%1$s&rel=1
+        thumbnailUrlTemplate: http://i.ytimg.com/vi/%1$s/default.jpg
+        extractPattern: /youtube\.com\/(v\/|watch\?v=)([\w\-]+)/
+        apiUrl: http://www.youtube.com/api2_rest
+        defaultWidth: 425
+        defaultHeight: 350
+    google:
+        urlPattern: video.google
+        extractPattern: /docid=([^&]*)/i
+        embedUrlTemplate: http://video.google.com/googleplayer.swf?docId=%1$s
+        thumbnailUrlTemplate: http://video.google.com/videofeed?docid=%s
+        thumbnailUrlExtractPattern: '/<media:thumbnail url="([^"]+)/'
+        defaultWidth: 400
+        defaultHeight: 326
+    dailymotion:
+        urlPattern: dailymotion.com
+        embedUrlTemplate: http://www.dailymotion.com/swf/%1$s/
+        thumbnailUrlTemplate: http://www.dailymotion.com/thumbnail/160x120/video/%1$s/
+        extractPattern: '#/(video|swf)/([a-zA-Z0-9]+)[^a-zA-Z0-9]#'
+        defaultWidth: 425
+        defaultHeight: 350

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

@@ -14,6 +14,12 @@
           {% endfor %} 
         </ul>
         
+        {% if element.embed %}
+          {% autoescape false %}
+            {{ element.embed }}
+          {% endautoescape %}
+        {% endif %}
+        
     </li>
   {% endfor %} 
 </ul>

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -7,6 +7,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
 use Doctrine\ORM\Query;
 use Muzich\CoreBundle\Form\Search\ElementSearchForm;
+use Muzich\CoreBundle\Form\Element\ElementAddForm;
 
 class HomeController extends Controller
 {
@@ -21,10 +22,17 @@ class HomeController extends Controller
     $search_form = $this->createForm(
       new ElementSearchForm(), 
       $search_object->getParams(),
-      array('tags' => $this->getTagsArray())
+      array('tags' => $tags = $this->getTagsArray())
+    );
+    
+    $add_form = $this->createForm(
+      new ElementAddForm(),
+      array(),
+      array('tags' => $tags)
     );
         
     return array(
+      'add_form' => $add_form->createView(),
       'search_object' => $search_object,
       'search_form'   => $search_form->createView()
     );

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -4,6 +4,20 @@
 
 {% block content %}
 
+  <form action="{{ path('element_add') }}" method="post" {{ form_enctype(add_form) }}>
+    {{ form_errors(add_form) }}
+
+    {{ form_row(add_form.name) }}
+      
+    {{ form_row(add_form.url) }}
+      
+    {{ form_row(add_form.tags) }}
+
+    {{ form_rest(add_form) }}
+
+    <input type="submit" />
+  </form>
+
   {% include "MuzichCoreBundle:SearchElement:form.html.twig" %}
 
   {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}