Version 0.5.8

[userbundle] / Controller / UserController.php

diff --git a/Controller/UserController.php b/Controller/UserController.php
index 672f93392459b8b262ffe2bda85be72e50e81adb..15da1946475be832e08f351a188cba350dfa5358 100644 (file)
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -20,6 +20,7 @@ use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;

+use Symfony\Component\HttpKernel\Exception\GoneHttpException;

 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Mime\Address;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;


@@ -155,7 +156,7 @@ class UserController extends AbstractController {
                        //Set civility default
                        'civility_default' => $this->doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
                        //Disable mail
                        //Set civility default
                        'civility_default' => $this->doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
                        //Disable mail

-                       'mail' => $this->checker->isGranted('ROLE_ADMIN'),
+                       'mail' => $this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin'])),

                        //Disable password
                        'password' => false,
                        //Set method
                        //Disable password
                        'password' => false,
                        //Set method


@@ -387,7 +388,7 @@ class UserController extends AbstractController {
                        if ($pass != $this->slugger->hash($user->getPassword())) {
                                //Throw not found
                                //XXX: prevent use of outdated recover link
                        if ($pass != $this->slugger->hash($user->getPassword())) {
                                //Throw not found
                                //XXX: prevent use of outdated recover link

-                               throw $this->createNotFoundException($this->translator->trans('Outdated recover link', [], $this->alias));
+                               throw new GoneHttpException($this->translator->trans('Outdated recover link', [], $this->alias));

                        }
 
                        //Set context
                        }
 
                        //Set context