fix(filefield): uploaded files lost

When a requester uploads a file then trigger a field visibility update, files are processed early and moved. When saving answers, the file is no longer available for building the answer and the generated targets Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Apr 19, 2019 · 1cec1e0 · 1cec1e0
1 parent 04791f4
commit 1cec1e0
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 28 deletions.
diff --git a/inc/fieldinterface.class.php b/inc/fieldinterface.class.php
@@ -113,9 +113,10 @@ public function prepareQuestionInputForSave($input);
    /**
     * Read the value of the field from answers
     * @param array $input answers of all questions of the form
+    * @param boolean $nonDestructive for File field, ensure that the file uploads imported as document
     * @return boolean true on sucess, false otherwise
     */
-   public function parseAnswerValues($input);
+   public function parseAnswerValues($input, $nonDestructive = false);
 
    /**
     * Prepares an answer value for output in a target object

diff --git a/inc/fields.class.php b/inc/fields.class.php
@@ -325,7 +325,7 @@ public static function updateVisibility($input) {
             $question->fields['fieldtype'],
             $question
          );
-         $fields[$id]->parseAnswerValues($input);
+         $fields[$id]->parseAnswerValues($input, true);
       }
 
       $questionToShow = [];

diff --git a/inc/fields/actorfield.class.php b/inc/fields/actorfield.class.php
@@ -249,7 +249,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $this->value = [];

diff --git a/inc/fields/checkboxesfield.class.php b/inc/fields/checkboxesfield.class.php
@@ -114,7 +114,7 @@ public function getValueForDesign() {
       return implode("\r\n", $this->value);
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $input[$key] = [];

diff --git a/inc/fields/datefield.class.php b/inc/fields/datefield.class.php
@@ -146,7 +146,7 @@ public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
 
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {

diff --git a/inc/fields/datetimefield.class.php b/inc/fields/datetimefield.class.php
@@ -149,7 +149,7 @@ public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/descriptionfield.class.php b/inc/fields/descriptionfield.class.php
@@ -122,7 +122,7 @@ public function lessThan($value) {
       throw new PluginFormcreatorComparisonException('Meaningless comparison');
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       return true;
    }
 

diff --git a/inc/fields/dropdownfield.class.php b/inc/fields/dropdownfield.class.php
@@ -386,7 +386,7 @@ public function lessThan($value) {
       return !$this->greaterThan($value) && !$this->equals($value);
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $input[$key] = '0';

diff --git a/inc/fields/emailfield.class.php b/inc/fields/emailfield.class.php
@@ -138,7 +138,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/filefield.class.php b/inc/fields/filefield.class.php
@@ -188,7 +188,7 @@ private function saveDocument($file, $prefix) {
       return null;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (isset($input["_$key"])) {
          if (!is_array($input["_$key"])) {
@@ -197,12 +197,16 @@ public function parseAnswerValues($input) {
 
          $answer_value = [];
          $index = 0;
-         foreach ($input["_$key"] as $document) {
-            if (is_file(GLPI_TMP_DIR . '/' . $document)) {
-               $prefix = $input['_prefix_formcreator_field_' . $this->fields['id']][$index];
-               $answer_value[] = $this->saveDocument($document, $prefix);
+         if ($nonDestructive) {
+            $index = count($input["_$key"]);
+         } else {
+            foreach ($input["_$key"] as $document) {
+               if (is_file(GLPI_TMP_DIR . '/' . $document)) {
+                  $prefix = $input['_prefix_formcreator_field_' . $this->fields['id']][$index];
+                  $answer_value[] = $this->saveDocument($document, $prefix);
+               }
+               $index++;
             }
-            $index++;
          }
          $this->uploadData = $answer_value;
          $this->value = __('Attached document', 'formcreator');

diff --git a/inc/fields/floatfield.class.php b/inc/fields/floatfield.class.php
@@ -176,7 +176,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/hiddenfield.class.php b/inc/fields/hiddenfield.class.php
@@ -92,7 +92,7 @@ public static function getPrefs() {
       ];
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/hostnamefield.class.php b/inc/fields/hostnamefield.class.php
@@ -65,7 +65,7 @@ public static function getPrefs() {
       ];
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/integerfield.class.php b/inc/fields/integerfield.class.php
@@ -222,7 +222,7 @@ public function getEmptyParameters() {
       ];
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/ipfield.class.php b/inc/fields/ipfield.class.php
@@ -103,7 +103,7 @@ public static function getPrefs() {
       ];
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/ldapselectfield.class.php b/inc/fields/ldapselectfield.class.php
@@ -185,7 +185,7 @@ public static function getJSFields() {
       return "tab_fields_fields['ldapselect'] = 'showFields(" . implode(', ', $prefs) . ");';";
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $input[$key] = '';

diff --git a/inc/fields/multiselectfield.class.php b/inc/fields/multiselectfield.class.php
@@ -212,7 +212,7 @@ public static function getPrefs() {
       ];
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $input[$key] = [];

diff --git a/inc/fields/radiosfield.class.php b/inc/fields/radiosfield.class.php
@@ -106,7 +106,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (isset($input[$key])) {
          if (!is_string($input[$key])) {

diff --git a/inc/fields/selectfield.class.php b/inc/fields/selectfield.class.php
@@ -81,7 +81,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!is_string($input[$key])) {
          return false;

diff --git a/inc/fields/tagfield.class.php b/inc/fields/tagfield.class.php
@@ -124,7 +124,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $input[$key] = [];

diff --git a/inc/fields/textfield.class.php b/inc/fields/textfield.class.php
@@ -179,7 +179,7 @@ public static function getJSFields() {
       return "tab_fields_fields['text'] = 'showFields(" . implode(', ', $prefs) . ");';";
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          return false;

diff --git a/inc/fields/urgencyfield.class.php b/inc/fields/urgencyfield.class.php
@@ -69,7 +69,7 @@ public function prepareQuestionInputForSave($input) {
       return $input;
    }
 
-   public function parseAnswerValues($input) {
+   public function parseAnswerValues($input, $nonDestructive = false) {
       $key = 'formcreator_field_' . $this->fields['id'];
       if (!isset($input[$key])) {
          $input[$key] = '3';

diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -733,7 +733,6 @@ public function saveAnswers(PluginFormcreatorForm $form, $data, $fields) {
                   'plugin_formcreator_questions_id' => $questionId,
                ]);
                $answer->update([
-
                   'id'     => $answer->getID(),
                   'answer' => $fields[$questionId]->serializeValue(),
                ], 0);