fix(datefield,datetimefield): avoid PHP warnings

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jan 28, 2020 · 90f8259 · 90f8259
1 parent 9233628
commit 90f8259
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/inc/fields/datefield.class.php b/inc/fields/datefield.class.php
@@ -73,7 +73,7 @@ public function getRenderedHtml($canEdit = true) {
       if (!$canEdit) {
          return $this->value;
       }
-      
+
       $html = '';
       $id        = $this->question->getID();
       $rand      = mt_rand();
@@ -164,12 +164,20 @@ public function lessThan($value) {
    }
 
    public function parseAnswerValues($input, $nonDestructive = false) {
-
       $key = 'formcreator_field_' . $this->question->getID();
+      if (!isset($input[$key])) {
+         $input[$key] = '';
+      }
+
       if (!is_string($input[$key])) {
          return false;
       }
 
+      if ($input[$key] != ''
+         && DateTime::createFromFormat("Y-m-d", $input[$key]) === false) {
+         return false;
+      }
+
       $this->value = $input[$key];
       return true;
    }

diff --git a/inc/fields/datetimefield.class.php b/inc/fields/datetimefield.class.php
@@ -168,6 +168,9 @@ public function lessThan($value) {
 
    public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->question->getID();
+      if (!isset($input[$key])) {
+         $input[$key] = '';
+      }
       if (!is_string($input[$key])) {
          return false;
       }