Evolution #404: Inscription: confirmation de l'email et conséquences

app/Resources/translations/userui.en.yml

@@ -52,6 +52,13 @@ my_account:
   change_email:     Changer mon adresse email
   change_email_submit: Mettre à jour mon email
   choose_password:  Choisir un mot de passe pour mon compte
+  email_not_confirmed:
+    title:          Veuillez confirmer votre adresse email
+    text:           |
+                    Cette action nécéssite que vous confirmiez votre adresse mail.
+                    Pour cela veuillez cliquer sur le lien que nous vous avons envoyé par email.
+    button:         Renvoyer l'email de confirmation
+    help:           Pensez à vérifier le contenu de votre dossier SPAM
   address:
     title:          Mon adresse
     description:    Avec votre adresse Muzi.ch pourra vous avertir plus aisément des événements à venirs dans votre région.

app/Resources/translations/userui.fr.yml

@@ -43,7 +43,7 @@ title:
   change_username: Change son nom d'utilisateur
   
 my_account: 
-  title:          Mon compte
+  title:            Mon compte
   username:         Nom d'utilisateur
   change_username:  Modifier
   email:            Adresse email
@@ -53,6 +53,13 @@ my_account:
   change_email:     Changer mon adresse email
   change_email_submit: Mettre à jour mon email
   choose_password:  Choisir un mot de passe pour mon compte
+  email_not_confirmed:
+    title:          Veuillez confirmer votre adresse email
+    text:           |
+                    Cette action nécéssite que vous confirmiez votre adresse mail.
+                    Pour cela veuillez cliquer sur le lien que nous vous avons envoyé par email.
+    button:         Renvoyer l'email de confirmation
+    help:           Pensez à vérifier le contenu de votre dossier SPAM
   address:
     title:          Mon adresse
     description:    Avec votre adresse Muzi.ch pourra vous avertir plus aisément des événements à venir dans votre région.

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -14,6 +14,7 @@ use Muzich\CoreBundle\Entity\User;
 use Muzich\CoreBundle\lib\AutoplayManager;
 use Muzich\CoreBundle\Searcher\ElementSearcher;
 use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 class ElementController extends Controller
 {
@@ -572,6 +573,11 @@ class ElementController extends Controller
       return $response;
     }
     
