fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 9286 Comments are deleted from the XML code for DynaForms SOLVED

Browse Source 
- ProcessMaker deletes comments from XML code. For example if I have:
- Change in the way of creating XML files in DynaForms.
This commit is contained in:
Hector Cortez
2012-10-25 15:05:26 -04:00
parent 05de793839
commit 8e4229f53e
4 changed files with 240 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
workflow/engine/classes/class.dynaFormField.php
View File

@@ -26,6 +26,7 @@
*/
G::LoadClass( 'xmlDb' );
G::LoadSystem('dynaformhandler');
/**
* Dynaform Field - DynaformField class
@@ -34,6 +35,16 @@ G::LoadClass( 'xmlDb' );
*/
class DynaFormField extends DBTable
{
private $fileName;
public function getFileName()
{
return $this->fileName;
}
public function setFileName($fileName)
{
$this->fileName = $fileName;
}
/**
* Function SetTo
@@ -108,9 +119,9 @@ class DynaFormField extends DBTable
$this->Fields = $Fields;
unset( $this->Fields['XMLNODE_NAME_OLD'] );
/*
* MPD-10 to create fields that do not appear many attributes, only the main ones?
* The show those who are not white
*/
* MPD-10 to create fields that do not appear many attributes, only the main ones?
* The show those who are not white
*/
if ($this->is_new) {
foreach ($this->Fields as $key => $value) {
if ($value == "")
@@ -125,12 +136,12 @@ class DynaFormField extends DBTable
parent::Save();
if ($this->is_new) {
/*
* Create a new field.
*/
* Create a new field.
*/
foreach ($labels as $lang => $value) {
/*$res = $this->_dbses->Execute('INSERT INTO dynaForm'.
' (XMLNODE_TYPE,XMLNODE_VALUE)'.
' VALUES ("cdata", "'."\n".'")');*/
' (XMLNODE_TYPE,XMLNODE_VALUE)'.
' VALUES ("cdata", "'."\n".'")');*/
$res = $this->_dbses->Execute( 'INSERT INTO dynaForm.' . $Fields['XMLNODE_NAME'] . ' (XMLNODE_NAME,XMLNODE_VALUE,XMLNODE_TYPE) ' . 'VALUES ("","' . "\n " . '","cdata")' );
$res = $this->_dbses->Execute( 'INSERT INTO dynaForm.' . $Fields['XMLNODE_NAME'] . ' (XMLNODE_NAME,XMLNODE_VALUE) ' . 'VALUES ("' . $lang . '","' . str_replace( '"', '""', $value )/*."\n "*/.'")' );
if (isset( $options[$lang] )) {
@@ -165,6 +176,63 @@ class DynaFormField extends DBTable
}
}
function saveField ($Fields, $attributes = array(), $options = array())
{
$dynaform = new dynaFormHandler( $this->getFileName());
if ($Fields['TYPE'] === 'javascript') {
$Fields['XMLNODE_VALUE'] = $Fields['CODE'];
unset( $Fields['CODE'] );
$attributes = array ();
}
if ($Fields['XMLNODE_NAME_OLD'] == '') {
if (($Fields['XMLNODE_NAME'][0] == '1') || ($Fields['XMLNODE_NAME'][0] == '2') || ($Fields['XMLNODE_NAME'][0] == '3') || ($Fields['XMLNODE_NAME'][0] == '4') || ($Fields['XMLNODE_NAME'][0] == '5') || ($Fields['XMLNODE_NAME'][0] == '6') || ($Fields['XMLNODE_NAME'][0] == '7') || ($Fields['XMLNODE_NAME'][0] == '8') || ($Fields['XMLNODE_NAME'][0] == '9') || ($Fields['XMLNODE_NAME'][0] == '10')) {
$Fields['XMLNODE_NAME'] = '_' . $Fields['XMLNODE_NAME'];
}
$res = $this->_dbses->Execute( 'SELECT * FROM dynaForm WHERE XMLNODE_NAME="' . $Fields['XMLNODE_NAME'] . '"' );
} else {
if (($Fields['XMLNODE_NAME_OLD'][0] == '1') || ($Fields['XMLNODE_NAME_OLD'][0] == '2') || ($Fields['XMLNODE_NAME_OLD'][0] == '3') || ($Fields['XMLNODE_NAME_OLD'][0] == '4') || ($Fields['XMLNODE_NAME_OLD'][0] == '5') || ($Fields['XMLNODE_NAME_OLD'][0] == '6') || ($Fields['XMLNODE_NAME_OLD'][0] == '7') || ($Fields['XMLNODE_NAME_OLD'][0] == '8') || ($Fields['XMLNODE_NAME_OLD'][0] == '9') || ($Fields['XMLNODE_NAME_OLD'][0] == '10')) {
$Fields['XMLNODE_NAME_OLD'] = '_' . $Fields['XMLNODE_NAME_OLD'];
}
$res = $this->_dbses->Execute( 'SELECT * FROM dynaForm WHERE XMLNODE_NAME="' . $Fields['XMLNODE_NAME_OLD'] . '"' );
}
$this->is_new = ($res->count() == 0);
$this->Fields = $Fields;
unset( $this->Fields['XMLNODE_NAME_OLD'] );
/*
* MPD-10 to create fields that do not appear many attributes, only the main ones?
* The show those who are not white
*/
if ($this->is_new) {
foreach ($this->Fields as $key => $value) {
if ($value == "") {
unset( $this->Fields[$key] );
}
}
} else {
$this->Fields['XMLNODE_NAME'] = $Fields['XMLNODE_NAME_OLD'];
}
// parent::Save();
if (trim($Fields['XMLNODE_VALUE']) != "") {
$attributes['#cdata'] = $Fields['XMLNODE_VALUE'];
}
$aOptions = array();
if(isset($Fields['OPTIONS']) && is_array($Fields['OPTIONS']) ) {
foreach ($Fields['OPTIONS'] as $key => $value) {
$aOptions[] = Array( 'name' => 'option', 'value' => $value['LABEL'],
'attributes' => array('name'=>$value['NAME']) );
}
}
if ($this->is_new) {
// Create a new field
$dynaform->add($Fields['XMLNODE_NAME'], $attributes, $options, $aOptions);
} else {
$dynaform->replace($Fields['XMLNODE_NAME_OLD'], $Fields['XMLNODE_NAME'], $attributes, $options, $aOptions);
}
}
/**
* Verify if is New the Field
*

42
workflow/engine/classes/class.dynaformEditor.php
View File

@@ -38,7 +38,7 @@ G::LoadClass( 'dynaFormField' );
require_once ('classes/model/Process.php');
require_once ('classes/model/Dynaform.php');
G::LoadClass( 'xmlDb' );
G::LoadSystem('dynaformhandler');
/**
*
* @package workflow.engine.classes
@@ -699,30 +699,40 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
$tmp['Properties'] = $Fields;
self::_setTmpData( $tmp );
}
$dynaform = new dynaFormHandler( PATH_DYNAFORM . "{$file}.xml" );
$dbc2 = new DBConnection( PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml' );
$ses2 = new DBSession( $dbc2 );
//if (!isset($Fields['ENABLETEMPLATE'])) $Fields['ENABLETEMPLATE'] ="0";
if (isset( $Fields['WIDTH'] )) {
$ses2->execute( G::replaceDataField( "UPDATE . SET WIDTH = @@WIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
}
/*if (isset($Fields['ENABLETEMPLATE'])) {
$ses2->execute(G::replaceDataField("UPDATE . SET ENABLETEMPLATE = @@ENABLETEMPLATE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
}*/
$ses2->execute(G::replaceDataField("UPDATE . SET ENABLETEMPLATE = @@ENABLETEMPLATE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields));
}*/
if (isset( $Fields['DYN_TYPE'] )) {
$ses2->execute( G::replaceDataField( "UPDATE . SET TYPE = @@DYN_TYPE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
//$ses2->execute( G::replaceDataField( "UPDATE . SET TYPE = @@DYN_TYPE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
$dynaform->modifyHeaderAttribute('type', $Fields['DYN_TYPE']);
}
if (isset( $Fields['WIDTH'] )) {
// $ses2->execute( G::replaceDataField( "UPDATE . SET WIDTH = @@WIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
$dynaform->modifyHeaderAttribute('width', $Fields['WIDTH']);
//g::pr($dynaform->getHeaderAttribute('width'));
}
if (isset( $Fields['MODE'] )) {
$ses2->execute( G::replaceDataField( "UPDATE . SET MODE = @@MODE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
// $ses2->execute( G::replaceDataField( "UPDATE . SET MODE = @@MODE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
$dynaform->modifyHeaderAttribute('mode', $Fields['MODE']);
}
if (isset( $Fields['NEXTSTEPSAVE'] )) {
$ses2->execute( G::replaceDataField( "UPDATE . SET NEXTSTEPSAVE = @@NEXTSTEPSAVE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
//$ses2->execute( G::replaceDataField( "UPDATE . SET NEXTSTEPSAVE = @@NEXTSTEPSAVE WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
$dynaform->modifyHeaderAttribute('nextstepsave', $Fields['NEXTSTEPSAVE']);
}
if (isset( $Fields['PRINTDYNAFORM'] )) {
$ses2->execute( G::replaceDataField( "UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
//$ses2->execute( G::replaceDataField( "UPDATE . SET PRINTDYNAFORM = @@PRINTDYNAFORM WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
$dynaform->modifyHeaderAttribute('printdynaform', $Fields['PRINTDYNAFORM']);
}
if (isset( $Fields['ADJUSTGRIDSWIDTH'] )) {
$ses2->execute( G::replaceDataField( "UPDATE . SET ADJUSTGRIDSWIDTH = @@ADJUSTGRIDSWIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
//$ses2->execute( G::replaceDataField( "UPDATE . SET ADJUSTGRIDSWIDTH = @@ADJUSTGRIDSWIDTH WHERE XMLNODE_NAME = 'dynaForm' ", $Fields ) );
$dynaform->modifyHeaderAttribute('adjustgridswidth', $Fields['ADJUSTGRIDSWIDTH']);
}
return 0;
} catch (Exception $e) {
return (array) $e;
@@ -753,9 +763,13 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax
{
$file = G::decrypt( $A, URL_KEY );
$value = $value == "1" ? "1" : "0";
$dbc2 = new DBConnection( PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml' );
$ses2 = new DBSession( $dbc2 );
$ses2->execute( "UPDATE . SET ENABLETEMPLATE = '$value'" );
// $dbc2 = new DBConnection( PATH_DYNAFORM . $file . '.xml', '', '', '', 'myxml' );
// $ses2 = new DBSession( $dbc2 );
// $ses2->execute( "UPDATE . SET ENABLETEMPLATE = '$value'" );
$dynaform = new dynaFormHandler( PATH_DYNAFORM . "{$file}.xml" );
$dynaform->modifyHeaderAttribute('enabletemplate', $value);
return $value;
}

33
workflow/engine/methods/dynaforms/fields_Save.php
View File

@@ -60,12 +60,12 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
else {
$_POST['form']['PME_SAVELABEL'] = 0;
}
if (isset($_POST['form']['PME_SAVELABEL'])
$A = $_POST['form']['PME_A'];
if (isset($_POST['form']['PME_SAVELABEL'])
&& isset($_POST['form']['PME_CODE'])
&& $_POST['form']['PME_TYPE'] === 'javascript'){
$sType = $_POST['form']['PME_TYPE'];
$A = $_POST['form']['PME_A'];
// $A = $_POST['form']['PME_A'];
$fieldName = $_POST['form']['PME_XMLNODE_NAME'];
$pmeCode = $_POST['form']['PME_CODE'];
$_POST['form']['PME_CODE'] = '';
@@ -82,9 +82,9 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
define('DB_XMLDB_NAME','');
define('DB_XMLDB_TYPE','myxml');
if (isset($_POST['form']['PME_XMLNODE_VALUE'])){
$_POST['form']['PME_XMLNODE_VALUE'] = str_replace("'", "''" , $_POST['form']['PME_XMLNODE_VALUE']);
}
// if (isset($_POST['form']['PME_XMLNODE_VALUE'])){
// $_POST['form']['PME_XMLNODE_VALUE'] = str_replace("'", "''" , $_POST['form']['PME_XMLNODE_VALUE']);
// }
if (file_exists( PATH_XMLFORM . 'dynaforms/fields/' . $type . '.xml')) {
$form=new Form('dynaforms/fields/' . $type , PATH_XMLFORM);
@@ -142,12 +142,12 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
if ($_POST['form']['XMLNODE_NAME']==='') return;
$attributes = $_POST['form'];
if (isset($attributes['HINT'])) {
$attributes['HINT'] = addslashes($attributes['HINT']);
$attributes['HINT'] = htmlspecialchars($attributes['HINT'], ENT_QUOTES, "UTF-8");
}
if (isset($attributes['CODE'])) $attributes['XMLNODE_VALUE'] = ($attributes['CODE']);
$labels = array();
@@ -202,7 +202,22 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons
}
}
unset($attributes['VALIDATE_NAME']);
$fields->Save( $attributes , $labels , $options );
$fields->setFileName(PATH_DYNAFORM . $file . '.xml' );
$FieldAttributes = $attributes;
$FieldAttrib = array();
unset($FieldAttributes['XMLNODE_NAME']);
unset($FieldAttributes['XMLNODE_NAME_OLD']);
unset($FieldAttributes['XMLNODE_VALUE']);
unset($FieldAttributes['BTN_CANCEL']);
unset($FieldAttributes['SAVELABEL']);
foreach ($FieldAttributes as $key => $value) {
if ($value != "") {
$FieldAttrib[strtolower($key)] = $value;
}
}
$fields->saveField($attributes, $FieldAttrib, $labels );
G::LoadClass('xmlDb');
$i = 0;