diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php
index e3ea093e5..586ac487b 100755
--- a/gulliver/system/class.publisher.php
+++ b/gulliver/system/class.publisher.php
@@ -476,8 +476,8 @@ class Publisher
global $mainPanelScript;
global $panelName;
global $tabCount;
- G::LoadThirdParty( 'pear/json', 'class.json' );
- $json = new Services_JSON();
+ //G::LoadThirdParty( 'pear/json', 'class.json' );
+ //$json = new Services_JSON();
$tabCount = 0;
$panelName = $Part['Template'];
$data = $Part['File'];
@@ -493,7 +493,7 @@ class Publisher
. ($data['roll'] ? 'true' : 'false') . ',' . ' drag:' . ($data['drag'] ? 'true' : 'false') . ',' . ' resize:'
. ($data['resize'] ? 'true' : 'false') . '},' . 'fx:{' . ' drag:' . ($data['drag'] ? 'true' : 'false') . ',' . ' modal:'
. ($data['modal'] ? 'true' : 'false') . ',' . ' blinkToFront:' . ($data['blinkToFront'] ? 'true' : 'false') . '}' . '};'
- . $panelName . '.setStyle=' . $json->encode( $data['style'] ) . ';' . $panelName . '.tab={' . 'width:'
+ . $panelName . '.setStyle=' . Bootstrap::json_encode( $data['style'] ) . ';' . $panelName . '.tab={' . 'width:'
. ($data['tabWidth'] + $data['tabSpace']) . ',' . 'optWidth:' . $data['tabWidth'] . ',' . 'step :' . $data['tabStep']
. ',' . 'options:[]' . '};';
print (' ') ;
diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php
index a7745e4f4..acccd8e18 100644
--- a/workflow/engine/PmBootstrap.php
+++ b/workflow/engine/PmBootstrap.php
@@ -65,7 +65,7 @@ class PmBootstrap extends Bootstrap
// pm workflow classes (static load)
$this->autoloader->registerClass('System', PATH_CORE . 'classes/class.system');
- $this->autoloader->registerClass('Services_JSON', PATH_THIRDPARTY .'pear/json/class.json');
+ //$this->autoloader->registerClass('Services_JSON', PATH_THIRDPARTY .'pear/json/class.json');
$this->autoloader->registerClass('Smarty', PATH_THIRDPARTY . 'smarty/libs/Smarty.class');
$this->autoloader->registerClass('Propel', PATH_THIRDPARTY . 'propel/Propel');
diff --git a/workflow/engine/controllers/newSiteProxy.php b/workflow/engine/controllers/newSiteProxy.php
index bfc880f56..1b56e5ab4 100755
--- a/workflow/engine/controllers/newSiteProxy.php
+++ b/workflow/engine/controllers/newSiteProxy.php
@@ -9,13 +9,12 @@
class newSiteProxy extends HttpProxyController
{
- public function testingNW ($params)
- {
+ public function testingNW ($params) {
if (isset( $_POST['NW_TITLE'] )) {
$action = (isset( $_POST['action'] )) ? trim( $_POST['action'] ) : 'test';
G::LoadClass( 'Installer' );
- G::LoadClass( 'json' );
+ //G::LoadClass( 'json' );
$name = trim( $_POST['NW_TITLE'] );
$inst = new Installer();
$isset = $inst->isset_site( $name );
@@ -36,7 +35,7 @@ class newSiteProxy extends HttpProxyController
), ($action === 'create') ? true : false );
$result['result']['admin']['password'] = ($pass === $pass1) ? true : false;
$result['result']['action'] = $action;
- $json = new Services_JSON();
+ //$json = new Services_JSON();
//G::pr($result['result']['database']);G::pr($action);
$dbWf = $result['result']['database']['ao']['ao_db_wf']['status'];
$dbRb = $result['result']['database']['ao']['ao_db_rb']['status'];
@@ -54,10 +53,10 @@ class newSiteProxy extends HttpProxyController
}
}
- public function creatingNW ($params)
+ /* public function creatingNW ($params)
{
G::pr( $_POST );
G::pr( "krlossss" );
- }
+ }*/
}
diff --git a/workflow/engine/methods/authSources/authSources_Ajax.php b/workflow/engine/methods/authSources/authSources_Ajax.php
index f751a82be..636220835 100755
--- a/workflow/engine/methods/authSources/authSources_Ajax.php
+++ b/workflow/engine/methods/authSources/authSources_Ajax.php
@@ -46,8 +46,8 @@ try {
}
$aFields = $RBAC->getAuthSource( $_POST['sUID'] );
- G::LoadThirdParty( 'pear/json', 'class.json' );
- $oJSON = new Services_JSON();
+ //G::LoadThirdParty( 'pear/json', 'class.json' );
+ //$oJSON = new Services_JSON();
$i = 0;
$oUser = new Users();
$aAux = $RBAC->searchUsers( $_POST['sUID'], $_POST['sKeyword'] );
@@ -59,7 +59,7 @@ try {
foreach ($aAux as $aUser) {
if (! in_array( $aUser['sUsername'], $pmUsers )) {
// add replace to change D'Souza to D*Souza by krlos
- $sCheckbox = 'encode( $aUser ) ) ) . '\' />
';
+ $sCheckbox = '';
$i ++;
} else {
$sCheckbox = G::LoadTranslation( 'ID_USER_REGISTERED' ) . ':
(' . $aUser['sUsername'] . ')';
diff --git a/workflow/engine/methods/authSources/authSources_ImportUsers.php b/workflow/engine/methods/authSources/authSources_ImportUsers.php
index 69f64ff3b..dd3a91115 100755
--- a/workflow/engine/methods/authSources/authSources_ImportUsers.php
+++ b/workflow/engine/methods/authSources/authSources_ImportUsers.php
@@ -33,12 +33,12 @@ if (isset($aFields['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE'])) {
$aAttributes = $aFields['AUTH_SOURCE_DATA']['AUTH_SOURCE_GRID_ATTRIBUTE'];
}
-G::LoadThirdParty( 'pear/json', 'class.json' );
-$oJSON = new Services_JSON();
+//G::LoadThirdParty( 'pear/json', 'class.json' );
+//$oJSON = new Services_JSON();
foreach ($_POST['aUsers'] as $sUser) {
$matches = array ();
- $aUser = (array) $oJSON->decode( stripslashes( $sUser ) );
+ $aUser = (array) Bootstrap::json_decode( stripslashes( $sUser ) );
$aData['USR_USERNAME'] = str_replace( "*", "'", $aUser['sUsername'] );
$aData['USR_PASSWORD'] = md5( str_replace( "*", "'", $aUser['sUsername'] ) );
// note added by gustavo gustavo-at-colosa.com
diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php
index 659ffe12a..97b3e6756 100755
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -554,7 +554,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$r->data = $aProcesses;
$r->totalCount = $totalCount;
- echo G::json_encode( $r );
+ echo Bootstrap::json_encode( $r );
break;
case 'generateDocumentGrid_Ajax':
@@ -612,7 +612,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$r->totalCount = $totalCount;
$r->dataFormat = $dateFormat;
- echo G::json_encode( $r );
+ echo Bootstrap::json_encode( $r );
break;
case 'showGeneratedDocument':
//require_once 'classes/model/AppDocument.php';
@@ -935,16 +935,16 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
G::RenderPage( 'publish', 'raw' );
break;
case "getCountCasesFolder":
- $json = new Services_JSON();
+ //$json = new Services_JSON();
$aTypes = Array ('to_do','draft','cancelled','sent','paused','completed','selfservice','to_revise','to_reassign');
$aTypesID = Array ('to_do' => 'CASES_INBOX','draft' => 'CASES_DRAFT','cancelled' => 'CASES_CANCELLED','sent' => 'CASES_SENT','paused' => 'CASES_PAUSED','completed' => 'CASES_COMPLETED','selfservice' => 'CASES_SELFSERVICE','to_revise' => 'CASES_TO_REVISE','to_reassign' => 'CASES_TO_REASSIGN');
if (! isset( $_POST['A'] )) {
$oCases = new Cases();
$aCount = $oCases->getAllConditionCasesCount( $aTypes, true );
- echo $json->encode( $aCount );
+ echo Bootstrap::json_encode( $aCount );
} else {
- echo $json->encode( $aTypesID );
+ echo Bootstrap::json_encode( $aTypesID );
}
break;
case "previusJump":
@@ -965,7 +965,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$response['exists'] = false;
}
- echo G::json_encode( $response );
+ echo Bootstrap::json_encode( $response );
break;
default:
echo 'default';
diff --git a/workflow/engine/methods/dbConnections/dbConnectionsAjax.php b/workflow/engine/methods/dbConnections/dbConnectionsAjax.php
index 861193d88..707baa6fb 100755
--- a/workflow/engine/methods/dbConnections/dbConnectionsAjax.php
+++ b/workflow/engine/methods/dbConnections/dbConnectionsAjax.php
@@ -273,13 +273,13 @@ switch ($action) {
}
break;
case 'showEncodes':
- G::LoadThirdParty( 'pear/json', 'class.json' );
- $oJSON = new Services_JSON();
+ //G::LoadThirdParty( 'pear/json', 'class.json' );
+ //$oJSON = new Services_JSON();
$engine = $_POST['engine'];
if ($engine != "0") {
$dbs = new dbConnections();
- echo $oJSON->encode( $dbs->getEncondeList( $engine ) );
+ echo Bootstrap::json_encode( $dbs->getEncondeList( $engine ) );
} else {
echo '[["0","..."]]';
diff --git a/workflow/engine/methods/dynaforms/conditionalShowHide_Ajax.php b/workflow/engine/methods/dynaforms/conditionalShowHide_Ajax.php
index e566da925..890d06f7e 100755
--- a/workflow/engine/methods/dynaforms/conditionalShowHide_Ajax.php
+++ b/workflow/engine/methods/dynaforms/conditionalShowHide_Ajax.php
@@ -53,14 +53,14 @@ try {
$_DYN_FILENAME = $_SESSION['Current_Dynafom']['Parameters']['FILE'];
$sFilter = isset( $_POST['filter'] ) ? $_POST['filter'] : '';
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
$oDynaformHandler = new dynaFormHandler( PATH_DYNAFORM . $_DYN_FILENAME . '.xml' );
$aFilter = explode( ',', $sFilter );
$aAvailableFields = $oDynaformHandler->getFieldNames( $aFilter );
- print ($oJSON->encode( $aAvailableFields )) ;
+ print (Bootstrap::json_encode( $aAvailableFields )) ;
break;
case 'showDynavars':
G::LoadSystem( 'dynaformhandler' );
diff --git a/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php b/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php
index 88b07ca4d..9d3b65193 100755
--- a/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php
+++ b/workflow/engine/methods/dynaforms/dynaforms_checkDependentFields.php
@@ -64,14 +64,14 @@ if (($RBAC_Response = $RBAC->userCanAccess( "PM_FACTORY" )) != 1) {
// the script responds an ajax request in order to check the dependent fields,
// and generate a json output of the values that the dependent field must have.
$sDynUid = G::getUIDName( urlDecode( $_POST['DYN_UID'] ) );
-$json = new Services_JSON();
-$formValues = ($json->decode( $_POST['fields'] ));
+//$json = new Services_JSON();
+$formValues = (Bootstrap::json_decode( $_POST['fields'] ));
$sFieldName = $_POST['fieldName'];
$sMasterField = '';
$sPath = PATH_DYNAFORM;
$G_FORM = new form( $sDynUid, $sPath );
$aux = array ();
-$newValues = $json->decode( urlDecode( stripslashes( $_POST['form'] ) ) );
+$newValues = Bootstrap::json_decode( urlDecode( stripslashes( $_POST['form'] ) ) );
if (isset( $_POST['grid'] )) {
$_POST['row'] = (int) $_POST['row'];
diff --git a/workflow/engine/methods/dynaforms/fields_Ajax.php b/workflow/engine/methods/dynaforms/fields_Ajax.php
index 7a74395cf..f26d9fd88 100755
--- a/workflow/engine/methods/dynaforms/fields_Ajax.php
+++ b/workflow/engine/methods/dynaforms/fields_Ajax.php
@@ -30,8 +30,8 @@ if (isset( $_SESSION['CURRENT_PAGE_INITILIZATION'] )) {
eval( $_SESSION['CURRENT_PAGE_INITILIZATION'] );
}
//G::LoadSystem('json');
-require_once (PATH_THIRDPARTY . 'pear/json/class.json.php');
-$json = new Services_JSON();
+//require_once (PATH_THIRDPARTY . 'pear/json/class.json.php');
+//$json = new Services_JSON();
$G_FORM = new form( G::getUIDName( urlDecode( $_POST['form'] ) ) );
$G_FORM->id = urlDecode( $_POST['form'] );
$G_FORM->values = $_SESSION[$G_FORM->id];
@@ -44,7 +44,7 @@ define( 'DB_XMLDB_PASS', '' );
define( 'DB_XMLDB_NAME', '' );
define( 'DB_XMLDB_TYPE', 'myxml' );
-$newValues = ($json->decode( urlDecode( stripslashes( $_POST['fields'] ) ) ));
+$newValues = (Bootstrap::json_decode( urlDecode( stripslashes( $_POST['fields'] ) ) ));
//Resolve dependencies
//Returns an array ($dependentFields) with the names of the fields
//that depends of fields passed through AJAX ($_GET/$_POST)
@@ -84,7 +84,7 @@ foreach ($dependentFields as $d) {
$sendContent[$r]->value = $G_FORM->values[$d];
$r ++;
}
-echo ($json->encode( $sendContent ));
+echo (Bootstrap::json_encode( $sendContent ));
function toJSArray ($array)
{
diff --git a/workflow/engine/methods/install/newSite.php b/workflow/engine/methods/install/newSite.php
index 29e10369a..43fa9f7f9 100755
--- a/workflow/engine/methods/install/newSite.php
+++ b/workflow/engine/methods/install/newSite.php
@@ -48,12 +48,12 @@ if (isset( $_POST['form']['NW_TITLE'] )) {
), ($action === 'create') ? true : false );
$result['result']['admin']['password'] = ($pass === $pass1) ? true : false;
$result['result']['action'] = $action;
- $json = new Services_JSON();
+ //$json = new Services_JSON();
/*$ec;
$ec->created=($new)?true:false;
$ec->name=$name;
$ec->message=($new)?"Workspace created":"Workspace already exists or Name invalid";*/
- echo $json->encode( $result );
+ echo Bootstrap::json_encode( $result );
} else {
global $RBAC;
switch ($RBAC->userCanAccess( 'PM_SETUP_ADVANCE' )) {
diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php
index 98536d77b..a4dd11346 100755
--- a/workflow/engine/methods/patterns/patterns_Ajax.php
+++ b/workflow/engine/methods/patterns/patterns_Ajax.php
@@ -22,7 +22,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
G::LoadInclude( 'ajax' );
-$oJSON = new Services_JSON();
+//$oJSON = new Services_JSON();
if (isset( $_POST['mode'] ) && $_POST['mode'] != '') {
$aData = $_POST;
} else {
diff --git a/workflow/engine/methods/processes/processes_Ajax.php b/workflow/engine/methods/processes/processes_Ajax.php
index 1eb3a52e7..9cf29bf4c 100755
--- a/workflow/engine/methods/processes/processes_Ajax.php
+++ b/workflow/engine/methods/processes/processes_Ajax.php
@@ -39,7 +39,7 @@ try {
//$oJSON = new Services_JSON();
if (isset( $_REQUEST['data'] )) {
- $oData = G::json_decode( stripslashes( $_REQUEST['data'] ) );
+ $oData = Bootstrap::json_decode( stripslashes( $_REQUEST['data'] ) );
//$oData = $oJSON->decode( stripslashes( $_REQUEST['data'] ) );
$sOutput = '';
$sTask = '';
@@ -319,7 +319,7 @@ try {
$oProcessMap->processFilesManager( $oData->pro_uid );
break;
case 'exploreDirectory':
- $objData = G::json_decode( $_REQUEST['data'] );
+ $objData = Bootstrap::json_decode( $_REQUEST['data'] );
$_SESSION['PFMDirectory'] = $objData->{'main_directory'};
$oProcessMap->exploreDirectory( $oData->pro_uid, $oData->main_directory, $oData->directory );
break;
@@ -399,7 +399,7 @@ try {
break;
case 'loginPML':
G::LoadClass( 'processes' );
- G::LoadThirdParty( 'pear/json', 'class.json' );
+ //G::LoadThirdParty( 'pear/json', 'class.json' );
$oProcesses = new Processes();
try {
if ($oProcesses->ws_open( $oData->u, $oData->p ) == 1) {
@@ -421,8 +421,8 @@ try {
$oResponse->sLink = '../processes/downloadPML?id=' . $oData->pro_uid . '&s=' . $sessionId;
}
$oResponse->bExists = $bExists;
- $oJSON = new Services_JSON();
- echo $oJSON->encode( $oResponse );
+ //$oJSON = new Services_JSON();
+ echo Bootstrap::json_encode( $oResponse );
break;
case 'editFile':
//echo $_REQUEST['filename'];
@@ -542,8 +542,8 @@ try {
}
$response = new stdclass();
$response->casesNumRec = $casesNumRec;
- $json = new Services_JSON();
- $sOutput = $json->encode( $response );
+ //$json = new Services_JSON();
+ $sOutput = Bootstrap::json_encode( $response );
break;
}
if (isset( $sOutput )) {
diff --git a/workflow/engine/methods/processes/processes_Export.php b/workflow/engine/methods/processes/processes_Export.php
index 7014dcfd9..f9c1ae7b8 100755
--- a/workflow/engine/methods/processes/processes_Export.php
+++ b/workflow/engine/methods/processes/processes_Export.php
@@ -22,7 +22,7 @@
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
*/
-G::LoadThirdParty( 'pear/json', 'class.json' );
+//G::LoadThirdParty( 'pear/json', 'class.json' );
try {
@@ -49,8 +49,8 @@ try {
return $value;
}
- $oJSON = new Services_JSON();
- $stdObj = $oJSON->decode( $_POST['data'] );
+ //$oJSON = new Services_JSON();
+ $stdObj = Bootstrap::json_decode( $_POST['data'] );
if (isset( $stdObj->pro_uid ))
$sProUid = $stdObj->pro_uid;
else
diff --git a/workflow/engine/methods/processes/processes_Save.php b/workflow/engine/methods/processes/processes_Save.php
index 8887e677c..60c6824f5 100755
--- a/workflow/engine/methods/processes/processes_Save.php
+++ b/workflow/engine/methods/processes/processes_Save.php
@@ -27,7 +27,7 @@
*
*/
-G::LoadThirdParty( 'pear/json', 'class.json' );
+//G::LoadThirdParty( 'pear/json', 'class.json' );
$function = isset( $_POST['function'] ) ? $_POST['function'] : '';
@@ -58,7 +58,7 @@ switch ($function) {
$oProcessMap = new ProcessMap();
if (! isset( $_POST['form']['PRO_UID'] )) {
$_POST['form']['USR_UID'] = $_SESSION['USER_LOGGED'];
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
require_once 'classes/model/Task.php';
$sProUid = $oProcessMap->createProcess( $_POST['form'] );
diff --git a/workflow/engine/methods/processes/processes_User.php b/workflow/engine/methods/processes/processes_User.php
index 76b57954d..e93d59254 100755
--- a/workflow/engine/methods/processes/processes_User.php
+++ b/workflow/engine/methods/processes/processes_User.php
@@ -29,10 +29,10 @@
* @Date 16/05/2008
* @LastModification none
*/
-G::LoadThirdParty( 'pear/json', 'class.json' );
+//G::LoadThirdParty( 'pear/json', 'class.json' );
try {
- $oJSON = new Services_JSON();
- $stdObj = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $stdObj = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
if (isset( $stdObj->pro_uid ))
$sProUid = $stdObj->pro_uid;
else
diff --git a/workflow/engine/methods/tracker/tracker_Ajax.php b/workflow/engine/methods/tracker/tracker_Ajax.php
index f77318610..54a4a303f 100755
--- a/workflow/engine/methods/tracker/tracker_Ajax.php
+++ b/workflow/engine/methods/tracker/tracker_Ajax.php
@@ -199,8 +199,8 @@ try {
require_once 'classes/model/Process.php';
require_once 'classes/model/Task.php';
require_once 'classes/model/AppDelegation.php';
- $oJSON = new Services_JSON();
- $oData = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oProcess = new Process();
$aRow = $oProcess->load( $oData->uid );
$oSM->title->label = strip_tags( $aRow['PRO_TITLE'] );
@@ -262,13 +262,13 @@ try {
$oSM->stages[$iKey]->derivation->type = 0;
}
}
- $oJSON = new Services_JSON();
- echo $oJSON->encode( $oSM );
+ //$oJSON = new Services_JSON();
+ echo Bootstrap::json_encode( $oSM );
break;
case 'addStage':
require_once 'classes/model/Stage.php';
- $oJSON = new Services_JSON();
- $oData = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( 'STG_UID' );
$oCriteria->add( StagePeer::PRO_UID, $oData->uid );
@@ -313,13 +313,13 @@ try {
$oData->position->y *= - 1;
$oNewStage->uid = $oStage->create( array ('PRO_UID' => $oData->uid,'STG_TITLE' => $oNewStage->label,'STG_POSX' => $oData->position->x,'STG_POSY' => $oData->position->y,'STG_INDEX' => $iIndex) );
- $oJSON = new Services_JSON();
- echo $oJSON->encode( $oNewStage );
+ //$oJSON = new Services_JSON();
+ echo Bootstrap::json_encode( $oNewStage );
break;
case 'saveStagePosition':
require_once 'classes/model/Stage.php';
- $oJSON = new Services_JSON();
- $oData = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oStage = new Stage();
$aFields = $oStage->load( $oData->uid );
$aFields['STG_UID'] = $oData->uid;
@@ -329,8 +329,8 @@ try {
break;
case 'deleteStage':
require_once 'classes/model/Stage.php';
- $oJSON = new Services_JSON();
- $oData = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oStage = new Stage();
$aFields = $oStage->load( $oData->stg_uid );
$oStage->remove( $oData->stg_uid );
@@ -344,8 +344,8 @@ try {
break;
case 'editStage':
require_once 'classes/model/Stage.php';
- $oJSON = new Services_JSON();
- $oData = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oStage = new Stage();
$aFields = $oStage->load( $oData->stg_uid );
$aFields['THEINDEX'] = $oData->theindex;
@@ -365,8 +365,8 @@ try {
case 'tasksAssigned':
require_once 'classes/model/Stage.php';
require_once 'classes/model/Task.php';
- $oJSON = new Services_JSON();
- $oData = $oJSON->decode( stripslashes( $_POST['data'] ) );
+ //$oJSON = new Services_JSON();
+ $oData = Bootstrap::json_decode( stripslashes( $_POST['data'] ) );
$oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( TaskPeer::TAS_UID );
$oCriteria->addAsColumn( 'TAS_TITLE', ContentPeer::CON_VALUE );
diff --git a/workflow/engine/plugins/processTemplate/class.processTemplate.php b/workflow/engine/plugins/processTemplate/class.processTemplate.php
index da3e94ea7..bf0010cd2 100755
--- a/workflow/engine/plugins/processTemplate/class.processTemplate.php
+++ b/workflow/engine/plugins/processTemplate/class.processTemplate.php
@@ -62,14 +62,14 @@
}
function simpleProcess ($oData ) {
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
$sProUid = $oData['PRO_UID'];
$sTemplate = $oData['PRO_TEMPLATE'];
$oProcessMap = $oData['PROCESSMAP'];
- $t1 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 70) );
- $t2 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 160) );
- $t3 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 250) );
+ $t1 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 70) );
+ $t2 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 160) );
+ $t3 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 250) );
$task1 = $t1->uid;
$task2 = $t2->uid;
$task3 = $t3->uid;
@@ -84,15 +84,15 @@
}
function simpleParallel ($oData ) {
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
$sProUid = $oData['PRO_UID'];
$sTemplate = $oData['PRO_TEMPLATE'];
$oProcessMap = $oData['PROCESSMAP'];
- $t1 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 70) );
- $t2 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 200, 160) );
- $t3 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 400, 160) );
- $t5 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 250) );
+ $t1 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 70) );
+ $t2 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 200, 160) );
+ $t3 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 400, 160) );
+ $t5 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 250) );
$aData = array("TAS_START"=>"TRUE","TAS_UID"=>$t1->uid);
$oTask = new Task();
@@ -106,18 +106,18 @@
}
function fullParallel ($oData ) {
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
$sProUid = $oData['PRO_UID'];
$sTemplate = $oData['PRO_TEMPLATE'];
$oProcessMap = $oData['PROCESSMAP'];
- $t1 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 70) );
- $t2 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 100, 160) );
- $t3 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 160) );
- $t4 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 500, 160) );
- $t5 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 200, 250) );
- $t6 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 500, 250) );
- $t7 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 350, 340) );
+ $t1 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 70) );
+ $t2 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 100, 160) );
+ $t3 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 160) );
+ $t4 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 500, 160) );
+ $t5 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 200, 250) );
+ $t6 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 500, 250) );
+ $t7 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 350, 340) );
$aData = array("TAS_START"=>"TRUE","TAS_UID"=>$t1->uid);
$oTask = new Task();
@@ -136,15 +136,15 @@
function conditional ($oData ) {
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
$sProUid = $oData['PRO_UID'];
$sTemplate = $oData['PRO_TEMPLATE'];
$oProcessMap = $oData['PROCESSMAP'];
- $t1 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 70) );
- $t2 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 200, 160) );
- $t3 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 400, 160) );
- $t4 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 250) );
+ $t1 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 70) );
+ $t2 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 200, 160) );
+ $t3 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 400, 160) );
+ $t4 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 250) );
$task1 = $t1->uid;
$task2 = $t2->uid;
$task3 = $t3->uid;
@@ -163,14 +163,14 @@
function doubleStart ($oData ) {
- $oJSON = new Services_JSON();
+ //$oJSON = new Services_JSON();
$sProUid = $oData['PRO_UID'];
$sTemplate = $oData['PRO_TEMPLATE'];
$oProcessMap = $oData['PROCESSMAP'];
- $t1 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 200, 70) );
- $t2 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 400, 70) );
- $t3 = $oJSON->decode( $oProcessMap->addTask( $sProUid, 300, 160) );
+ $t1 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 200, 70) );
+ $t2 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 400, 70) );
+ $t3 = Bootstrap::json_decode( $oProcessMap->addTask( $sProUid, 300, 160) );
$task1 = $t1->uid;
$task2 = $t2->uid;
$task3 = $t3->uid;