X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/34d5b979dc34fbbd89e3f321024a1a79718d0e6e..e1174c1eb4ece45e25930e368c7bdbf05e74aeaf:/Controller/DefaultController.php?ds=sidebyside

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 41009f8..a128ed4 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -303,7 +303,7 @@ class DefaultController extends AbstractController {
 					//Create message
 					$message = (new TemplatedEmail())
 						//Set sender
-						->from(new Address($this->config['contact']['mail'], $this->config['contact']['name']))
+						->from(new Address($this->config['contact']['mail'], $this->config['contact']['title']))
 						//Set recipient
 						//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
 						->to(new Address($mail['context']['recipient_mail'], $mail['context']['recipient_name']))
@@ -442,7 +442,7 @@ class DefaultController extends AbstractController {
 					//Create message
 					$message = (new TemplatedEmail())
 						//Set sender
-						->from(new Address($this->config['contact']['mail'], $this->config['contact']['name']))
+						->from(new Address($this->config['contact']['mail'], $this->config['contact']['title']))
 						//Set recipient
 						//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
 						->to(new Address($mail['context']['recipient_mail'], $mail['context']['recipient_name']))
@@ -505,8 +505,8 @@ class DefaultController extends AbstractController {
 
 		//Create the RegisterType form and give the proper parameters
 		$form = $this->createForm($this->config['register']['view']['form'], null, array(
-			'class_title' => $this->config['class']['title'],
-			'title' => $doctrine->getRepository($this->config['class']['title'])->findOneByTitle($this->config['default']['title']),
+			'class_civility' => $this->config['class']['civility'],
+			'civility' => $doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
 			//Set action to register route name and context
 			'action' => $this->generateUrl($this->config['route']['register']['name'], $this->config['route']['register']['context']),
 			'method' => 'POST'
@@ -549,7 +549,7 @@ class DefaultController extends AbstractController {
 				//Create message
 				$message = (new TemplatedEmail())
 					//Set sender
-					->from(new Address($this->config['contact']['mail'], $this->config['contact']['name']))
+					->from(new Address($this->config['contact']['mail'], $this->config['contact']['title']))
 					//Set recipient
 					//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
 					->to(new Address($mail['context']['recipient_mail'], $mail['context']['recipient_name']))
@@ -581,7 +581,7 @@ class DefaultController extends AbstractController {
 				$user->setPhone($data['phone']);
 				$user->setPassword($encoder->encodePassword($user, $data['password']));
 				$user->setActive(true);
-				$user->setTitle($data['title']);
+				$user->setCivility($data['civility']);
 
 				//Iterate on default group
 				foreach($this->config['default']['group'] as $i => $groupTitle) {