Emails now send in HTML and are formatted better

pvtl · Mar 26, 2018 · f4c4b33 · f4c4b33
1 parent abc112f
commit f4c4b33
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 11 deletions.
diff --git a/database/seeds/SettingsTableSeeder.php b/database/seeds/SettingsTableSeeder.php
@@ -9,18 +9,31 @@ class SettingsTableSeeder extends Seeder
 {
     public function run()
     {
-        $setting = $this->findSetting('forms.default_email');
+        $setting = $this->findSetting('forms.default_to_email');
 
         if (!$setting->exists) {
             $setting->fill([
-                'display_name' => 'Default Enquiry Email',
+                'display_name' => 'Default Enquiry To Email',
                 'value' => '',
                 'details' => 'The default email address to send form enquiries to',
                 'type' => 'text',
                 'order' => 1,
                 'group' => 'Forms',
             ])->save();
         }
+
+        $setting = $this->findSetting('forms.default_from_email');
+
+        if (!$setting->exists) {
+            $setting->fill([
+                'display_name' => 'Default Enquiry From Email',
+                'value' => '',
+                'details' => 'The default email address to use as the sender address for form enquiries',
+                'type' => 'text',
+                'order' => 2,
+                'group' => 'Forms',
+            ])->save();
+        }
     }
 
     protected function findSetting($key)

diff --git a/resources/views/enquiries/view.blade.php b/resources/views/enquiries/view.blade.php
@@ -61,10 +61,6 @@
                         <h3 class="panel-title">Submitted Data</h3>
 
                         @foreach ($enquiry->data as $key => $value)
-                            @if (in_array($key, ['_token', 'id']))
-                                @continue
-                            @endif
-
                             <div class="panel panel-bordered">
                                 <div class="panel-body">
                                     <b>{{ str_replace('_', ' ', $key) }}</b>

diff --git a/src/Http/Controllers/EnquiryController.php b/src/Http/Controllers/EnquiryController.php
@@ -6,13 +6,14 @@
 use Pvtl\VoyagerForms\Form;
 use Pvtl\VoyagerForms\FormEnquiry;
 use Pvtl\VoyagerForms\Traits\DataType;
+use Pvtl\VoyagerForms\Traits\Email;
 use Pvtl\VoyagerFrontend\Helpers\ClassEvents;
 use TCG\Voyager\Facades\Voyager;
 use TCG\Voyager\Http\Controllers\VoyagerBreadController as BaseVoyagerBreadController;
 
 class EnquiryController extends BaseVoyagerBreadController
 {
-    use DataType;
+    use DataType, Email;
 
     /**
      * @param Request $request
@@ -55,7 +56,7 @@ public function create(Request $request)
      */
     public function store(Request $request)
     {
-        $formData = $request->all();
+        $formData = $request->except(['_token', 'id']);
         $form = Form::where('id', $request->input('id'))->first();
 
         if ($form->hook) {
@@ -69,9 +70,7 @@ public function store(Request $request)
             'ip_address' => $_SERVER['REMOTE_ADDR'],
         ])->save();
 
-        foreach (explode(',', str_replace(' ', '', $form->mailto)) as $recipient) {
-            mail($recipient, "New Form Enquiry - $form->title", implode("\r", $formData));
-        }
+        $this->sendEmail($form, $formData);
 
         return redirect()
             ->back();

diff --git a/src/Traits/Email.php b/src/Traits/Email.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Pvtl\VoyagerForms\Traits;
+
+use Pvtl\VoyagerForms\Form;
+
+trait Email
+{
+    public function sendEmail(Form $form, array $formData)
+    {
+        $recipients = explode(',', str_replace(' ', '', $form->mailto));
+
+        $subject = "New Form Enquiry - $form->title";
+
+        $headers = "From: " . setting('forms.default_from_email') . "\r\n";
+        $headers .= "Reply-To: ". setting('forms.default_from_email') . "\r\n";
+        $headers .= "MIME-Version: 1.0\r\n";
+        $headers .= "Content-Type: text/html; charset=ISO-8859-1\r\n";
+
+        $emailData = [];
+
+        array_unshift($emailData, "<html><body>");
+
+        foreach ($formData as $key => $value) {
+            $realKey = str_replace('_', ' ', $key);
+            $emailData[] = "$realKey: $value<br>";
+        }
+
+        $emailData = implode("\r\r", $emailData);
+        $emailData .= "</body></html>";
+
+        foreach ($recipients as $to) {
+            mail($to, $subject, $emailData, $headers);
+        }
+    }
+}