Merge branch 'feature/v0.9.7/connect' into stable/v0.9.7

app/AppKernel.php

             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
             new Shtumi\UsefulBundle\ShtumiUsefulBundle(),
+            new FOS\FacebookBundle\FOSFacebookBundle(),
             
             new Muzich\CoreBundle\MuzichCoreBundle(),
             new Muzich\UserBundle\MuzichUserBundle(),

app/config/routing.yml

+_security_check:
+  pattern:  /login_facebook_check
+  
+_security_logout:
+    pattern:  /logout
+
 MuzichIndexBundle:
   resource: "@MuzichIndexBundle/Resources/config/routing.yml"
   prefix: /

composer.json

         "sonata-project/doctrine-orm-admin-bundle": "2.1.*@dev",
         "sonata-project/admin-bundle": "2.1.*@dev",
         "sonata-project/jquery-bundle": "1.8.*@dev",
-        "sonata-project/block-bundle": "2.1.*@dev"
+        "sonata-project/block-bundle": "2.1.*@dev",
+        "friendsofsymfony/facebook-bundle": "dev-master"
     },
     "scripts": {
         "post-install-cmd": [

composer.lock

 {
-    "hash": "dd5c41c30319b0b4e3eff5370c6bedd2",
+    "hash": "d7a4e5394285af2257f72f7356506599",
     "packages": [
         {
             "name": "cedriclombardot/admingenerator-generator-bundle",
             ]
         },
         {
+            "name": "facebook/php-sdk",
+            "version": "v3.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/facebook-php-sdk.git",
+                "reference": "v3.2.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/facebook-php-sdk/zipball/v3.2.2",
+                "reference": "v3.2.2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "php": ">=5.2.0"
+            },
+            "time": "2013-01-15 21:37:15",
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Facebook",
+                    "homepage": "https://github.com/facebook/facebook-php-sdk/contributors"
+                }
+            ],
+            "description": "Facebook PHP SDK",
+            "homepage": "https://github.com/facebook/facebook-php-sdk",
+            "keywords": [
+                "facebook",
+                "sdk"
+            ]
+        },
+        {
+            "name": "friendsofsymfony/facebook-bundle",
+            "version": "dev-master",
+            "target-dir": "FOS/FacebookBundle",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfSymfony/FOSFacebookBundle.git",
+                "reference": "9c93669fd8f93941602d348daa58273c29be229f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSFacebookBundle/zipball/9c93669fd8f93941602d348daa58273c29be229f",
+                "reference": "9c93669fd8f93941602d348daa58273c29be229f",
+                "shasum": ""
+            },
+            "require": {
+                "facebook/php-sdk": "3.2.*",
+                "php": ">=5.3.2",
+                "symfony/http-foundation": ">=2.1,<2.3",
+                "symfony/security": ">=2.1,<2.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "symfony/framework-bundle": ">=2.1,<2.3",
+                "symfony/security-bundle": ">=2.1,<2.3",
+                "symfony/twig-bundle": ">=2.1,<2.3"
+            },
+            "time": "2013-05-14 18:06:07",
+            "type": "symfony-bundle",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "FOS\\FacebookBundle": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kris Wallsmith",
+                    "email": "kris.wallsmith@gmail.com",
+                    "homepage": "http://kriswallsmith.net/"
+                },
+                {
+                    "name": "FriendsOfSymfony Community",
+                    "homepage": "https://github.com/friendsofsymfony/FOSFacebookBundle/contributors"
+                }
+            ],
+            "description": "Integrate the Facebook Platform into your Symfony2 application.",
+            "homepage": "http://friendsofsymfony.github.com",
+            "keywords": [
+                "facebook"
+            ]
+        },
+        {
             "name": "friendsofsymfony/user-bundle",
             "version": "v1.3.1",
             "target-dir": "FOS/UserBundle",
         "sonata-project/doctrine-orm-admin-bundle": 20,
         "sonata-project/admin-bundle": 20,
         "sonata-project/jquery-bundle": 20,
-        "sonata-project/block-bundle": 20
+        "sonata-project/block-bundle": 20,
+        "friendsofsymfony/facebook-bundle": 20
     }
 }

src/Muzich/CoreBundle/Entity/User.php

    */
   private $password_set = true;
   
+  /** @ORM\Column(name="facebook_id", type="string", length=255, nullable=true) */
+  protected $facebook_id;
+  
   /**
    * 
    */
     $this->setPasswordSet(true);
   }
   
