Prevent datetime overflow and fix notice

mailjet · Dec 13, 2018 · 1491475 · 1491475
1 parent 5ee217d
commit 1491475
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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;