FormSave 1.1.0-pl1

openrightsgroup · Sep 18, 2012 · d043f5a · d043f5a
1 parent dca0c36
commit d043f5a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/_build/build.transport.php b/_build/build.transport.php
@@ -36,7 +36,7 @@
 /* define package */
 define('PKG_NAME','FormSave');
 define('PKG_NAME_LOWER','formsave');
-define('PKG_VERSION','1.0.0');
+define('PKG_VERSION','1.0.1');
 define('PKG_RELEASE','pl1');
 
 /* define sources */

diff --git a/core/components/formsave/elements/snippets/snippet.formsave.php b/core/components/formsave/elements/snippets/snippet.formsave.php
@@ -28,6 +28,8 @@
 	$values = $hook->getValues();
 	foreach($formFields as $field) {
 		if (!isset($values[$field])) {
+			// Add empty field
+			$dataArray[$field] = '';
 			continue;
 		}
 

diff --git a/core/components/formsave/processors/mgr/form/export.php b/core/components/formsave/processors/mgr/form/export.php
@@ -90,10 +90,13 @@
 		}
 
 		$separatorAdded = false;
-
+		if (is_array($value)) {
+			$value = implode(',', $value);
+		}
+
 		$rowOutput .=  $formSave->getChunk('fs.rowdata', array(
 			'key' => str_replace($templateConfig['replaceInput'], $templateConfig['replaceOutput'], $key),
-			'value' => str_replace($templateConfig['replaceInput'], $templateConfig['replaceOutput'], $value),
+			'value' => str_replace($templateConfig['replaceInput'], $templateConfig['replaceOutput'], html_entity_decode($value)),
 			'formData' => $formData
 		));
 

diff --git a/core/components/formsave/processors/mgr/form/getdata.php b/core/components/formsave/processors/mgr/form/getdata.php
@@ -8,6 +8,9 @@
 
 $output = '';
 foreach($formArray['data'] as $key => $value) {
+	if (is_array($value)) {
+		$value = implode(', ', $value);
+	}
 	$output .= $formSave->getChunk('fs.datarow', array(
 		'key' => $key,
 		'value' => $value