X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/0dacd7d23d5b201804a277284b15c6f5e47f99c3..662088d3b367d419c5861e992913b29ed830f316:/Controller/UserController.php

diff --git a/Controller/UserController.php b/Controller/UserController.php
index 8f3e4f4..4058c91 100644
--- a/Controller/UserController.php
+++ b/Controller/UserController.php
@@ -12,6 +12,9 @@
 namespace Rapsys\UserBundle\Controller;
 
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+
+use Rapsys\UserBundle\RapsysUserBundle;
+
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
@@ -22,8 +25,6 @@ use Symfony\Component\Mime\Address;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 
-use Rapsys\UserBundle\RapsysUserBundle;
-
 /**
  * {@inheritdoc}
  */
@@ -495,7 +496,7 @@ class UserController extends AbstractController {
 					//Create message
 					$message = (new TemplatedEmail())
 						//Set sender
-						->from(new Address($this->config['contact']['address'], $this->config['contact']['name']))
+						->from(new Address($this->config['contact']['address'], $this->translator->trans($this->config['contact']['name'])))
 						//Set recipient
 						//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
 						->to(new Address($context['recipient_mail'], $context['recipient_name']))
@@ -553,7 +554,7 @@ class UserController extends AbstractController {
 			//Log new user infos
 			$this->logger->emergency(
 				$this->translator->trans(
-					'register: mail=%mail% locale=%locale% confirm=%confirm%',
+					'register: mail=%mail% locale=%locale% confirm=%confirm% ip=%ip%',
 					[
 						'%mail%' => $postMail = $_POST['register']['mail'],
 						'%locale%' => $request->getLocale(),
@@ -565,7 +566,8 @@ class UserController extends AbstractController {
 								'hash' => $this->slugger->hash($postSmail)
 							]+$this->config['route']['confirm']['context'],
 							UrlGeneratorInterface::ABSOLUTE_URL
-						)
+						),
+						'%ip%' => $request->getClientIp()
 					]
 				)
 			);
@@ -581,6 +583,8 @@ class UserController extends AbstractController {
 		$form = $this->factory->create($this->config['register']['view']['form'], $user, [
 			//Set action to register route name and context
 			'action' => $this->generateUrl($this->config['route']['register']['name'], $this->config['route']['register']['context']),
+			//Set captcha
+			'captcha' => true,
 			//Set civility class
 			'civility_class' => $this->config['class']['civility'],
 			//Set civility default
@@ -687,7 +691,7 @@ class UserController extends AbstractController {
 				//Create message
 				$message = (new TemplatedEmail())
 					//Set sender
-					->from(new Address($this->config['contact']['address'], $this->config['contact']['name']))
+					->from(new Address($this->config['contact']['address'], $this->translator->trans($this->config['contact']['name'])))
 					//Set recipient
 					//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
 					->to(new Address($context['recipient_mail'], $context['recipient_name']))