Mails from and subject changed

ezpublishlegacy · Sep 2, 2015 · 632a55c · 632a55c
1 parent 929d482
commit 632a55c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Command/ActivationEmailsCommand.php b/Command/ActivationEmailsCommand.php
@@ -42,7 +42,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 $message = \Swift_Message::newInstance()
                     ->setSubject('Say hello to Summer Camp 2015!')
-                    ->setFrom('info@netgen.hr')
+                    ->setFrom(array('info@netgen.hr' => 'PHP/eZ Publish Summer Camp 2015'))
                     ->setTo($user_email)
                     ->setBody(
                         $this->getContainer()->get('templating')->render(
@@ -63,8 +63,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $emailHash = md5($this->getContainer()->getParameter('email_hash_prefix') . $user_email);
 
                 $message = \Swift_Message::newInstance()
-                    ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire')
-                    ->setFrom('info@netgen.hr')
+                    ->setSubject('Questionnaire')
+                    ->setFrom(array('info@netgen.hr' => 'PHP/eZ Publish Summer Camp 2015'))
                     ->setTo($user_email)
                     ->setBody(
                         $this->getContainer()->get('templating')->render(

diff --git a/Controller/UserAdminController.php b/Controller/UserAdminController.php
@@ -268,7 +268,7 @@ public function loginEmailAction(Request $request, $typeOf)
             {
                 $message = \Swift_Message::newInstance()
                     ->setSubject('Say hello to Summer Camp 2015!')
-                    ->setFrom('info@netgen.hr')
+                    ->setFrom(array('info@netgen.hr' => 'PHP/eZ Publish Summer Camp 2015'))
                     ->setTo($user_email)
                     ->setBody(
                         $this->renderView(
@@ -281,8 +281,8 @@ public function loginEmailAction(Request $request, $typeOf)
             else if ($typeOf === '1')
             {
                 $message = \Swift_Message::newInstance()
-                    ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire')
-                    ->setFrom('info@netgen.hr')
+                    ->setSubject('Questionnaire')
+                    ->setFrom(array('info@netgen.hr' => 'PHP/eZ Publish Summer Camp 2015'))
                     ->setTo($user_email)
                     ->setBody(
                         $this->renderView(
@@ -325,7 +325,7 @@ public function oneUserLoginEmailAction(Request $request, $id, $typeOf)
         {
             $message = \Swift_Message::newInstance()
                 ->setSubject('Say hello to Summer Camp 2015!')
-                ->setFrom('info@netgen.hr')
+                ->setFrom(array('info@netgen.hr' => 'PHP/eZ Publish Summer Camp 2015'))
                 ->setTo($user_email)
                 ->setBody(
                     $this->renderView(
@@ -338,8 +338,8 @@ public function oneUserLoginEmailAction(Request $request, $id, $typeOf)
         else if ($typeOf === '1')
         {
             $message = \Swift_Message::newInstance()
-                ->setSubject('PHP & eZ Publish Summer Camp 2015 - Questionnaire')
-                ->setFrom('info@netgen.hr')
+                ->setSubject('Questionnaire')
+                ->setFrom(array('info@netgen.hr' => 'PHP/eZ Publish Summer Camp 2015'))
                 ->setTo($user_email)
                 ->setBody(
                     $this->renderView(