diff --git a/src/widget/WP_Mailjet_Subscribe_Widget.php b/src/widget/WP_Mailjet_Subscribe_Widget.php index 38da050e..663d98ca 100644 --- a/src/widget/WP_Mailjet_Subscribe_Widget.php +++ b/src/widget/WP_Mailjet_Subscribe_Widget.php @@ -114,7 +114,6 @@ private function sendSubscriptionEmail($subscriptionOptionsSettings, $instance) $mailjetContactProperties = $this->getMailjetContactProperties(); $incorectTypeValue = !empty($instance[$locale]['invalid_data_format_message_input']) ? $instance[$locale]['invalid_data_format_message_input'] : Mailjeti18n::getTranslationsFromFile($locale, 'The value you entered is not in the correct format.'); - $dataProperties = array(); if(!empty($properties) && is_array($mailjetContactProperties) && !empty($mailjetContactProperties)) { foreach($properties as $propertyId => $propertyName) { if($propertyName == '') { @@ -144,9 +143,13 @@ private function sendSubscriptionEmail($subscriptionOptionsSettings, $instance) case "datetime": $propertyDate = str_replace('-', '/', $properties[$propertyId]); $datetime = \DateTime::createFromFormat("d/m/Y", $propertyDate); + $errors = \DateTime::getLastErrors(); if (!$datetime instanceof \DateTime) { return $incorectTypeValue; } + if (!empty($errors['warning_count'])) { + return $incorectTypeValue; + } break; case "bool": $booleans = array('true', 'false', '1', '0','yes', 'no', 'ok'); @@ -236,7 +239,7 @@ private function activateConfirmSubscriptionUrl() break; case "bool": $positiveBooleans = array('true', '1', 'yes', 'ok'); - if(in_array($propertyName, $positiveBooleans)) { + if(in_array($properties[$property['ID']], $positiveBooleans)) { $dataProperties[$property['Name']] = true; }else{ $dataProperties[$property['Name']] = false;