+    if (($non_condition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION)) !== false)
+    {
+      return $this->jsonResponseError($non_condition);
+    }
+    
     if (!($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
       ->findOneById($element_id)))
     {

src/Muzich/CoreBundle/Entity/User.php

@@ -268,7 +268,7 @@ class User extends BaseUser
    * @ORM\Column(type="boolean", nullable=false)
    * @var type boolean
    */
-  private $email_confirmed = false;
+  private $email_confirmed = true;
   
  /**
   * @ORM\Column(type="integer")

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

@@ -2140,4 +2140,31 @@ div.myaccount_part.flashing
 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;
 }

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

@@ -20,6 +20,41 @@ function hideAllMessages()
  }
 }
 
+function ResponseController()
+{
+  var propagate = function(response)
+  {
+    if (response.status === 'error')
+    {
+      if (response.error === 'UserEmailNotConfirmed')
+      {
+        open_ajax_popin(url_email_not_confirmed, function(){
+          
+        });
+      }
+      else if (response.error === 'UserNotConnected')
+      {
+        open_connection_or_subscription_window();
+      }
+    }
+  }
+  
+  this.execute = function(response, success_callback, failure_callback)
+  {
+    propagate(response);
+    if (response.status === 'success')
+    {
+      success_callback();
+    }
+    else
+    {
+      failure_callback();
+    }
+  }
+}
+
+window.ResponseController = new ResponseController();
+
 $(document).ready(function(){
 		 
   // Initially, hide them all
@@ -2238,7 +2273,7 @@ $(document).ready(function(){
    * 
    */
   
- // Ouverture du formulaire de modification
+ // Ouverture du formulaire de proposition de tags
   $('a.element_propose_tags').live('click', function(){
     
     var link = $(this);
@@ -2248,68 +2283,72 @@ $(document).ready(function(){
     
     $.getJSON($(this).attr('href'), function(response) {
       
-      if (response.status == 'mustbeconnected')
-      {
-        $(location).attr('href', url_index);
-      }
-      
       li.find('img.element_loader').hide();
-      
-      if (response.status == 'success')
-      {
-        
-        // On prépare le tagBox
-        var table = li.find('table:first');
-        li.find('div.tag_proposition').remove();
-        table.after(response.html);
+      window.ResponseController.execute(
+        response,
+        function(){
+          // On prépare le tagBox
+          var table = li.find('table:first');
+          li.find('div.tag_proposition').remove();
+          table.after(response.html);
 
-        // Pour le click sur l'input de saisie de tag
-        //li.find('ul.tagbox li.input input[type="text"]').formDefaults();
+          // Pour le click sur l'input de saisie de tag
+          //li.find('ul.tagbox li.input input[type="text"]').formDefaults();
 
-        var options = new Array();
-        options.form_name  = response.form_name;
-        options.tag_init   = response.tags;
+          var options = new Array();
+          options.form_name  = response.form_name;
+          options.tag_init   = response.tags;
 
-        ajax_query_timestamp = null;
+          ajax_query_timestamp = null;
 
-        //$("#tags_prompt_list_"+response.form_name).tagBox(options);
-      
-      // On rend ce formulaire ajaxFormable
-      $('form[name="'+response.form_name+'"] input[type="submit"]').live('click', function(){
-        li = $(this).parents('li.element');
-        li.find('img.element_loader').show();
-      });
-      $('form[name="'+response.form_name+'"]').ajaxForm(function(response){
-        
-        if (response.status == 'mustbeconnected')
-        {
-          $(location).attr('href', url_index);
-        }
-                
-        if (response.status == 'success')
-        {
-          li = $('li#'+response.dom_id);
-          li.find('img.element_loader').hide();
-          li.find('form')
-          li.find('div.tag_proposition').remove();
-        }
-        else if (response.status == 'error')
-        {
-          li.find('img.element_loader').hide();
-          li.find('ul.error_list').remove();
-          var ul_errors = $('<ul>').addClass('error_list');
-          
-          for (i in response.errors)
+          //$("#tags_prompt_list_"+response.form_name).tagBox(options);
+
+        // On rend ce formulaire ajaxFormable
+        $('form[name="'+response.form_name+'"] input[type="submit"]').live('click', function(){
+          li = $(this).parents('li.element');
+          li.find('img.element_loader').show();
+        });
+        $('form[name="'+response.form_name+'"]').ajaxForm(function(response){
+
+          if (response.status == 'mustbeconnected')
           {
-            ul_errors.append($('<li>').append(response.errors[i]));
+            $(location).attr('href', url_index);
           }
+
+          if (response.status == 'success')
+          {
+            li = $('li#'+response.dom_id);
+            li.find('img.element_loader').hide();
+            li.find('form')
+            li.find('div.tag_proposition').remove();
+          }
+          else if (response.status == 'error')
+          {
+            li.find('img.element_loader').hide();
+            li.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]));
+            }
+
+            li.find('div.tag_proposition div.tags_prompt').prepend(ul_errors);
+          }
+
+        });
+        },
+        function(){
           
-          li.find('div.tag_proposition div.tags_prompt').prepend(ul_errors);
         }
-        
-      });
+      );
+      
+//      if (response.status === 'mustbeconnected')
+//      {
+//        $(location).attr('href', url_index);
+//      }
+      
       
-      }
     });
     return false;
   });
@@ -2908,6 +2947,20 @@ $(document).ready(function(){
       open_connection_or_subscription_window(true);
     });
    
+   /*
+    * Confirm email ajax
+    */
+   
+   $('div#email_not_confirmed_box input').live('click', function(){
+     $('div#email_not_confirmed_box img.loader').show();
+     $.getJSON(url_send_email_confirmation, function(response) {
+       $('div#email_not_confirmed_box img.loader').hide();
+       $('div#email_not_confirmed_box div.center').html(
+         '<span class="message_'+response.status+'">'+response.message+'</span>'      
+       );
+     });
+   });
+   
 });
 
 function open_ajax_popin(url, callback)

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -123,6 +123,8 @@
   url_get_embed_for_element = "{{ path('url_get_embed_for_element') }}";
   
   url_subscription_or_login = "{{ path('subscribe_or_login') }}";
