fix(filefield): mandatory fails when file is uploaded

also fix display of files in formansxer

Signed-off-by: Thierry Bugier <[email protected]>

inc/field/filefield.class.php

@@ -133,7 +133,8 @@ public function isValid(): bool {
       }
 
       // If the field is required it can't be empty
-      if (($this->isRequired() && count($this->uploadData) < 1)) {
+      $key = '_formcreator_field_' . $this->question->getID();
+      if (($this->isRequired() && count($this->uploads[$key]) < 1)) {
          Session::addMessageAfterRedirect(
             sprintf(__('A required file is missing: %s', 'formcreator'), $this->getLabel()),
             false,
@@ -179,7 +180,11 @@ public function saveUploads($input) {
    }
 
    public function hasInput($input): bool {
-      return isset($input['_formcreator_field_' . $this->question->getID()]);
+      // key with unserscore when testing unput from a requester
+      // key without underscore when testing data from DB (display a saved answer)
+      $key = 'formcreator_field_' . $this->question->getID();
+      return isset($input["_$key"])
+         || isset($input[$key]);
    }
 
    /**
@@ -254,6 +259,13 @@ public function parseAnswerValues($input, $nonDestructive = false): bool {
          }
          return true;
       }
+      if (isset($input[$key])) {
+         // To restore input from database
+         $this->uploadData = json_decode($input[$key]);
+         $this->value = __('Attached document', 'formcreator');
+         return true;
+
+      }
       $this->uploadData = [];
       $this->value = '';
       return true;