X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/763dfb9aac8018366127cbf61415a9546774ef00..4410d36adc12ea31e92ae01163fd4d69238d501a:/Controller/DefaultController.php diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php index c8bb8a5..02e0d16 100644 --- a/Controller/DefaultController.php +++ b/Controller/DefaultController.php @@ -136,13 +136,11 @@ class DefaultController extends AbstractController { 'civility_default' => $doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']), //Disable mail 'mail' => $this->isGranted('ROLE_ADMIN'), - //Disable slug - 'slug' => $this->isGranted('ROLE_ADMIN'), //Disable password 'password' => false, //Set method 'method' => 'POST' - ]); + ]+$this->config['edit']['field']); //With admin role if ($this->isGranted('ROLE_ADMIN')) { @@ -202,21 +200,6 @@ class DefaultController extends AbstractController { //Set data $data = $edit->getData(); - //Set slug - $slug = null; - - //With admin - if ($this->isGranted('ROLE_ADMIN')) { - //With slug - if (!empty($data->getSlug())) { - //Set slug - $slug = $slugger->slug($data->getPseudonym()); - } - - //Update slug - $data->setSlug($slug); - } - //Queue snippet save $manager->persist($data); @@ -609,18 +592,21 @@ class DefaultController extends AbstractController { //With disabled existing if ($existing->isDisabled()) { //Render view - return $this->render( + $response = $this->render( //Template $this->config['register']['view']['name'], //Context - ['title' => $this->translator->trans('Access denied'), 'disabled' => 1]+$this->config['register']['view']['context'], - //Set 403 - new Response('', 403) + ['title' => $this->translator->trans('Access denied'), 'disabled' => 1]+$this->config['register']['view']['context'] ); + + //Set 403 + $response->setStatusCode(403); + + //Return response + return $response; //With unactivated existing } elseif (!$existing->isActivated()) { //Set mail shortcut - //TODO: change for activate ??? $activateMail =& $this->config['register']['mail']; //Generate each route route @@ -735,10 +721,7 @@ class DefaultController extends AbstractController { $sfield = $field; //Reset field - $field = [ - //Without slug - 'slug' => false - ]; + $field = []; } //Init reflection @@ -759,7 +742,7 @@ class DefaultController extends AbstractController { 'mail' => true, //Set method 'method' => 'POST' - ]); + ]+$this->config['register']['field']); if ($request->isMethod('POST')) { //Refill the fields in case the form is not valid. @@ -787,18 +770,6 @@ class DefaultController extends AbstractController { //Set mail shortcut $registerMail =& $this->config['register']['mail']; - //Extract names and pseudonym from mail - $names = explode(' ', $pseudonym = ucwords(trim(preg_replace('/[^a-zA-Z]+/', ' ', current(explode('@', $data->getMail())))))); - - //Set pseudonym - $user->setPseudonym($user->getPseudonym()??$pseudonym); - - //Set forename - $user->setForename($user->getForename()??$names[0]); - - //Set surname - $user->setSurname($user->getSurname()??$names[1]??$names[0]); - //Set password $user->setPassword($encoder->encodePassword($user, $user->getPassword()??$data->getMail()));