+  url_email_not_confirmed = "{{ path('email_not_confirmed') }}";
+  url_send_email_confirmation = "{{ path('send_email_confirmation') }}";
   
   config_player_youtube_width = "{{ player_config_youtube_width }}";
   config_player_youtube_height = "{{ player_config_youtube_height }}";

src/Muzich/CoreBundle/Security/Context.php

@@ -22,44 +22,88 @@ class Context
   const AFFECT_NO_SCORING = 1;
   
   const CONDITION_USER_EMAIL_NOT_CONFIRMED = 'UserEmailNotConfirmed';
+  const CONDITION_USER_NOT_CONNECTED = 'UserNotConnected';
   
   static $affecteds_actions = array(
     self::AFFECT_CANT_MAKE => array(
-      self::ACTION_ELEMENT_ADD,
-      self::ACTION_ELEMENT_NOTE,
-      self::ACTION_COMMENT_ALERT,
-      self::ACTION_ELEMENT_ALERT,
-      self::ACTION_TAG_ADD,
-      self::ACTION_ELEMENT_TAGS_PROPOSITION,
-      self::ACTION_GROUP_ADD
+      self::ACTION_ELEMENT_ADD => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_ELEMENT_NOTE => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_COMMENT_ALERT => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_ELEMENT_ALERT => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_TAG_ADD => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_ELEMENT_TAGS_PROPOSITION => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_GROUP_ADD => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_ELEMENT_ADD_TO_FAVORITES => array(
+        self::CONDITION_USER_NOT_CONNECTED
+      ),
+      self::ACTION_COMMENT_ADD => array(
+        self::CONDITION_USER_NOT_CONNECTED,
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_USER_FOLLOW => array(
+        self::CONDITION_USER_NOT_CONNECTED
+      )
     ),
     self::AFFECT_NO_SCORING => array(
-      self::ACTION_ELEMENT_NOTE,
-      self::ACTION_ELEMENT_ADD_TO_FAVORITES,
-      self::ACTION_ELEMENT_TAGS_PROPOSITION,
-      self::ACTION_USER_FOLLOW
-    )
-  );
-  
-  static $affecteds_conditions = array(
-    self::AFFECT_CANT_MAKE => array(
-      self::CONDITION_USER_EMAIL_NOT_CONFIRMED
-    ),
-    self::AFFECT_NO_SCORING => array(
-      self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      self::ACTION_ELEMENT_NOTE => array(
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_ELEMENT_ADD_TO_FAVORITES => array(
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_ELEMENT_TAGS_PROPOSITION => array(
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      ),
+      self::ACTION_USER_FOLLOW => array(
+        self::CONDITION_USER_EMAIL_NOT_CONFIRMED
+      )
     )
   );
   
   private $user;
+  private $anonymous = false;
   
-  public function __construct(User $user)
+  public function __construct($user)
   {
-    $this->user = $user;
+    if ($user instanceof User)
+    {
+      $this->user = $user;
+    }
+    else if ($user == 'anon.')
+    {
+      $this->user = new User();
+      $this->anonymous = true;
+    }
+    else
+    {
+      throw new \Exception('Unable to determine type of user');
+    }
   }
   
   public function canMakeAction($action)
   {
-    if ($this->actionIsAffectedBy(self::AFFECT_CANT_MAKE, $action))
+    if ($this->actionIsAffectedBy(self::AFFECT_CANT_MAKE, $action) !== false)
       return false;
     return true;
   }
@@ -69,7 +113,7 @@ class Context
     if (!array_key_exists($affect, self::$affecteds_actions))
       throw new \Exception("Unknow action $action");
     
-    if (in_array($action, self::$affecteds_actions[$affect]))
+    if (array_key_exists($action, self::$affecteds_actions[$affect]))
       return true;
     return false;
   }
@@ -78,12 +122,12 @@ class Context
   {
     if ($this->actionCanBeAffectedBy($affect, $action))
     {
-      foreach (self::$affecteds_conditions[$affect] as $affected_condition)
+      foreach (self::$affecteds_actions[$affect][$action] as $affected_condition)
       {
         $affected_condition_method = 'is'.$affected_condition;
         if ($this->$affected_condition_method())
         {
-          return true;
+          return $affected_condition;
         }
       }
     }
@@ -91,6 +135,15 @@ class Context
     return false;
   }
   
+  protected function isUserNotConnected()
+  {
+    if ($this->anonymous)
+    {
+      return true;
+    }
+    return false;
+  }
+  
   protected function isUserEmailNotConfirmed()
   {
     if ($this->user->isEmailConfirmed())
@@ -100,4 +153,9 @@ class Context
     return true;
   }
   
+  public function getConditionForAffectedAction($action)
+  {
+    
+  }
+  
 }

src/Muzich/CoreBundle/Tests/Security/ContextTest.php

@@ -17,15 +17,16 @@ class ContextTest extends \PHPUnit_Framework_TestCase
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ALERT));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ALERT));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_TAG_ADD));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ADD));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
     $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_GROUP_ADD));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_USER_FOLLOW));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
     
