Merge branch 'feature/token' into unstable

app/Resources/translations/userform.fr.yml

@@ -7,4 +7,10 @@ username:  Nom d'utilisateur
 email:     Email
 password:
   first:   Mot de passe
-  second:  Mot de passe (vérification)
+  second:  Mot de passe (vérification)
+token:     Code d'inscription
+
+help:
+  token:   |
+            Rentrez ici le code qui vous à été fournis afin de vous inscrire 
+            a la version non publique.

app/Resources/translations/validators.fr.yml

@@ -23,4 +23,8 @@ error:
       notsame:           Vous avez saisie deux nouveaux mot de passes différents.
   changeemail:
     email:
-      invalid:           L'email saisie n'est pas valide.
+      invalid:           L'email saisie n'est pas valide.
+      
+registration:
+  token:
+    error:               Le code saisie pour l'inscription n'est pas correct

src/Muzich/AdminBundle/Admin/RegistrationTokenAdmin.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Muzich\AdminBundle\Admin;
+
+use Sonata\AdminBundle\Admin\Admin;
+use Sonata\AdminBundle\Form\FormMapper;
+use Sonata\AdminBundle\Datagrid\DatagridMapper;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+
+class RegistrationTokenAdmin extends Admin
+{
+  
+  protected function configureListFields(ListMapper $listMapper)
+  {
+    $listMapper
+      ->addIdentifier('id')
+      ->addIdentifier('token')
+      ->add('_action', 'actions', array(
+        'actions' => array(
+          'view' => array(),
+          'edit' => array(),
+        )
+      ))
+    ;
+  }
+  
+  protected function configureDatagridFilters(DatagridMapper $datagrid)
+  {
+    $datagrid
+      ->add('token')
+      ->add('used')
+    ;
+  }
+  
+  protected function configureFormFields(FormMapper $formMapper)
+  {
+    $formMapper
+      ->add('token')
+      ->add('used')
+    ;
+  }
+  
+}

src/Muzich/AdminBundle/Controller/RegistrationTokenAdminController.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Muzich\AdminBundle\Controller;
+
+use Sonata\AdminBundle\Controller\CRUDController as Controller;
+
+class RegistrationTokenAdminController extends Controller
+{
+}

src/Muzich/CoreBundle/Entity/RegistrationToken.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Muzich\CoreBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+
+/**
+ * Le RegistrationToken sert uniquement a contrôler les inscription durant 
+ * toute la phase fermé du site en production.
+ * 
+ * @ORM\Entity
+ * @UniqueEntity(fields="token")
+ */
+class RegistrationToken
+{
+  
+  /**
+   * @ORM\Id
+   * @ORM\Column(type="integer")
+   * @ORM\GeneratedValue(strategy="AUTO")
+   * @var type int
+   */
+  protected $id;
+  
+  /**
+   * Le token en question
+   * 
+   * @ORM\Column(type="string", length=32, unique=true)
+   * @Assert\NotBlank()
+   * @Assert\MinLength(limit=3)
+   * @Assert\MaxLength(32)
+   * @var type string
+   */
+  protected $token;
+  
+  /**
+   * Si ce boolean est a vrai il n'est plus utilisable
+   * @ORM\Column(type="boolean", nullable=true)
+   * @var type boolean
+   */
+  protected $used = false;
+    
+  public function __toString()
+  {
+    return $this->getToken();
+  }
+  
+  /**
+   * Get id
+   *
+   * @return integer 
+   */
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  /**
+   * Set token
+   *
+   * @param string $token
+   */
+  public function setToken($token)
+  {
+    $this->token = $token;
+  }
+
+  /**
+   * Get token
+   *
+   * @return string 
+   */
+  public function getToken()
+  {
+    return $this->token;
+  }
+
+  /**
+   * Set used
+   *
+   * @param boolean $used
+   */
+  public function setUsed($used)
+  {
+    $this->used = $used;
+  }
+
+  /**
+   * Get used
+   *
+   * @return boolean 
+   */
+  public function getUsed()
+  {
+    return $this->used;
+  }
+
+}

src/Muzich/IndexBundle/Resources/views/Index/index.html.twig

@@ -6,7 +6,7 @@
     
   <div class="hello">
 
-    <div id="login_box">
+    <div id="login_box" style="{% if registration_page is defined %}display: none;{% endif %}">
       {% include "MuzichUserBundle:Security:login.html.twig" %}
         
       <a href="#" id="registration_link">
@@ -14,7 +14,7 @@
       </a>
     </div>
     
-    <div id="registration_box" style="display: none;">
+    <div id="registration_box" style="{% if registration_page is not defined %}display: none;{% endif %}">
       {% include "MuzichUserBundle:Registration:register.html.twig" %}
         
       <a href="#" id="login_link">

src/Muzich/UserBundle/Controller/UserController.php

@@ -107,6 +107,30 @@ class UserController extends Controller
     $form_values = $this->getRequest()->request->get($form->getName());
     $user = $form->getData();
     
+    /**
+     * Contrôle du token
+     */
+    
+    $r_token = $this->getDoctrine()->getRepository('MuzichCoreBundle:RegistrationToken')
+      ->findOneBy(array('token' => $form_values["token"], 'used' => false))
+    ;
+      
+    if (!$r_token)
+    {
+      $errors[] = $this->get('translator')->trans(
+        'registration.token.error', 
+        array(),
+        'validators'
+      );
+    }
+    else
+    {
+      $r_token->setUsed(true);
+      $em = $this->getDoctrine()->getEntityManager();
+      $em->persist($r_token);
+      $em->flush();
+    }
+    
     /*
      * Contrôle de la taille du pseudo
      * min: 3
@@ -176,11 +200,12 @@ class UserController extends Controller
     return $this->container->get('templating')->renderResponse(
       'MuzichIndexBundle:Index:index.html.twig',
       array(
-        'form' => $form->createView(),
-        'error' => null,
-        'registration_errors' => $form->getErrors(),
+        'form'                     => $form->createView(),
+        'error'                    => null,
+        'registration_errors'      => $form->getErrors(),
         'registration_errors_pers' => $errors,
-        'last_username' => null
+        'last_username'            => null,
+        'registration_page'        => true
       )
     );
   }

src/Muzich/UserBundle/Form/Type/RegistrationFormType.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Muzich\UserBundle\Form\Type;
+
+use Symfony\Component\Form\FormBuilder;
+use FOS\UserBundle\Form\Type\RegistrationFormType as BaseType;
+
+class RegistrationFormType extends BaseType
+{
+  public function buildForm(FormBuilder $builder, array $options)
+  {
+    parent::buildForm($builder, $options);
+
+    $builder->add('token', 'text', array(
+      "property_path" => false
+    ));
+    
+  }
+
+  public function getName()
+  {
+    return 'muzich_user_registration';
+  }
+}

src/Muzich/UserBundle/Resources/views/Registration/register.html.twig

@@ -39,6 +39,14 @@
       {{ form_label(form.plainPassword.second, 'password.second'|trans({}, 'userform')) }}
       {{ form_widget(form.plainPassword.second) }}
     </div> 
+    
+    <span class="help">{{ 'help.token'|trans({}, 'userform') }}</span>
+    
+    <div class="field">
+      {{ form_errors(form.token) }}
+      {{ form_label(form.token, 'token'|trans({}, 'userform')) }}
+      {{ form_widget(form.token) }}
+    </div> 
 
     {{ form_rest(form) }}