addScriptFile("/js/maborak/core/maborak.js");
$this->translationsFile = "/js/ext/translation." . SYS_LANG . ".js";
+ $this->addScriptCode(' var usernameLogged = "' . (isset($_SESSION['USR_USERNAME']) ? $_SESSION['USR_USERNAME'] : '') . '";var SYS_LANG = "' . SYS_LANG . '";');
}
public function &getSingleton()
diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php
index 3e8ed85a2..0703598e7 100755
--- a/workflow/engine/methods/cases/cases_SaveData.php
+++ b/workflow/engine/methods/cases/cases_SaveData.php
@@ -3,7 +3,7 @@
* cases_SaveData.php
*
* ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.23
+ * Copyright (C) 2004 - 2008 Colosa Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -26,8 +26,7 @@
try {
if ($_GET['APP_UID'] !== $_SESSION['APPLICATION']) {
- throw new Exception( G::LoadTranslation( 'ID_INVALID_APPLICATION_ID_MSG', array ('{1}',G::LoadTranslation( 'ID_REOPEN' )
- ) ) );
+ throw new Exception( G::LoadTranslation( 'ID_INVALID_APPLICATION_ID_MSG', array ('{1}',G::LoadTranslation( 'ID_REOPEN' ) ) ) );
}
$oForm = new Form( $_SESSION["PROCESS"] . "/" . $_GET["UID"], PATH_DYNAFORM );
@@ -227,11 +226,9 @@ try {
$oFolder = new AppFolder();
$documentFileStructure = $oFolder->getFolderStructure();
- $aFields = array ("APP_UID" => $_SESSION["APPLICATION"],"DEL_INDEX" => $_SESSION["INDEX"],"USR_UID" => $_SESSION["USER_LOGGED"],"DOC_UID" => $indocUid,"APP_DOC_TYPE" => "INPUT","APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => "","APP_DOC_TITLE" => "","APP_DOC_FILENAME" => $arrayFileName[$i],"FOLDER_UID" => $oFolder->createFromPath( $aID["INP_DOC_DESTINATION_PATH"] ),"APP_DOC_TAGS" => $oFolder->parseTags( $aID["INP_DOC_TAGS"] ),"APP_DOC_FIELDNAME" => $fieldName
- );
+ $aFields = array ("APP_UID" => $_SESSION["APPLICATION"],"DEL_INDEX" => $_SESSION["INDEX"],"USR_UID" => $_SESSION["USER_LOGGED"],"DOC_UID" => $indocUid,"APP_DOC_TYPE" => "INPUT","APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => "","APP_DOC_TITLE" => "","APP_DOC_FILENAME" => $arrayFileName[$i],"FOLDER_UID" => $oFolder->createFromPath( $aID["INP_DOC_DESTINATION_PATH"] ),"APP_DOC_TAGS" => $oFolder->parseTags( $aID["INP_DOC_TAGS"] ),"APP_DOC_FIELDNAME" => $fieldName);
} else {
- $aFields = array ("APP_UID" => $_SESSION["APPLICATION"],"DEL_INDEX" => $_SESSION["INDEX"],"USR_UID" => $_SESSION["USER_LOGGED"],"DOC_UID" => - 1,"APP_DOC_TYPE" => "ATTACHED","APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => "","APP_DOC_TITLE" => "","APP_DOC_FILENAME" => $arrayFileName[$i],"APP_DOC_FIELDNAME" => $fieldName
- );
+ $aFields = array ("APP_UID" => $_SESSION["APPLICATION"],"DEL_INDEX" => $_SESSION["INDEX"],"USR_UID" => $_SESSION["USER_LOGGED"],"DOC_UID" => - 1,"APP_DOC_TYPE" => "ATTACHED","APP_DOC_CREATE_DATE" => date( "Y-m-d H:i:s" ),"APP_DOC_COMMENT" => "","APP_DOC_TITLE" => "","APP_DOC_FILENAME" => $arrayFileName[$i],"APP_DOC_FIELDNAME" => $fieldName);
}
$oAppDocument = new AppDocument();
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index ba01e13af..a240ac991 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -177,6 +177,14 @@ try {
}
//Obtain previous and next step - End
+$aRequiredFields = array(
+ 'APPLICATION' => $Fields['APP_DATA']['APPLICATION'],
+ 'PROCESS' => $Fields['APP_DATA']['PROCESS'],
+ 'TASK' => $Fields['APP_DATA']['TASK'],
+ 'INDEX' => $Fields['APP_DATA']['INDEX'],
+ 'APP_DATA' => $Fields['APP_DATA']
+);
+$oHeadPublisher->addScriptCode('var dynaformSVal = \'' . serialize($aRequiredFields) . '\';');
try {
//Add content content step - Start
diff --git a/workflow/engine/methods/services/sessionPersists.php b/workflow/engine/methods/services/sessionPersists.php
index 82b9bd033..fe50ff0b8 100755
--- a/workflow/engine/methods/services/sessionPersists.php
+++ b/workflow/engine/methods/services/sessionPersists.php
@@ -2,6 +2,27 @@
$response = new stdclass();
$response->status = isset($_SESSION['USER_LOGGED']);
if (isset($_REQUEST['dynaformEditorParams'])) {
- $_SESSION['Current_Dynafom']['Parameters'] = unserialize(stripslashes($_REQUEST['dynaformEditorParams']));
+ $_SESSION['Current_Dynafom']['Parameters'] = unserialize(stripslashes($_REQUEST['dynaformEditorParams']));
+}
+if (isset($_REQUEST['dynaformRestoreValues'])) {
+ $aRetValues = unserialize(stripslashes($_REQUEST['dynaformRestoreValues']));
+ if (isset($aRetValues['APPLICATION'])) {
+ $_SESSION['APPLICATION'] = $aRetValues['APPLICATION'];
+ }
+ if (isset($aRetValues['PROCESS'])) {
+ $_SESSION['PROCESS'] = $aRetValues['PROCESS'];
+ }
+ if (isset($aRetValues['TASK'])) {
+ $_SESSION['TASK'] = $aRetValues['TASK'];
+ }
+ if (isset($aRetValues['INDEX'])) {
+ $_SESSION['INDEX'] = $aRetValues['INDEX'];
+ }
+ if (isset($aRetValues['TRIGGER_DEBUG'])) {
+ $_SESSION['TRIGGER_DEBUG'] = $aRetValues['TRIGGER_DEBUG'];
+ }
+ if (isset($aRetValues['APP_DATA'])) {
+ $_SESSION['APP_DATA'] = $aRetValues['APP_DATA'];
+ }
}
die(G::json_encode($response));
\ No newline at end of file
diff --git a/workflow/engine/templates/xmlform.html b/workflow/engine/templates/xmlform.html
index e52702280..d70d47988 100755
--- a/workflow/engine/templates/xmlform.html
+++ b/workflow/engine/templates/xmlform.html
@@ -8,6 +8,7 @@
+
{foreach from=$form->fields item=field}
{if ($field->type==='title')}
|