Rename contact.name to contact.title

[userbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 41009f8dbee38a4d0f5bf975387a28789ab8ab49..a128ed4bfd9d0bd32318a568d457ee7d00ede342 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -303,7 +303,7 @@ class DefaultController extends AbstractController {
                                        //Create message
                                        $message = (new TemplatedEmail())
                                                //Set sender
                                        //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']))
                                                //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
                                        //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']))
                                                //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(
 
                //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'
                        //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
                                //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']))
                                        //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->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) {
 
                                //Iterate on default group
                                foreach($this->config['default']['group'] as $i => $groupTitle) {