Version 0.5.5

[userbundle] / Controller / UserController.php

diff --git a/Controller/UserController.php b/Controller/UserController.php
index f72a4ee2bda1731c75e7b0d68fbb04331685a258..22ce0f8052f5d9166f057379237fdd4bcdf7971a 100644 (file)
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -37,7 +37,7 @@ class UserController extends AbstractController {
         */
        public function index(Request $request): Response {
                //Without admin
         */
        public function index(Request $request): Response {
                //Without admin

-               if (!$this->checker->isGranted($this->config['default']['admin'])) {
+               if (!$this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin']))) {

                        //Throw 403
                        throw $this->createAccessDeniedException($this->translator->trans('Unable to list users', [], $this->alias));
                }
                        //Throw 403
                        throw $this->createAccessDeniedException($this->translator->trans('Unable to list users', [], $this->alias));
                }


@@ -92,7 +92,7 @@ class UserController extends AbstractController {
                if (!($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
                        //Add error message mail already exists
                        //XXX: prevent slugger reverse engineering by not displaying decoded mail
                if (!($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
                        //Add error message mail already exists
                        //XXX: prevent slugger reverse engineering by not displaying decoded mail

-                       $this->addFlash('error', $this->translator->trans('Account do not exists', [], $this->alias));
+                       $this->addFlash('error', $this->translator->trans('The account do not exists', [], $this->alias));

 
                        //Redirect to register view
                        return $this->redirectToRoute($this->config['route']['register']['name'], $this->config['route']['register']['context']);
 
                        //Redirect to register view
                        return $this->redirectToRoute($this->config['route']['register']['name'], $this->config['route']['register']['context']);


@@ -140,7 +140,7 @@ class UserController extends AbstractController {
                }
 
                //Prevent access when not admin, user is not guest and not currently logged user
                }
 
                //Prevent access when not admin, user is not guest and not currently logged user

-               if (!$this->checker->isGranted($this->config['default']['admin']) && $user != $this->security->getUser() || !$this->checker->isGranted('IS_AUTHENTICATED_FULLY')) {
+               if (!$this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin'])) && $user != $this->security->getUser() || !$this->checker->isGranted('IS_AUTHENTICATED_FULLY')) {

                        //Throw access denied
                        //XXX: prevent slugger reverse engineering by not displaying decoded mail
                        throw $this->createAccessDeniedException($this->translator->trans('Unable to access user', [], $this->alias));
                        //Throw access denied
                        //XXX: prevent slugger reverse engineering by not displaying decoded mail
                        throw $this->createAccessDeniedException($this->translator->trans('Unable to access user', [], $this->alias));


@@ -155,17 +155,17 @@ 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
                        'method' => 'POST',
                        //Set domain
                        'translation_domain' => $this->alias
                        //Disable password
                        'password' => false,
                        //Set method
                        'method' => 'POST',
                        //Set domain
                        'translation_domain' => $this->alias

-               ]+($this->checker->isGranted($this->config['default']['admin'])?$this->config['edit']['admin']:$this->config['edit']['field']));
+               ]+($this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin']))?$this->config['edit']['admin']:$this->config['edit']['field']));

 
                //With admin role
 
                //With admin role

-               if ($this->checker->isGranted($this->config['default']['admin'])) {
+               if ($this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin']))) {

                        //Create the EditType form and give the proper parameters
                        $reset = $this->factory->create($this->config['edit']['view']['reset'], $user, [
                                //Set action to edit route name and context
                        //Create the EditType form and give the proper parameters
                        $reset = $this->factory->create($this->config['edit']['view']['reset'], $user, [
                                //Set action to edit route name and context


@@ -233,12 +233,12 @@ class UserController extends AbstractController {
                                //Catch double slug or mail
                                } catch (UniqueConstraintViolationException $e) {
                                        //Add error message mail already exists
                                //Catch double slug or mail
                                } catch (UniqueConstraintViolationException $e) {
                                        //Add error message mail already exists

-                                       $this->addFlash('error', $this->translator->trans('Account already exists', [], $this->alias));
+                                       $this->addFlash('error', $this->translator->trans('The account already exists', [], $this->alias));

                                }
                        }
                //Without admin role
                //XXX: prefer a reset on login to force user unspam action
                                }
                        }
                //Without admin role
                //XXX: prefer a reset on login to force user unspam action

-               } elseif (!$this->checker->isGranted($this->config['default']['admin'])) {
+               } elseif (!$this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin']))) {

                        //Add notice
                        $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure', [], $this->alias));
                }
                        //Add notice
                        $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure', [], $this->alias));
                }


@@ -248,7 +248,7 @@ class UserController extends AbstractController {
                        //Template
                        $this->config['edit']['view']['name'],
                        //Context
                        //Template
                        $this->config['edit']['view']['name'],
                        //Context

-                       ['register' => $edit->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['edit']['view']['context']
+                       ['register' => $edit->createView()]+$this->config['edit']['view']['context']

                );
        }
 
                );
        }
 


@@ -338,7 +338,7 @@ class UserController extends AbstractController {
                        //Template
                        $this->config['login']['view']['name'],
                        //Context
                        //Template
                        $this->config['login']['view']['name'],
                        //Context

-                       ['login' => $login->createView(), 'disabled' => $request->query->get('disabled', 0), 'sent' => $request->query->get('sent', 0)]+$context+$this->config['login']['view']['context']
+                       ['login' => $login->createView(), 'disabled' => $request->query->get('disabled', 0)]+$context+$this->config['login']['view']['context']

                );
        }
 
                );
        }
 


@@ -473,32 +473,6 @@ class UserController extends AbstractController {
                                                }
                                        }
 
                                                }
                                        }
 