+  /** @return void */
+  public function setFacebookId($facebook_id)
+  {
+    $this->facebook_id = $facebook_id;
+    $this->password_set = true;
+  }
+
+  /** @return string */
+  public function getFacebookId()
+  {
+    return $this->facebook_id;
+  }
+  
+  /** @param Array */
+  public function setFBData($fbdata) // C'est dans cette méthode que vous ajouterez vos informations
+  {
+    if (isset($fbdata['id'])) {
+      $this->setFacebookId($fbdata['id']);
+      $this->addRole('ROLE_FACEBOOK');
+    }
+    if (isset($fbdata['email'])) {
+      $this->setEmail($fbdata['email']);
+    }
+  }
+  
 }

src/Muzich/CoreBundle/Repository/UserRepository.php

     ;
   }
   
+  public function countUsers()
+  {
+    return $this->getEntityManager()
+      ->createQuery("SELECT COUNT(u.id) FROM MuzichCoreBundle:User u")
+      ->getSingleScalarResult()
+    ;
+  }
+  
 }  

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

-parameters:
+#parameters:
     # ... other parameters
     #security.acl.permission.map.class: Sonata\AdminBundle\Security\Acl\Permission\AdminPermissionMap
     
     providers:
         fos_userbundle:
             id: fos_user.user_provider.username_email
+        my_facebook_provider:
+            id: my_user.facebook_provider
     encoders:
         "FOS\UserBundle\Model\UserInterface":
             algorithm: sha512
                 check_path:     /login_check
                 failure_path:   null
                 default_target_path: home
-                success_handler: security.authentication.success_handler
-                failure_handler: security.authentication.failure_handler
+                success_handler: muzich.security.authentication.success_handler
+                failure_handler: muzich.security.authentication.failure_handler
+            fos_facebook:
+                app_url: "%api_facebook_name%"
+                server_url: "%api_facebook_server%"
+                check_path: /login_facebook_check
+                provider: my_facebook_provider
                 
             logout:
                 path:   /logout

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

 
 #registration_link, #login_link
 {
-  margin-right: -10px;
-  margin-top: -68px;
+  margin-right: -112px;
+  margin-top: -76px;
 }
 
 #element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_link_disabled img, #group_add_close_link img, #registration_link img, #login_link img
 {
   float: none;
 }
+
+div#facebook_login
+{
+  float: right;
+  margin-bottom: 0;
+  margin-right: 0;
+  margin-top: -5px;
+}
+
+div#login_box
+{
+  margin-top: 23px;
+}

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

         }
       });
       
