From 8f72a0095750c0a9b8ef5a76ead56878c44b6abb Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 18 Aug 2015 15:32:35 -0400 Subject: [PATCH 1/2] PM-3250 --- gulliver/system/class.inputfilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulliver/system/class.inputfilter.php b/gulliver/system/class.inputfilter.php index 90c9763b1..6286769bf 100644 --- a/gulliver/system/class.inputfilter.php +++ b/gulliver/system/class.inputfilter.php @@ -431,7 +431,7 @@ class InputFilter if(!is_object(G::json_decode($val))) { $inputFiltered = $purifier->purify($val); if($type != "url" && !strpos(basename($val), "=")) { - $inputFiltered = addslashes(htmlspecialchars($inputFiltered, ENT_COMPAT, 'UTF-8')); + $inputFiltered = htmlspecialchars($inputFiltered, ENT_NOQUOTES, 'UTF-8'); } else { $inputFiltered = str_replace('&','&',$inputFiltered); } From 1690ee9e4cf0abe3b03dd940a663e39982ccb2c3 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Tue, 18 Aug 2015 15:42:31 -0400 Subject: [PATCH 2/2] PM-3292 --- workflow/engine/classes/class.pmDynaform.php | 4 ++-- workflow/engine/templates/cases/pmdynaform.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 2b63d0ad5..25d88579f 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -16,7 +16,7 @@ class pmDynaform public $credentials = null; public $lang = null; public $langs = null; - public $onPropertyRead = ""; + public $onPropertyRead = "onPropertyReadFormInstance"; public function __construct($fields = array()) { @@ -272,7 +272,7 @@ class pmDynaform } //todo compatibility 'columnWidth' foreach ($json->columns as $column) { - if (!isset($column->columnWidth)) { + if (!isset($column->columnWidth) && $column->type !== "hidden") { $json->layout = "static"; $column->columnWidth = ""; } diff --git a/workflow/engine/templates/cases/pmdynaform.html b/workflow/engine/templates/cases/pmdynaform.html index 86f55097a..ec9f57787 100644 --- a/workflow/engine/templates/cases/pmdynaform.html +++ b/workflow/engine/templates/cases/pmdynaform.html @@ -1,5 +1,5 @@ - + PMDynaform @@ -7,11 +7,11 @@ - + - + @@ -19,7 +19,7 @@ -
+ ###TEMPLATES###