-                                       //Iterate on keys to translate
-                                       foreach($this->config['translate'] as $translate) {
-                                               //Extract keys
-                                               $keys = explode('.', $translate);
-
-                                               //Set current
-                                               $current =& $context;
-
-                                               //Iterate on each subkey
-                                               do {
-                                                       //Skip unset translation keys
-                                                       if (!isset($current[current($keys)])) {
-                                                               continue(2);
-                                                       }
-
-                                                       //Set current to subkey
-                                                       $current =& $current[current($keys)];
-                                               } while(next($keys));
-
-                                               //Set translation
-                                               $current = $this->translator->trans($current, [], $this->alias);
-
-                                               //Remove reference
-                                               unset($current);
-                                       }
-

                                        //Translate subject
                                        $context['subject'] = $subject = ucfirst(
                                                $this->translator->trans(
                                        //Translate subject
                                        $context['subject'] = $subject = ucfirst(
                                                $this->translator->trans(


@@ -525,20 +499,23 @@ class UserController extends AbstractController {
                                                //Set context
                                                ->context($context);
 
                                                //Set context
                                                ->context($context);
 

+                                       //Add created notice
+                                       $this->addFlash('notice', $this->translator->trans('Account recovered', [], $this->alias));
+

                                        //Try sending message
                                        //XXX: mail delivery may silently fail
                                        try {
                                                //Send message
                                                $this->mailer->send($message);
 
                                        //Try sending message
                                        //XXX: mail delivery may silently fail
                                        try {
                                                //Send message
                                                $this->mailer->send($message);
 

-                                               //Add notice
+                                               //Add sent notice

                                                $this->addFlash('notice', $this->translator->trans('Your recovery mail has been sent, to retrieve your account follow the recuperate link inside', [], $this->alias));
 
                                                //Add junk warning
                                                $this->addFlash('warning', $this->translator->trans('If you did not receive a recovery mail, check your Spam or Junk mail folder', [], $this->alias));
 
                                                $this->addFlash('notice', $this->translator->trans('Your recovery mail has been sent, to retrieve your account follow the recuperate link inside', [], $this->alias));
 
                                                //Add junk warning
                                                $this->addFlash('warning', $this->translator->trans('If you did not receive a recovery mail, check your Spam or Junk mail folder', [], $this->alias));
 

-                                               //Redirect on the same route with sent=1 to cleanup form
-                                               return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params'), 302);
+                                               //Redirect on home route to cleanup form
+                                               return $this->redirectToRoute($this->config['route']['home']['name'], $this->config['route']['home']['context']);

                                        //Catch obvious transport exception
                                        } catch(TransportExceptionInterface $e) {
                                                //Add error message mail unreachable
                                        //Catch obvious transport exception
                                        } catch(TransportExceptionInterface $e) {
                                                //Add error message mail unreachable


@@ -553,7 +530,7 @@ class UserController extends AbstractController {
                        //Template
                        $this->config['recover']['view']['name'],
                        //Context
                        //Template
                        $this->config['recover']['view']['name'],
                        //Context

-                       ['recover' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['recover']['view']['context']
+                       ['recover' => $form->createView()]+$this->config['recover']['view']['context']

                );
        }
 
                );
        }
 


@@ -609,7 +586,7 @@ class UserController extends AbstractController {
                        'method' => 'POST',
                        //Set domain
                        'translation_domain' => $this->alias
                        'method' => 'POST',
                        //Set domain
                        'translation_domain' => $this->alias

-               ]+($this->checker->isGranted($this->config['default']['admin'])?$this->config['register']['admin']:$this->config['register']['field']));
+               ]+($this->checker->isGranted('ROLE_'.strtoupper($this->config['default']['admin']))?$this->config['register']['admin']:$this->config['register']['field']));

 
                //With post method
                if ($request->isMethod('POST')) {
 
                //With post method
                if ($request->isMethod('POST')) {


@@ -672,32 +649,6 @@ class UserController extends AbstractController {
                                        }
                                }
 
                                        }
                                }
 

-                               //Iterate on keys to translate
-                               foreach($this->config['translate'] as $translate) {
-                                       //Extract keys
-                                       $keys = explode('.', $translate);
-
-                                       //Set current
-                                       $current =& $context;
-
-                                       //Iterate on each subkey
-                                       do {
-                                               //Skip unset translation keys
-                                               if (!isset($current[current($keys)])) {
-                                                       continue(2);
-                                               }
-
-                                               //Set current to subkey
-                                               $current =& $current[current($keys)];
-                                       } while(next($keys));
-
-                                       //Set translation
-                                       $current = $this->translator->trans($current, [], $this->alias);
-
-                                       //Remove reference
-                                       unset($current);
-                               }
-

                                //Translate subject
                                $context['subject'] = $subject = ucfirst(
                                        $this->translator->trans(
                                //Translate subject
                                $context['subject'] = $subject = ucfirst(
                                        $this->translator->trans(


@@ -729,7 +680,7 @@ class UserController extends AbstractController {
                                        //Send to database
                                        $this->manager->flush();
 
                                        //Send to database
                                        $this->manager->flush();
 

-                                       //Add error message mail already exists
+                                       //Add created notice

                                        $this->addFlash('notice', $this->translator->trans('Account created', [], $this->alias));
 
                                        //Try sending message
                                        $this->addFlash('notice', $this->translator->trans('Account created', [], $this->alias));
 
                                        //Try sending message


@@ -738,8 +689,14 @@ class UserController extends AbstractController {
                                                //Send message
                                                $this->mailer->send($message);
 
                                                //Send message
                                                $this->mailer->send($message);
 

-                                               //Redirect on the same route with sent=1 to cleanup form
-                                               return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params'));
+                                               //Add verification notice
+                                               $this->addFlash('notice', $this->translator->trans('Your verification mail has been sent, to activate your account you must follow the confirmation link inside', [], $this->alias));
+
+                                               //Add junk warning
+                                               $this->addFlash('warning', $this->translator->trans('If you did not receive a verification mail, check your Spam or Junk mail folders', [], $this->alias));
+
+                                               //Redirect on home route to cleanup form
+                                               return $this->redirectToRoute($this->config['route']['home']['name'], $this->config['route']['home']['context']);

                                        //Catch obvious transport exception
                                        } catch(TransportExceptionInterface $e) {
                                                //Add error message mail unreachable
                                        //Catch obvious transport exception
                                        } catch(TransportExceptionInterface $e) {
                                                //Add error message mail unreachable


@@ -748,7 +705,7 @@ class UserController extends AbstractController {
                                //Catch double subscription
                                } catch (UniqueConstraintViolationException $e) {
                                        //Add error message mail already exists
                                //Catch double subscription
                                } catch (UniqueConstraintViolationException $e) {
                                        //Add error message mail already exists

-                                       $this->addFlash('error', $this->translator->trans('Account already exists', [], $this->alias));
+                                       $this->addFlash('error', $this->translator->trans('The account already exists', [], $this->alias));

                                }
                        }
                }
                                }
                        }
                }


@@ -758,7 +715,7 @@ class UserController extends AbstractController {
                        //Template
                        $this->config['register']['view']['name'],
                        //Context
                        //Template
                        $this->config['register']['view']['name'],
                        //Context

-                       ['register' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['register']['view']['context']
+                       ['register' => $form->createView()]+$this->config['register']['view']['context']

                );
        }
 }
                );
        }
 }