+      $('div#facebook_login').prependTo('div#helpbox');
+      $('div#facebook_login').show();
+      
     });
   }
 }
 
 function close_popin()
 {
+  $('div#facebook_login').hide();
+  $('div#facebook_login').appendTo('body');
   // Fond gris
   $('#fade').fadeOut(1000, function(){$('#fade').remove();});
   // On cache le lecteur

src/Muzich/CoreBundle/Resources/views/Component/facebook.html.twig

+{{ facebook_initialize({'xfbml': true, 'culture': 'fr_FR', 'fbAsyncInit': 'onFbInit();'}) }}
+<script type="text/javascript" > // Script for FOSFacebookBundle
+function goLogIn(){
+    window.location = "{{ path('_security_check') }}";
+}
+
+function onFbInit() {
+    if (typeof(FB) != 'undefined' && FB != null ) {
+        FB.Event.subscribe('auth.statusChange', function(response) {
+            if (response.session || response.authResponse) {
+                setTimeout(goLogIn, 50);
+            } else {
+                window.location = "{{ path('_security_logout') }}";
+            }
+        });
+    }
+}
+</script>
+
+<div id="facebook_login" style="display: none;">
+  {{ facebook_login_button({'autologoutlink': false}) }}
+</div>
+  

src/Muzich/CoreBundle/Resources/views/layout.html.twig

 <!doctype html>
-<html>
+<html xmlns:fb="http://www.facebook.com/2008/fbml">
   <head>
     <title>Muzi.ch - {% block title %}{% endblock %}</title>
     {% include 'MuzichCoreBundle:Layout:head.html.twig' %}
   </head>
   <body>
     
+    {% include 'MuzichCoreBundle:Component:facebook.html.twig' %}
     {% include 'MuzichCoreBundle:Layout:noscript.html.twig' %}
     {% include 'MuzichCoreBundle:Autoplay:autoplay.html.twig' %}
   

src/Muzich/CoreBundle/Security/User/Provider/FacebookProvider.php

+<?php
+
+namespace Muzich\CoreBundle\Security\User\Provider;
+
+use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+
+use \BaseFacebook;
+use \FacebookApiException;
+
+class FacebookProvider implements UserProviderInterface
+{
+  /**
+   * @var \Facebook
+   */
+  protected $facebook;
+  protected $userManager;
+  protected $validator;
+
+  public function __construct(BaseFacebook $facebook, $userManager, $validator)
+  {
+    $this->facebook = $facebook;
+    $this->userManager = $userManager;
+    $this->validator = $validator;
+  }
+
+  public function supportsClass($class)
+  {
+    return $this->userManager->supportsClass($class);
+  }
+
+  public function findUserByFbId($fbId)
+  {
+    return $this->userManager->findUserBy(array('facebook_id' => $fbId));
+  }
+
+  public function loadUserByUsername($username)
+  {
+    $user = $this->findUserByFbId($username);
+
+    try {
+      $fbdata = $this->facebook->api('/me');
+    } catch (FacebookApiException $e) {
+      throw new UsernameNotFoundException('The user is not authenticated on facebook');
+      $fbdata = null;
+    }
+
+    if (!empty($fbdata)) {
+      if (empty($user)) {
+        $user = $this->userManager->getNewReadyUser();
+        $user->setFBData($fbdata);
+      }
+
+      if (count($this->validator->validate($user, 'Facebook'))) {
+        throw new UsernameNotFoundException('The facebook user could not be stored');
+      }
+      $this->userManager->updateUser($user);
+    }
+
+    if (empty($user)) {
+      throw new UsernameNotFoundException('The user is not authenticated on facebook');
+    }
+
+    return $user;
+  }
+
+  public function refreshUser(UserInterface $user)
+  {
+    if (!$this->supportsClass(get_class($user)) || !$user->getFacebookId()) {
+      throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', get_class($user)));
+    }
+
+    return $this->loadUserByUsername($user->getFacebookId());
+  }
+}

src/Muzich/UserBundle/Controller/UserController.php

   /** @return User */
   protected function getNewUser()
   {
-    // Ce serais mieux d'appeler notre user manager et d'utiliser notre createUser
-    // avec ce code.
-    $userManager = $this->container->get('fos_user.user_manager');
-    $user = $userManager->createUser();
-    $user->setUsername($this->generateUsername());
-    $user->setPlainPassword($this->generatePassword(32));
-    $user->setEnabled(true);
-    $user->setCguAccepted(true);
-    $user->setEmailConfirmed(false);
-    $user->setUsernameUpdatable(true);
-    $user->setPasswordSet(false);
-    return $user;
-  }
-  
-  protected function generateUsername()
-  {
-    $qb = $this->getEntityManager()->createQueryBuilder();
-    $qb->select('count(id)');
-    $qb->from('MuzichCoreBundle:User','id');
-    $count = $qb->getQuery()->getSingleScalarResult();
-    
-    while ($this->usernameExist($count))
-    {
-      $count++;
-    }
-    
-    return 'User'.$count;
-  }
-  
-  protected function usernameExist($count)
-  {
-    $username = 'User'.$count;
-    if ($this->getEntityManager()->getRepository('MuzichCoreBundle:User')
-      ->findOneByUsername($username))
-    {
-      return true;
-    }
-    
-    return false;
-  }
-  
-  protected function generatePassword($length = 8)
-  {
-    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    $count = mb_strlen($chars);
-    
-    for ($i = 0, $result = ''; $i < $length; $i++) {
-        $index = rand(0, $count - 1);
-        $result .= mb_substr($chars, $index, 1);
-    }
-    
-    return $result;
+    return $this->container->get('muzich_user_manager')->getNewReadyUser();
   }
   
   protected function checkRegistrationValues($form)

src/Muzich/UserBundle/Entity/UserManager.php

 
     $this->objectManager->getEventManager()->addEventSubscriber($sluggableListener);
   }
