From 2e60a79e4060aaa2542f64fc4b3688ed1d115aa2 Mon Sep 17 00:00:00 2001 From: Alexandre Saelens Date: Thu, 17 Jan 2019 12:02:57 +1300 Subject: [PATCH 1/2] Check recipient alternate from/to fields exists --- code/Control/UserDefinedFormController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php index 02c93bf..53e781e 100644 --- a/code/Control/UserDefinedFormController.php +++ b/code/Control/UserDefinedFormController.php @@ -326,7 +326,7 @@ JS } // check to see if they are a dynamic reply to. eg based on a email field a user selected - if ($recipient->SendEmailFromField()) { + if ($recipient->SendEmailFromField() && $recipient->SendEmailFromField()->exists()) { $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailFromField()->Name); if ($submittedFormField && is_string($submittedFormField->Value)) { @@ -342,7 +342,7 @@ JS } // check to see if they are a dynamic reciever eg based on a dropdown field a user selected - if ($recipient->SendEmailToField()) { + if ($recipient->SendEmailToField() && $recipient->SendEmailToField()->exists()) { $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailToField()->Name); if ($submittedFormField && is_string($submittedFormField->Value)) { @@ -355,7 +355,7 @@ JS } // check to see if there is a dynamic subject - if ($recipient->SendEmailSubjectField()) { + if ($recipient->SendEmailSubjectField() && $recipient->SendEmailSubjectField()->exists()) { $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailSubjectField()->Name); if ($submittedFormField && trim($submittedFormField->Value)) { From 6acee54596c6aa3a76b8f47d3cc6f6f8e0a68638 Mon Sep 17 00:00:00 2001 From: Alexandre Saelens Date: Thu, 17 Jan 2019 12:47:09 +1300 Subject: [PATCH 2/2] Avoid calling getter twice --- code/Control/UserDefinedFormController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php index 53e781e..7aade34 100644 --- a/code/Control/UserDefinedFormController.php +++ b/code/Control/UserDefinedFormController.php @@ -326,7 +326,8 @@ JS } // check to see if they are a dynamic reply to. eg based on a email field a user selected - if ($recipient->SendEmailFromField() && $recipient->SendEmailFromField()->exists()) { + $emailFrom = $recipient->SendEmailFromField(); + if ($emailFrom && $emailFrom->exists()) { $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailFromField()->Name); if ($submittedFormField && is_string($submittedFormField->Value)) { @@ -342,7 +343,8 @@ JS } // check to see if they are a dynamic reciever eg based on a dropdown field a user selected - if ($recipient->SendEmailToField() && $recipient->SendEmailToField()->exists()) { + $emailTo = $recipient->SendEmailToField(); + if ($emailTo && $emailTo->exists()) { $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailToField()->Name); if ($submittedFormField && is_string($submittedFormField->Value)) { @@ -355,7 +357,8 @@ JS } // check to see if there is a dynamic subject - if ($recipient->SendEmailSubjectField() && $recipient->SendEmailSubjectField()->exists()) { + $emailSubject = $recipient->SendEmailSubjectField(); + if ($emailSubject && $emailSubject->exists()) { $submittedFormField = $submittedFields->find('Name', $recipient->SendEmailSubjectField()->Name); if ($submittedFormField && trim($submittedFormField->Value)) {