Merge pull request #538 from dotkernel/issue537

moved email message to & cc names to config file

Author: alexmerlin

config/autoload/local.php.dist

@@ -45,12 +45,20 @@ return [
         ],
     ],
     'contact'             => [
-        'notification_receivers' => [],
-        'message_receivers'      => [
-            'to' => [
+        'subject'            => 'Dotkernel Contact',
+        'message_sender'     => [
+            'from_name'  => '',
+            'from_email' => '',
+        ],
+        'message_recipients' => [
+            'name' => 'Dotkernel Team',
+            'to'   => [
+                '[email protected]',
+            ],
+            'cc'   => [
                 '[email protected]',
             ],
-            'cc' => [
+            'bcc'  => [
                 '[email protected]',
             ],
         ],

src/Contact/src/Controller/ContactController.php

@@ -65,7 +65,7 @@ public function formAction(): ResponseInterface
                 $this->messenger->addError('Missing recaptcha');
                 return new RedirectResponse($request->getUri(), 303);
             }
-            $data['subject'] = $data['subject'] ?: $this->config['application']['name'] . ' Contact';
+
             $form->setData($data);
             if ($form->isValid()) {
                 /** @var array $dataForm */

src/Contact/src/Form/ContactForm.php

@@ -8,7 +8,6 @@
 use Frontend\Contact\InputFilter\ContactInputFilter;
 use Laminas\Form\Element\Csrf;
 use Laminas\Form\Element\Email;
-use Laminas\Form\Element\Hidden;
 use Laminas\Form\Element\Text;
 use Laminas\Form\Element\Textarea;
 use Laminas\Form\Form;
@@ -62,18 +61,6 @@ public function init(): void
             'type'       => Text::class,
         ]);
 
-        $this->add([
-            'name'       => 'subject',
-            'options'    => [
-                'label' => 'Subject',
-            ],
-            'attributes' => [
-                'placeholder' => 'Subject...',
-                'class'       => 'form-control',
-            ],
-            'type'       => Hidden::class,
-        ]);
-
         $this->add([
             'name'       => 'message',
             'options'    => [

src/Contact/src/InputFilter/ContactInputFilter.php

@@ -53,20 +53,6 @@ public function init(): void
             ], true);
         $this->add($name);
 
-        $subject = new Input('subject');
-        $subject->setRequired(false);
-        $subject->getFilterChain()
-            ->attachByName(StringTrim::class)
-            ->attachByName(StripTags::class);
-        $subject->getValidatorChain()
-            ->attachByName(NotEmpty::class, [
-                'message' => '<b>Subject</b> is required and cannot be empty',
-            ], true)
-            ->attachByName(StringLength::class, [
-                'max' => 500,
-            ], true);
-        $this->add($subject);
-
         $message = new Input('message');
         $message->setRequired(true);
         $message->getFilterChain()

src/Contact/src/Service/MessageService.php

@@ -34,10 +34,13 @@ public function getRepository(): MessageRepository
 
     public function processMessage(array $data): bool
     {
+        $subject = $this->config['contact']['subject'] ?? $this->config['dot_mail']['message_options']['subject']
+            ?: $this->config['application']['name'] . ' Contact';
+
         $message = new Message(
             $data['email'],
             $data['name'],
-            $data['subject'],
+            $subject,
             $data['message'],
             Message::PLATFORM_WEBSITE
         );
@@ -57,18 +60,28 @@ public function sendContactMail(Message $message): bool
         );
 
         $this->mailService->setSubject($message->getSubject());
-        $this->mailService->getMessage()->addFrom(
-            $this->config['dot_mail']['default']['message_options']['from'],
-            $this->config['dot_mail']['default']['message_options']['from_name']
+
+        $messageConfig     = $this->config['dot_mail']['default']['message_options'];
+        $contactSender     = $this->config['contact']['message_sender'];
+        $contactRecipients = $this->config['contact']['message_recipients'];
+
+        $this->mailService->getMessage()->setFrom(
+            $contactSender['from_email'] ?: $messageConfig['from'],
+            $contactSender['from_name'] ?: $messageConfig['from_name']
         );
-        $this->mailService->getMessage()->addTo(
-            $this->config['contact']['message_receivers']['to'],
-            'Dotkernel Team'
+
+        $this->mailService->getMessage()->setTo(
+            $contactRecipients['to'] ?: $messageConfig['to'],
+            $contactRecipients['name'] ?: null
         );
-        $this->mailService->getMessage()->addCC(
-            $this->config['contact']['message_receivers']['cc'],
-            'Dotkernel Team'
+
+        $this->mailService->getMessage()->setCc(
+            $contactRecipients['cc'] ?: $messageConfig['cc'],
+            $contactRecipients['name'] ?: null
         );
+
+        $this->mailService->getMessage()->setBcc($contactRecipients['bcc'] ?: $messageConfig['bcc']);
+
         $this->mailService->getMessage()->setReplyTo($message->getEmail(), $message->getName());
 
         return $this->mailService->send()->isValid();

src/Contact/templates/contact/contact-form.html.twig

@@ -37,12 +37,6 @@
                         </div>
                     </div>
 
-                    <div class="row">
-                        <div class="col-md-12">
-                            {{ formElement(form.get('subject')) }}
-                        </div>
-                    </div>
-
                     <div class="row">
                         <div class="col-md-12">
                             {{ formElement(form.get('message')) }}

test/Unit/Contact/Form/ContactFormTest.php

@@ -22,7 +22,6 @@ public function testFormHasElements(): void
         $this->formHasElements(new ContactForm(), [
             'email',
             'name',
-            'subject',
             'message',
             'contactCsrf',
         ]);
@@ -33,7 +32,6 @@ public function testFormHasInputFilter(): void
         $this->formHasInputFilter((new ContactForm())->getInputFilter(), [
             'email',
             'name',
-            'subject',
             'message',
             'contactCsrf',
         ]);

test/Unit/Contact/Service/MessageServiceTest.php

@@ -44,7 +44,7 @@ public function testProcessMessage(): void
         $result            = $this->createMock(ResultInterface::class);
         $mail              = $this->createMock(Email::class);
 
-        $mail->expects($this->once())->method('addFrom')->willReturn($mail);
+        $mail->expects($this->once())->method('setFrom')->willReturn($mail);
         $result->expects($this->once())->method('isValid')->willReturn(true);
         $mailService->expects($this->once())->method('send')->willReturn($result);
         $mailService->expects($this->any())->method('getMessage')->willReturn($mail);
@@ -54,9 +54,16 @@ public function testProcessMessage(): void
             $template,
             [
                 'contact'  => [
-                    'message_receivers' => [
-                        'to' => '[email protected]',
-                        'cc' => '[email protected]',
+                    'subject'            => 'test',
+                    'message_sender'     => [
+                        'from_name'  => 'Contact',
+                        'from_email' => '[email protected]',
+                    ],
+                    'message_recipients' => [
+                        'name' => 'Dotkernel Team',
+                        'to'   => '[email protected]',
+                        'cc'   => '[email protected]',
+                        'bcc'  => '[email protected]',
                     ],
                 ],
                 'dot_mail' => [