+  
+  public function getNewReadyUser()
+  {
+    $user = $this->createUser();
+    $user->setUsername($this->generateUsername());
+    $user->setPlainPassword($this->generatePassword(32));
+    $user->setEnabled(true);
+    $user->setCguAccepted(true);
+    $user->setEmailConfirmed(false);
+    $user->setUsernameUpdatable(true);
+    $user->setPasswordSet(false);
+    return $user;
+  }
+  
+  protected function generateUsername()
+  {
+    $count = $this->repository->countUsers();
+    while ($this->usernameExist($count))
+    {
+      $count++;
+    }
+    
+    return 'User'.$count;
+  }
+  
+  protected function usernameExist($count)
+  {
+    $username = 'User'.$count;
+    if ($this->repository->findOneByUsername($username))
+    {
+      return true;
+    }
+    
+    return false;
+  }
+  
+  protected function generatePassword($length = 8)
+  {
+    $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+    $count = mb_strlen($chars);
+    
+    for ($i = 0, $result = ''; $i < $length; $i++) {
+        $index = rand(0, $count - 1);
+        $result .= mb_substr($chars, $index, 1);
+    }
+    
+    return $result;
+  }
 
 }

src/Muzich/UserBundle/Resources/views/Account/subscribe_or_login.html.twig

   
   {% include "MuzichUserBundle:Registration:register.html.twig" %}
   
-</div>
+</div>

