Fix languages and locale set in config default key

[userbundle] / Checker / UserChecker.php

diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php
index 1240c8a1cdce59f0e495f1b41f4915ab7c5942e5..7ea72ffceebfa00361c85be369cfef90d8589951 100644 (file)
--- a/Checker/UserChecker.php
+++ b/Checker/UserChecker.php
@@ -11,7 +11,7 @@
 
 namespace Rapsys\UserBundle\Checker;
 
 
 namespace Rapsys\UserBundle\Checker;
 

-use Symfony\Component\Security\Core\User\UserChecker as BaseUserChecker;
+use Symfony\Component\Security\Core\User\InMemoryUserChecker;

 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 use Symfony\Component\Security\Core\Exception\DisabledException;
 use Symfony\Component\Security\Core\User\UserInterface;
 


@@ -21,7 +21,7 @@ use Rapsys\UserBundle\Exception\UnactivatedException;
 /**
  * {@inheritdoc}
  */
 /**
  * {@inheritdoc}
  */

-class UserChecker extends BaseUserChecker {
+class UserChecker extends InMemoryUserChecker {

        /**
         * {@inheritdoc}
         */
        /**
         * {@inheritdoc}
         */


@@ -32,17 +32,20 @@ class UserChecker extends BaseUserChecker {
                }
 
                //With not activated user
                }
 
                //With not activated user

-        if (!$user->isActivated()) {
-            $ex = new UnactivatedException('Account is not activated');
-            $ex->setUser($user);
-            throw $ex;
-        }
-
-               //With disabled user
-        if ($user->isDisabled()) {
-            $ex = new DisabledException('Account is disabled');
-            $ex->setUser($user);
-            throw $ex;
-        }
+               if (!$user->isActivated()) {
+                       $ex = new UnactivatedException('User Account is not activated');
+                       $ex->setUser($user);
+                       throw $ex;
+               }
+
+               //With not enabled user
+               if (!$user->isEnabled()) {
+                       $ex = new DisabledException('User account is not enabled');
+                       $ex->setUser($user);
+                       throw $ex;
+               }
+
+               //Call parent checkPreAuth
+               parent::checkPostAuth($user);

        }
 }
        }
 }