Fixed issue with advanced file uploader

CiviMRF · Sep 19, 2023 · 516702d · 516702d
1 parent c843ffa
commit 516702d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/cf-civicrm-formprocessor.php b/cf-civicrm-formprocessor.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Integration of CiviCRM's Form Processor with Caldera Forms
  * Description: This plugin integrates Caldera Forms with CiviCRM's form processor. Funded by CiviCooP, Civiservice.de, Bundesverband Soziokultur e.V., Article 19
- * Version: 1.0.0
+ * Version: 1.0.1
  * Author: Jaap Jansma
  * Plugin URI: https://github.com/civimrf/cf-civicrm-formprocessor
  * GitHub Plugin URI: civimrf/cf-civicrm-formprocessor
@@ -205,6 +205,9 @@ function cf_civicrm_formprocessor_log($message) {
 
       if (Caldera_Forms_Field_Util::is_file_field($field, $form)) {
         $value = $entry;
+        if (is_array($value)) {
+          $value = reset($value);
+        }
       }
     }
   }

diff --git a/processors/formprocessor/class-formprocessor-processor.php b/processors/formprocessor/class-formprocessor-processor.php
@@ -234,16 +234,18 @@ protected function get_submitted_value( $config, $form ) {
           $value = $config[ $field ];
         }
 
-        $field_id_passed = strpos( $value, 'fld_' );
-        if ( false !== $field_id_passed ) {
-          $value = Caldera_Forms::get_field_data( $value, $form );
+        if (is_string($value)) {
+          $field_id_passed = strpos( $value, 'fld_' );
+            if (FALSE !== $field_id_passed) {
+            $value = Caldera_Forms::get_field_data( $value, $form );
+          }
         }
 
       }else{
         $value = null;
       }
 
-      if ( ! empty( $value ) ) {
+      if (!empty($value) && !is_array($value)) {
         $value = call_user_func( $args['sanatize'], $value );
       }
 

diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: CiviCRM, form, contact form, forms
 Requires at least: 5.2
 Tested up to: 5.6
 Requires PHP: 7.2
-Stable tag: 1.0.0
+Stable tag: 1.0.1
 License: AGPL-3.0
 
 This plugin integrates Caldera Forms with CiviCRM's form processor. Funded by CiviCooP, Civiservice.de, Bundesverband Soziokultur e.V., Article 19
@@ -57,4 +57,5 @@ NB - If you have not created any Form Processors, no CiviCRM Caldera Processors
 
 == Changelog ==
 
+1.0.1: Fixed issue with advanced file uploader
 1.0.0: First version.