web/bundles/admingeneratorgenerator/javascripts/double_list.js

 {
   init: function(id, className)
   {
-    if(id == null)
-    return;
-    
     form = sfDoubleList.get_current_form(id);
 
-      callback = function() { sfDoubleList.submit(form, className) };
+    callback = function() { sfDoubleList.submit(form, className) };
 
     if (form.addEventListener)
     {

web/bundles/muzichcore/css/main.css

   margin-left: 1px;
 }
 
-td.element_content a.display_comments, td.element_content a.add_comment, td.element_content a.hide_comments, div.comments a.add_comment
+td.element_content a.display_comments, td.element_content a.add_comment, td.element_content a.add_comment_disabled, td.element_content a.hide_comments, div.comments a.add_comment
 {
   color: #404040;
 }
   margin-right: 0px;
 }
 
-#element_add_link, #element_add_close_link, #group_add_link, #group_add_close_link, #registration_link, #login_link, #know_more
+#element_add_link, #element_add_close_link, #group_add_link, #group_add_link_disabled, #group_add_close_link, #registration_link, #login_link, #know_more, #launch_tour
 {
   float: right;
   margin-top: -58px;
   margin-top: -68px;
 }
 
-#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_close_link img, #registration_link img, #login_link img
+#element_add_link img, #element_add_close_link img, #group_add_link img, #group_add_link_disabled img, #group_add_close_link img, #registration_link img, #login_link img
 {
   margin-bottom: -5px;
     margin-right: -5px;
 }
 
-#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_close_link.justtopright
+#element_add_link.justtopright, #element_add_close_link.justtopright, #group_add_link.justtopright, #group_add_link_disabled.justtopright, #group_add_close_link.justtopright
 {
   margin-top: 0px;
   margin-right: 0px;
 {
   color: black;
 }
+
+#helpbox div.search_tag_list ul.search_tag_list li.new a
+{
+  color: black;
+}
   
 
 div.search_tag_list ul.search_tag_list li:hover
 
 div#registration_box input.niceinput
 {
-  width: 430px;
+  width: 250px;
 }
 
 div#registration_box label
 {
-  width: 170px;
+  width: 70px;
+}
+
+div#registration_box input[type="submit"]
+{
+  float: right;
 }
 
 div#registration_box div.field
     float: right;
 }
 
-#container #group_add_link, #container #group_add_close_link
+#container #group_add_link, #container #group_add_link_disabled, #container #group_add_close_link
 {
   font-size: 120%;
   float: right;
 
 #login_box input[id="username"], #login_box input[id="password"]
 {
-  width: 230px;
+  width: 228px;
+}
+
+#login_box div.login
+{
+  margin-top: 8px;
+}
+
+#login_box div.textcenter
+{
+  margin-top: 12px;
 }
 
 /*#registration_link, #login_link
   float: right;
 }
 
-a.tags_prompt_helpbox
+a.tag_prompt_tool
 {
-  float: left;
+  float: right;
   margin-bottom: 0;
   margin-left: 0px;
   margin-top: 5px;
+  margin-right: 11px;
 }
 
 form#address_update input.intext
   height: 100px;
 }
   
-#know_more
+#know_more, #launch_tour
 {
-  float: left;
-  margin-left: -11px;
-  margin-top: -67px;
+  float: none;
+  margin-bottom: 16px;
+  margin-top: 0;
+  width: 269px;
 }
 
 div.helpbox_image_container
 
 .fotter_muzich_little{
   font-size: 9px;
-}
+}
+
+div.side_margin_top
+{
+  margin-top: 25px;
+}
+
+p.accept_cgu
+{
+  font-size: 11px;
+}
+
+li.user_name a
+{
+  color: inherit;
+}
+
+li.user_name a:hover
+{
+  text-decoration: underline;
+}
+
+@-webkit-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-moz-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-ms-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@-o-keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+@keyframes clignote
+{
+  0%{box-shadow:0px 0px 10px #909090;}
+  50%{box-shadow:0px 0px 2px #909090;}
+  100%{box-shadow:0px 0px 10px #909090;}
+}
+
+
+.flashing
+{
+  font-weight: bold;
+  text-shadow: 0 1px 0 white;
+  border-radius: 3px;
+  padding: 5px 10px;
+  box-shadow:0px 0px 10px #909090;
+  
+  -webkit-animation-name: clignote;
+  -webkit-animation-duration: 1s;
+  -webkit-animation-iteration-count:infinite;
+  
+  -moz-animation-name: clignote;
+  -moz-animation-duration: 1s;
+  -moz-animation-iteration-count:infinite;
+  
+  -ms-animation-name: clignote;
+  -ms-animation-duration: 1s;
+  -ms-animation-iteration-count:infinite;
+  
+  -o-animation-name: clignote;
+  -o-animation-duration: 1s;
+  -o-animation-iteration-count:infinite;
+  
+  animation-name: clignote;
+  animation-duration: 1s;
+  animation-iteration-count:infinite;
+}
+
+div.myaccount_part.flashing
+{
+  padding: 2px;
+}
+
+div.choose_password
+{
+  text-align: center;
+}
+
+div.center
+{
+  text-align: center;
+}
+
+div#email_not_confirmed_box input
+{
+  margin: 10px;
+}
+
+div#email_not_confirmed_box p.info
+{
+  font-style: italic;
+}
+
+span.message_success
+{
+  font-weight: bold;
+  color: green;
+}
+
+span.message_error
+{
+  font-weight: bold;
+  color: red;
+}
+
+div#helpbox input.tag_prompt
+{
+  width: 480px;
+}
+
+div#helpbox input.button
+{
+  float: right;
+  margin-right: 11px;
+  margin-top: 5px;
+}
+
+div#helpbox div.center input.button
+{
+  float: none;
+}

web/bundles/muzichcore/js/TagPrompt.js

   {
     if (!tag_id)
     {
-      openTagSubmission(tag_name);
+      if (!visitor)
+      {
+        openTagSubmission(tag_name);
+      }
+      else
+      {
+        open_connection_or_subscription_window();
+      }
     }
     else
     {
       .attr('method', 'post')
       .attr('name', 'add_tag')
       .ajaxForm(function(response) {
-        /*
-        *
-        */
-  
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+       
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(response){
+            $('form[name="add_tag"]').find('ul.error_list').remove();
+            var ul_errors = $('<ul>').addClass('error_list');
+
+            for (i in response.errors)
+            {
+              ul_errors.append($('<li>').append(response.errors[i]));
+            }
+
+            $('form[name="add_tag"]').prepend(ul_errors);
+          }
+        );
   
-        if (response.status == 'success')
+        if (response.status === 'success')
         {
           var tag = new Tag(response.tag_id, response.tag_name);
           addTagToProposedTags(tag);
           addTagToSelectedTags(tag);
           _tag_prompt_connector.updateOutput(tags_selected);
-  
+
           $('#fade').fadeOut(400, function(){$('#fade').remove();});
           $('#add_tag').remove();
         }
   
-        if (response.status == 'error')
-        {
-          $('form[name="add_tag"]').find('ul.error_list').remove();
-          var ul_errors = $('<ul>').addClass('error_list');
-  
-          for (i in response.errors)
-          {
-            ul_errors.append($('<li>').append(response.errors[i]));
-          }
-  
-          $('form[name="add_tag"]').prepend(ul_errors);
-        }
-  
         return false;
       })
   
         *
         */
   
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
+        window.ResponseController.execute(
+          response,
+          function(){},
+          function(){}
+        );
   
         if (response.status == 'success')
         {