fix(filefield): check all files, not only one

btry · btry · commit 3a26922eb3fc · 2018-08-29T15:48:24.000+02:00
Signed-off-by: btry &lt;tbugier@teclib.com&gt;
diff --git a/inc/fields/filefield.class.php b/inc/fields/filefield.class.php
@@ -69,14 +69,15 @@ public function isValid($value) {
 
       if (is_array($_POST['_formcreator_field_' . $this->fields['id']])
          && count($_POST['_formcreator_field_' . $this->fields['id']]) > 0) {
-         $file = current($_POST['_formcreator_field_' . $this->fields['id']]);
-         if (is_file(GLPI_TMP_DIR . '/' . $file)) {
-            return true;
+         foreach ($_POST['_formcreator_field_' . $this->fields['id']] as $file) {
+            if (!is_file(GLPI_TMP_DIR . '/' . $file)) {
+               Session::addMessageAfterRedirect(__('A required file is missing:', 'formcreator') . ' ' . $this->fields['name'], false, ERROR);
+               return false;
+            }
          }
       }
 
-      Session::addMessageAfterRedirect(__('A required file is missing:', 'formcreator') . ' ' . $this->fields['name'], false, ERROR);
-      return false;
+      return true;
    }
 
    public static function getName() {

Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,15 @@ public function isValid($value) {`
`69`	`69`
`70`	`70`	`if (is_array($_POST['_formcreator_field_' . $this->fields['id']])`
`71`	`71`	`&& count($_POST['_formcreator_field_' . $this->fields['id']]) > 0) {`
`72`		`- $file = current($_POST['_formcreator_field_' . $this->fields['id']]);`
`73`		`- if (is_file(GLPI_TMP_DIR . '/' . $file)) {`
`74`		`- return true;`
	`72`	`+ foreach ($_POST['_formcreator_field_' . $this->fields['id']] as $file) {`
	`73`	`+ if (!is_file(GLPI_TMP_DIR . '/' . $file)) {`
	`74`	`+ Session::addMessageAfterRedirect(__('A required file is missing:', 'formcreator') . ' ' . $this->fields['name'], false, ERROR);`
	`75`	`+ return false;`
	`76`	`+ }`
`75`	`77`	`}`
`76`	`78`	`}`
`77`	`79`
`78`		`- Session::addMessageAfterRedirect(__('A required file is missing:', 'formcreator') . ' ' . $this->fields['name'], false, ERROR);`
`79`		`- return false;`
	`80`	`+ return true;`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`public static function getName() {`