-    $this->assertTrue($secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_NOTE));
-    $this->assertTrue($secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
-    $this->assertTrue($secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_USER_FOLLOW));
-    $this->assertTrue($secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
+    $this->assertEquals('UserEmailNotConfirmed', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_NOTE));
+    $this->assertEquals('UserEmailNotConfirmed', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
+    $this->assertEquals('UserEmailNotConfirmed', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_USER_FOLLOW));
+    $this->assertEquals('UserEmailNotConfirmed', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
   }
   
   public function testActionsWithConfirmedEmailUser()
@@ -39,6 +40,7 @@ class ContextTest extends \PHPUnit_Framework_TestCase
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ALERT));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ALERT));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_TAG_ADD));
+    $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ADD));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_GROUP_ADD));
     $this->assertTrue($secutiry_context->canMakeAction(SecurityContext::ACTION_USER_FOLLOW));
@@ -50,4 +52,31 @@ class ContextTest extends \PHPUnit_Framework_TestCase
     $this->assertFalse($secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_NO_SCORING, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
   }
   
+  public function testCanMakeActionsWithNotConnectedUser()
+  {
+    $secutiry_context = new SecurityContext('anon.');
+    
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ADD));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_NOTE));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ALERT));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ALERT));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_TAG_ADD));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_COMMENT_ADD));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_GROUP_ADD));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_USER_FOLLOW));
+    $this->assertFalse($secutiry_context->canMakeAction(SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
+    
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_ELEMENT_ADD));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_ELEMENT_NOTE));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_COMMENT_ALERT));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_ELEMENT_ALERT));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_TAG_ADD));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_COMMENT_ADD));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_COMMENT_ADD));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_ELEMENT_TAGS_PROPOSITION));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_GROUP_ADD));
+    $this->assertEquals('UserNotConnected', $secutiry_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, SecurityContext::ACTION_ELEMENT_ADD_TO_FAVORITES));
+  }
+  
 }

src/Muzich/CoreBundle/lib/Controller.php

@@ -12,6 +12,7 @@ use Muzich\CoreBundle\Searcher\GlobalSearcher;
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Entity\Presubscription;
 use Muzich\CoreBundle\Entity\User;
+use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 class Controller extends BaseController
 {
@@ -19,6 +20,8 @@ class Controller extends BaseController
   protected static $user = null;
   protected static $user_personal_query = null;
   protected static $tags = array();
+  /** @var SecurityContext */
+  protected $security_context;
   
   /**
    * Authenticate a user with Symfony Security
@@ -405,6 +408,15 @@ class Controller extends BaseController
     return $response;
   }
   
+  protected function jsonResponseError($error_type, $error_content = array())
+  {
+    return $this->jsonResponse(array(
+      'status' => 'error',
+      'error'  => $error_type,
+      'data'   => $error_content
+    ));
+  }
+  
   protected function jsonNotFoundResponse()
   {
     $response = new Response(json_encode(array(
@@ -566,13 +578,14 @@ class Controller extends BaseController
     return false;
   }
   
-  protected function sendEmailconfirmationEmail()
+  protected function sendEmailconfirmationEmail($set_send_time = true)
   {
     $user = $this->getUser();
     
     $tokenGenerator = $this->container->get('fos_user.util.token_generator');
     $user->setConfirmationToken($tokenGenerator->generateToken());
-    $user->setEmailConfirmationSentTimestamp(time());
+    if ($set_send_time)
+      $user->setEmailConfirmationSentTimestamp(time());
     
     $token = hash('sha256', $user->getConfirmationToken().$user->getEmail());
     $url = $this->get('router')->generate('email_confirm', array('token' => $token), true);
@@ -606,4 +619,24 @@ class Controller extends BaseController
     return $this->container->getParameter($key);
   }
   
+  protected function userHaveNonConditionToMakeAction($action)
+  {
+    $secutity_context = $this->getSecurityContext();
+    if (($condition = $secutity_context->actionIsAffectedBy(SecurityContext::AFFECT_CANT_MAKE, $action)) !== false)
+    {
+      return $condition;
+    }
+    
+    return false;
+  }
+  
+  /** @return SecurityContext */
+  protected function getSecurityContext()
+  {
+    if ($this->security_context == null)
+      $this->security_context = new SecurityContext($this->getUser());
+    
+    return $this->security_context;
+  }
+  
 }

src/Muzich/UserBundle/Controller/UserController.php

@@ -150,7 +150,7 @@ class UserController extends Controller
       $response = $this->getSuccessRegistrationResponse();
       $userManager->updateUser($user);
       $this->authenticateUser($user, $response);
-      $this->sendEmailconfirmationEmail();
+      $this->sendEmailconfirmationEmail(false);
       return $response;
     }
     
@@ -165,12 +165,15 @@ class UserController extends Controller
   /** @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;
@@ -760,7 +763,7 @@ class UserController extends Controller
     ;
   }
   
-  public function sendEmailConfirmAction(Request $request)
+  public function sendEmailConfirmAction(Request $request, $set_send_time = true)
   {
     $user = $this->getUser();
     if ($user->isEmailConfirmed())
@@ -792,7 +795,7 @@ class UserController extends Controller
       return new RedirectResponse($this->generateUrl('my_account'));
     }
     
-    $this->sendEmailconfirmationEmail();
+    $this->sendEmailconfirmationEmail($set_send_time);
     
     if ($request->isXmlHttpRequest())
     {
@@ -823,4 +826,12 @@ class UserController extends Controller
     return new RedirectResponse($this->generateUrl('my_account'));
   }
   
+  public function showEmailNotConfirmedAction()
+  {
+    return $this->jsonResponse(array(
+      'status' => 'success',
+      'data' => $this->render('MuzichUserBundle:Account:email_not_confirmed.html.twig')->getContent()
+    ));
+  }
+  
 }

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

@@ -76,3 +76,12 @@ subscribe_or_login:
 change_username:
   pattern: /account/username/update
   defaults: { _controller: MuzichUserBundle:User:changeUsername }
+
+email_not_confirmed:
+  pattern: /account/email-not-confirmed
+  defaults: { _controller: MuzichUserBundle:User:showEmailNotConfirmed }
+
+send_email_confirmation:
+  pattern: /account/send-email-confirmation
+  defaults: { _controller: MuzichUserBundle:User:sendEmailConfirm }
+    

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

@@ -0,0 +1,14 @@
+
+<div id="email_not_confirmed_box">
+  
+  <h2>{{ 'my_account.email_not_confirmed.title'|trans({}, 'userui') }}</h2>
+
+  <p>{{ 'my_account.email_not_confirmed.text'|trans({}, 'userui') }}</p>
+  
+  <div class="center">
+    <input type="button" class="button" value="{{ 'my_account.email_not_confirmed.button'|trans({}, 'userui') }}" /><img class="loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+  </div>
+  
+  <p class="info">{{ 'my_account.email_not_confirmed.help'|trans({}, 'userui') }}</p>
+  
+</div>