From 50bf854bee07ef4203bddafd868906ea1708b5ba Mon Sep 17 00:00:00 2001 From: Alexandre Rosenfeld Date: Tue, 19 Apr 2011 16:26:20 -0400 Subject: [PATCH] BUG 6400 Replacing json_encode|json_decode by their G implementations This fixes the problem of some pages of ProcessMaker not working on PHP 5.1, since there is no json_encode or json_decode native functions on PHP 5.1. --- gulliver/system/class.webResource.php | 2 +- workflow/engine/methods/bpmn/get-tree.php | 4 +- .../engine/methods/bpmn/get-triggers-tree.php | 4 +- workflow/engine/methods/bpmn/openProcess.php | 16 ++-- .../engine/methods/bpmn/processes_Ajax.php | 10 +-- .../methods/bpmn/processes_doUpload.php | 4 +- .../engine/methods/bpmn/proxyCaseSchLoad.php | 6 +- .../methods/bpmn/proxyCaseTrackerObjects.php | 2 +- .../engine/methods/bpmn/proxyDatabaseConn.php | 6 +- .../engine/methods/bpmn/proxyDynaform.php | 4 +- .../engine/methods/bpmn/proxyEventsLoad.php | 6 +- workflow/engine/methods/bpmn/proxyExtjs.php | 82 +++++++++---------- .../methods/bpmn/proxyInputDocument.php | 6 +- .../methods/bpmn/proxyObjectPermissions.php | 2 +- .../methods/bpmn/proxyOutputDocument.php | 6 +- .../methods/bpmn/proxyProcessSupervisors.php | 4 +- .../methods/bpmn/proxyProcesses_Export.php | 2 +- .../engine/methods/bpmn/proxyReportTables.php | 6 +- .../engine/methods/bpmn/proxyStepTriggers.php | 4 +- .../bpmn/proxySubProcessProperties.php | 6 +- .../bpmn/proxyTaskPropertiesDetails.php | 4 +- .../engine/methods/bpmn/proxyTaskSteps.php | 4 +- .../engine/methods/bpmn/proxyUsersList.php | 4 +- .../engine/methods/bpmn/proxyVariable.php | 2 +- workflow/engine/methods/bpmn/saveProcess.php | 16 ++-- .../methods/cases/cases_generatePMTable.php | 2 +- .../cases/proxySaveReassignCasesList.php | 2 +- .../methods/dynaforms/dynaforms_Save.php | 4 +- .../methods/processes/processes_Ajax.php | 4 +- 29 files changed, 112 insertions(+), 112 deletions(-) diff --git a/gulliver/system/class.webResource.php b/gulliver/system/class.webResource.php index 9746e615b..3872e2908 100644 --- a/gulliver/system/class.webResource.php +++ b/gulliver/system/class.webResource.php @@ -53,7 +53,7 @@ class WebResource if (isset($post['function'])&&$post['function']!='') { /*Call a function*/ header('Content-Type: text/json'); - $parameters=json_decode((urldecode($post['parameters']))); + $parameters=G::json_decode((urldecode($post['parameters']))); $paramsRef=array(); foreach($parameters as $key => $value) { diff --git a/workflow/engine/methods/bpmn/get-tree.php b/workflow/engine/methods/bpmn/get-tree.php index 37552e86e..1eabb39cd 100755 --- a/workflow/engine/methods/bpmn/get-tree.php +++ b/workflow/engine/methods/bpmn/get-tree.php @@ -12,7 +12,7 @@ try } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } $steps = array(); @@ -167,4 +167,4 @@ try }] }]";*/ //echo $nodes; -echo json_encode($steps); \ No newline at end of file +echo G::json_encode($steps); diff --git a/workflow/engine/methods/bpmn/get-triggers-tree.php b/workflow/engine/methods/bpmn/get-triggers-tree.php index 7d27b9cce..7b30895c0 100755 --- a/workflow/engine/methods/bpmn/get-triggers-tree.php +++ b/workflow/engine/methods/bpmn/get-triggers-tree.php @@ -14,7 +14,7 @@ try } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } $steps = array(); @@ -121,4 +121,4 @@ try 'children' => $assignTaskChildren ); - echo json_encode($steps); \ No newline at end of file + echo G::json_encode($steps); diff --git a/workflow/engine/methods/bpmn/openProcess.php b/workflow/engine/methods/bpmn/openProcess.php index 9b623b413..927df39c0 100755 --- a/workflow/engine/methods/bpmn/openProcess.php +++ b/workflow/engine/methods/bpmn/openProcess.php @@ -261,12 +261,12 @@ $result['ROUTES'] = $arrayRoutes; $result['EVENTS'] = $arrayEvents; $result['GATEWAYS'] = $arrayGateways; - $aTasks = json_encode($arrayTasks); - $aSubProcess = json_encode($arraySubProcess); - $aRoutes = json_encode($arrayRoutes); - $aEvents = json_encode($arrayEvents); - $aGateways = json_encode($arrayGateways); - $aProcess = json_encode($process); - $aLanes = json_encode($lanes); + $aTasks = G::json_encode($arrayTasks); + $aSubProcess = G::json_encode($arraySubProcess); + $aRoutes = G::json_encode($arrayRoutes); + $aEvents = G::json_encode($arrayEvents); + $aGateways = G::json_encode($arrayGateways); + $aProcess = G::json_encode($process); + $aLanes = G::json_encode($lanes); echo "tasks:$aTasks|gateways:$aGateways|events:$aEvents|annotations:$aLanes|process:$aProcess|subprocess:$aSubProcess|routes:$aRoutes"; -?> \ No newline at end of file +?> diff --git a/workflow/engine/methods/bpmn/processes_Ajax.php b/workflow/engine/methods/bpmn/processes_Ajax.php index 1a4b164f3..2cee1e82e 100755 --- a/workflow/engine/methods/bpmn/processes_Ajax.php +++ b/workflow/engine/methods/bpmn/processes_Ajax.php @@ -289,16 +289,16 @@ if ( isset ($_REQUEST['action']) ) { if(isset($_POST['VAR_OUT']) && $_POST['VAR_OUT'] != ''){ $varOut = explode('|',$_POST['VAR_OUT']); - $aVarOut1 = json_decode($varOut[0]); - $aVarOut2 = json_decode($varOut[1]); + $aVarOut1 = G::json_decode($varOut[0]); + $aVarOut2 = G::json_decode($varOut[1]); for($i=1; $i<=count($aVarOut1); $i++){ $out[$aVarOut1[$i-1]]= $aVarOut2[$i-1]; } } if(isset($_POST['VAR_IN']) && $_POST['VAR_IN'] != ''){ $varIn = explode('|',$_POST['VAR_IN']); - $aVarIn1 = json_decode($varIn[0]); - $aVarIn2 = json_decode($varIn[1]); + $aVarIn1 = G::json_decode($varIn[0]); + $aVarIn2 = G::json_decode($varIn[1]); for($i=1; $i<=count($aVarIn1); $i++){ $in[$aVarIn1[$i-1]]= $aVarIn2[$i-1]; } @@ -385,7 +385,7 @@ if ( isset ($_REQUEST['action']) ) { $ooutputDocument = new OutputDocument(); if (isset($_GET['OUT_DOC_UID'])) { $rows = $ooutputDocument->load($_GET['OUT_DOC_UID']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; echo $result; diff --git a/workflow/engine/methods/bpmn/processes_doUpload.php b/workflow/engine/methods/bpmn/processes_doUpload.php index 4874c9642..55f741459 100755 --- a/workflow/engine/methods/bpmn/processes_doUpload.php +++ b/workflow/engine/methods/bpmn/processes_doUpload.php @@ -174,6 +174,6 @@ Notes: /* Handles the error output. This error message will be sent to the uploadSuccess event handler. The event handler will have to check for any error messages and react as needed. */ function HandleError($message) { - die('{success:false,error:'.json_encode($message).'}'); + die('{success:false,error:'.G::json_encode($message).'}'); } -?> \ No newline at end of file +?> diff --git a/workflow/engine/methods/bpmn/proxyCaseSchLoad.php b/workflow/engine/methods/bpmn/proxyCaseSchLoad.php index 6d74ec047..583e83578 100755 --- a/workflow/engine/methods/bpmn/proxyCaseSchLoad.php +++ b/workflow/engine/methods/bpmn/proxyCaseSchLoad.php @@ -47,7 +47,7 @@ try } - $result = json_encode( $rows ) ; + $result = G::json_encode( $rows ) ; $result = str_replace("\\/","/",'{success:true,data:'.$result.'}'); // unescape the slashes } else @@ -57,11 +57,11 @@ try echo $result; } - //print json_encode( $result ) ; + //print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyCaseTrackerObjects.php b/workflow/engine/methods/bpmn/proxyCaseTrackerObjects.php index ce5d7eddf..58a86a340 100644 --- a/workflow/engine/methods/bpmn/proxyCaseTrackerObjects.php +++ b/workflow/engine/methods/bpmn/proxyCaseTrackerObjects.php @@ -14,5 +14,5 @@ if (isset($_GET['tid'] )) array_shift($rows); $result['totalCount'] = count($rows); $result['data'] = $rows; -print json_encode($result); +print G::json_encode($result); ?> diff --git a/workflow/engine/methods/bpmn/proxyDatabaseConn.php b/workflow/engine/methods/bpmn/proxyDatabaseConn.php index 89e914b39..f569eb054 100644 --- a/workflow/engine/methods/bpmn/proxyDatabaseConn.php +++ b/workflow/engine/methods/bpmn/proxyDatabaseConn.php @@ -15,13 +15,13 @@ try $rows = $o->load($_GET['tid']); } - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; echo $result; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } -?> \ No newline at end of file +?> diff --git a/workflow/engine/methods/bpmn/proxyDynaform.php b/workflow/engine/methods/bpmn/proxyDynaform.php index 52a8655c6..740c62012 100755 --- a/workflow/engine/methods/bpmn/proxyDynaform.php +++ b/workflow/engine/methods/bpmn/proxyDynaform.php @@ -29,9 +29,9 @@ try $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } diff --git a/workflow/engine/methods/bpmn/proxyEventsLoad.php b/workflow/engine/methods/bpmn/proxyEventsLoad.php index beb4a065c..5ddf2e445 100755 --- a/workflow/engine/methods/bpmn/proxyEventsLoad.php +++ b/workflow/engine/methods/bpmn/proxyEventsLoad.php @@ -10,7 +10,7 @@ try $oEvent = new Event(); $aRows = $oEvent->load($_GET['startInterId']); //$sch_uid = $oData['EVN_ACTION']; - $result = json_encode( $aRows ); + $result = G::json_encode( $aRows ); $result = str_replace("\\/","/",'{success:true,data:'.$result.'}'); // unescape the slashes /*else { @@ -18,10 +18,10 @@ try }*/ echo $result; } - //print json_encode( $result ) ; + //print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyExtjs.php b/workflow/engine/methods/bpmn/proxyExtjs.php index a58b6c556..e388932f9 100644 --- a/workflow/engine/methods/bpmn/proxyExtjs.php +++ b/workflow/engine/methods/bpmn/proxyExtjs.php @@ -26,7 +26,7 @@ switch( $_GET['action'] ) { case 'getDynaformList' : $result = $oProcessMap->getExtDynaformsList($start, $limit, $_GET['pid']); - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getPMTableDynaform': @@ -42,14 +42,14 @@ } $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAdditionalTables': $rows = $oProcessMap->getExtAdditionalTablesList(); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getInputDocumentList': @@ -57,14 +57,14 @@ $result['totalCount'] = $oProcessMap->getAllInputDocumentCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'editInputDocument': require_once 'classes/model/InputDocument.php'; $oInputDocument = new InputDocument(); $rows = $oInputDocument->load($_GET['INP_DOC_UID']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -76,13 +76,13 @@ $result['totalCount'] = $oProcessMap->getAllOutputDocumentCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'editObjectPermission': $rows = $oProcessMap->editExtObjectPermission($_GET['pid'],$_GET['op_uid']); //array_shift($rows); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -93,7 +93,7 @@ require_once 'classes/model/OutputDocument.php'; $oOutputDocument = new OutputDocument(); $rows = $oOutputDocument->load($_GET['tid']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -104,14 +104,14 @@ $rows = $oProcessMap->getExtReportTables($start, $limit,$_GET['pid']); $result['totalCount'] = $oProcessMap->getAllReportTableCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'editReportTables': require_once 'classes/model/ReportTable.php'; $oReportTable = new ReportTable(); $rows = $oReportTable->load($_GET['REP_TAB_UID'],$_GET['pid']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -142,21 +142,21 @@ } $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getDatabaseConnectionList': $rows = $oProcessMap->getExtCriteriaDBSList($start, $limit,$_GET['pid']); $result['totalCount'] = $oProcessMap->getAllDbSourceCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'editDatabaseConnection': require_once 'classes/model/DbSource.php'; $o = new DbSource(); $rows = $o->load($_GET['dbs_uid'],$_GET['pid']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -167,39 +167,39 @@ $rows = $oProcessMap->listExtProcessesSupervisors($start, $limit, $_GET['pid']); $result['totalCount'] = $oProcessMap->getAllProcessSupervisorsCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'availableProcessesSupervisors': $rows = $oProcessMap->listExtNoProcessesUser($_GET['pid']); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'supervisorDynaforms': $rows = $oProcessMap->getExtSupervisorDynaformsList($start, $limit,$_GET['pid']); $result['totalCount'] = $oProcessMap->getAllSupervisorDynaformsCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'availableSupervisorDynaforms': $rows = $oProcessMap->getExtAvailableSupervisorDynaformsList($_GET['pid']); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'supervisorInputDoc': $rows = $oProcessMap->getExtSupervisorInputsList($start, $limit,$_GET['pid']); $result['totalCount'] = $oProcessMap->getAllSupervisorInputsCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'availableSupervisorInputDoc': $rows = $oProcessMap->getExtAvailableSupervisorInputsList($_GET['pid']); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAssignedCaseTrackerObjects': @@ -207,7 +207,7 @@ $result['totalCount'] = $oProcessMap->getAllCaseTrackerObjectCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAvailableCaseTrackerObjects': @@ -215,7 +215,7 @@ array_shift($rows); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAvailableSteps': @@ -223,7 +223,7 @@ array_shift($rows); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAssignedSteps': @@ -231,7 +231,7 @@ $result['totalCount'] = $oProcessMap->getAllStepCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAssignedUsersList': @@ -239,14 +239,14 @@ $result['totalCount'] = $oProcessMap->getAllTaskUserCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAvailableUsersList': $rows = $oProcessMap->getAvailableExtUsersCriteria($_GET['tid']); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAvailableStepTriggers': @@ -257,14 +257,14 @@ $rows = $oProcessMap->getExtAvailableStepTriggersCriteria($_GET['pid'], $sStep, $_GET['tid'], $sType); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getAssignedStepTriggers': $rows = $oProcessMap->getExtStepTriggersCriteria($start, $limit, $sStep, $_GET['tid'], $sType); $result['totalCount'] = $oProcessMap->getAllStepTriggerCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'availableUsers': @@ -272,7 +272,7 @@ array_shift($rows); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'assignedUsers': @@ -280,7 +280,7 @@ $result['totalCount'] = $oProcessMap->getAllTaskUserCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getTaskPropertiesList': @@ -303,7 +303,7 @@ else if($key == 'TAS_TYPE' && $value == 'ADHOC') $rows[$key] = true; } - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -314,7 +314,7 @@ if($_GET['type'] == 2) //Loading sub process details { $rows = $oProcessMap->subProcessExtProperties($_GET['pid'], $_GET['tid'],'','0'); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -325,14 +325,14 @@ $rows = $oProcessMap->subProcessExtProperties($_GET['pid'], $_GET['tid'],'',$_GET['type']); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } break; case 'getObjectPermission': $rows = $oProcessMap->getExtObjectsPermissions($start, $limit,$_GET['pid']); $result['totalCount'] = $oProcessMap->getAllObjectPermissionCount(); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'getObjectPermissionType': @@ -340,12 +340,12 @@ array_shift($rows); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'process_Edit': $rows = $oProcessMap->editProcessNew($_GET['pid']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -357,7 +357,7 @@ $result['totalCount'] = $oProcessMap->getAllTriggersCount(); array_shift($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; break; case 'editTriggers': @@ -368,7 +368,7 @@ $oTrigger = new Triggers(); $rows = $oTrigger->load($_GET['TRI_UID']); } - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; echo $result; @@ -378,7 +378,7 @@ //$rows = $oProcessMap->caseTracker($_GET['pid']); $oCaseTracker = new CaseTracker ( ); $rows = $oCaseTracker->load($_GET['pid']); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; echo $result; @@ -438,7 +438,7 @@ array_shift($rows); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode($result); + print G::json_encode($result); break; @@ -446,8 +446,8 @@ } //$result['data'] = $rows; - //print json_encode( $result ) ; - /*$tmpData = json_encode( $rows ) ; + //print G::json_encode( $result ) ; + /*$tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; echo $result;*/ diff --git a/workflow/engine/methods/bpmn/proxyInputDocument.php b/workflow/engine/methods/bpmn/proxyInputDocument.php index ca8f40ec7..8bf76ed79 100644 --- a/workflow/engine/methods/bpmn/proxyInputDocument.php +++ b/workflow/engine/methods/bpmn/proxyInputDocument.php @@ -16,8 +16,8 @@ try } // $result['totalCount'] = count($rows); // $result['data'] = $rows; -// print json_encode( $result) ; - $tmpData = json_encode( $rows ) ; +// print G::json_encode( $result) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -26,5 +26,5 @@ try } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } diff --git a/workflow/engine/methods/bpmn/proxyObjectPermissions.php b/workflow/engine/methods/bpmn/proxyObjectPermissions.php index 6c922250d..45c40476f 100755 --- a/workflow/engine/methods/bpmn/proxyObjectPermissions.php +++ b/workflow/engine/methods/bpmn/proxyObjectPermissions.php @@ -14,5 +14,5 @@ if ( isset($_GET['pid'] )&& isset($_GET['action']) ) } $result['totalCount'] = count($rows); $result['data'] = $rows; -print json_encode($result); +print G::json_encode($result); ?> diff --git a/workflow/engine/methods/bpmn/proxyOutputDocument.php b/workflow/engine/methods/bpmn/proxyOutputDocument.php index fabca858c..5a9b7cf12 100644 --- a/workflow/engine/methods/bpmn/proxyOutputDocument.php +++ b/workflow/engine/methods/bpmn/proxyOutputDocument.php @@ -20,7 +20,7 @@ if (isset($_GET['tid'])) $rows = $oOutputDocument->load($_GET['tid']); } - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -28,9 +28,9 @@ if (isset($_GET['tid'])) /* $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result) ;*/ + print G::json_encode( $result) ;*/ } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } diff --git a/workflow/engine/methods/bpmn/proxyProcessSupervisors.php b/workflow/engine/methods/bpmn/proxyProcessSupervisors.php index bdeeb687c..a31c5d74d 100644 --- a/workflow/engine/methods/bpmn/proxyProcessSupervisors.php +++ b/workflow/engine/methods/bpmn/proxyProcessSupervisors.php @@ -31,10 +31,10 @@ try $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyProcesses_Export.php b/workflow/engine/methods/bpmn/proxyProcesses_Export.php index 3f5ff07b3..39b466591 100755 --- a/workflow/engine/methods/bpmn/proxyProcesses_Export.php +++ b/workflow/engine/methods/bpmn/proxyProcesses_Export.php @@ -51,7 +51,7 @@ $Fields['FILENAME_LINKXPDL'] = $xpdlFields['FILENAME_LINKXPDL']; $Fields['FILENAME_LINK'] = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/processes/' . $Fields['FILENAME_LINK']; $Fields['FILENAME_LINKXPDL'] = $http . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/processes/' . $Fields['FILENAME_LINKXPDL']; -$result = json_encode( $Fields ); +$result = G::json_encode( $Fields ); $result = str_replace("\\/","/",'{success:true,data:'.$result.'}'); // unescape the slashes echo $result; diff --git a/workflow/engine/methods/bpmn/proxyReportTables.php b/workflow/engine/methods/bpmn/proxyReportTables.php index 2a4f3023f..110d2e2e5 100755 --- a/workflow/engine/methods/bpmn/proxyReportTables.php +++ b/workflow/engine/methods/bpmn/proxyReportTables.php @@ -36,10 +36,10 @@ try $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } -?> \ No newline at end of file +?> diff --git a/workflow/engine/methods/bpmn/proxyStepTriggers.php b/workflow/engine/methods/bpmn/proxyStepTriggers.php index 2fe1ddca4..716377cba 100755 --- a/workflow/engine/methods/bpmn/proxyStepTriggers.php +++ b/workflow/engine/methods/bpmn/proxyStepTriggers.php @@ -30,11 +30,11 @@ try $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxySubProcessProperties.php b/workflow/engine/methods/bpmn/proxySubProcessProperties.php index 95ba956f1..9d973906c 100755 --- a/workflow/engine/methods/bpmn/proxySubProcessProperties.php +++ b/workflow/engine/methods/bpmn/proxySubProcessProperties.php @@ -9,7 +9,7 @@ try if($_GET['type'] == 2) //Loading sub process details { $rows = $oProcessMap->subProcessExtProperties($_GET['pid'], $_GET['tid'],'','0'); - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -20,12 +20,12 @@ try $rows = $oProcessMap->subProcessExtProperties($_GET['pid'], $_GET['tid'],'',$_GET['type']); $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyTaskPropertiesDetails.php b/workflow/engine/methods/bpmn/proxyTaskPropertiesDetails.php index 936067246..0faa1f5c4 100755 --- a/workflow/engine/methods/bpmn/proxyTaskPropertiesDetails.php +++ b/workflow/engine/methods/bpmn/proxyTaskPropertiesDetails.php @@ -49,7 +49,7 @@ try } } - $tmpData = json_encode( $rows ) ; + $tmpData = G::json_encode( $rows ) ; $tmpData = str_replace("\\/","/",'{success:true,data:'.$tmpData.'}'); // unescape the slashes $result = $tmpData; @@ -58,7 +58,7 @@ try } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyTaskSteps.php b/workflow/engine/methods/bpmn/proxyTaskSteps.php index 562fbace1..fc657012a 100755 --- a/workflow/engine/methods/bpmn/proxyTaskSteps.php +++ b/workflow/engine/methods/bpmn/proxyTaskSteps.php @@ -18,11 +18,11 @@ try $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyUsersList.php b/workflow/engine/methods/bpmn/proxyUsersList.php index e2bc4170f..ab0bbb928 100755 --- a/workflow/engine/methods/bpmn/proxyUsersList.php +++ b/workflow/engine/methods/bpmn/proxyUsersList.php @@ -15,10 +15,10 @@ try $result['totalCount'] = count($rows); $result['data'] = $rows; - print json_encode( $result ) ; + print G::json_encode( $result ) ; } catch ( Exception $e ) { - print json_encode ( $e->getMessage() ); + print G::json_encode ( $e->getMessage() ); } ?> diff --git a/workflow/engine/methods/bpmn/proxyVariable.php b/workflow/engine/methods/bpmn/proxyVariable.php index 7af26c3a2..9dad9f008 100644 --- a/workflow/engine/methods/bpmn/proxyVariable.php +++ b/workflow/engine/methods/bpmn/proxyVariable.php @@ -56,5 +56,5 @@ foreach ( $aFields as $aField ) { array_shift($aRows); $result['totalCount'] = count($aRows); $result['data'] = $aRows; -print json_encode($result); +print G::json_encode($result); ?> diff --git a/workflow/engine/methods/bpmn/saveProcess.php b/workflow/engine/methods/bpmn/saveProcess.php index 1ae3cab96..9bab89e25 100755 --- a/workflow/engine/methods/bpmn/saveProcess.php +++ b/workflow/engine/methods/bpmn/saveProcess.php @@ -40,7 +40,7 @@ try{ $result['status_code'] = $idProcess; $result['message'] = "the process don't exists"; $result['timestamp'] = date('Y-m-d H:i:s'); - echo json_encode($result); + echo G::json_encode($result); die; } } @@ -49,15 +49,15 @@ try{ $result['status_code'] = 1; $result['message'] = "you don't send the process uid"; $result['timestamp'] = date('Y-m-d H:i:s'); - echo json_encode($result); + echo G::json_encode($result); die; } - $aTasks = json_decode ( $_POST['tasks'] ); - $aRoutes = json_decode ( $_POST['routes'] ); - $aEvents = json_decode ( $_POST['events'] ); - $aGateways = json_decode ( $_POST['gateways'] ); - $aAnnotations = json_decode ( $_POST['annotations'] ); - $aSubprocess = json_decode ( $_POST['subprocess'] ); + $aTasks = G::json_decode ( $_POST['tasks'] ); + $aRoutes = G::json_decode ( $_POST['routes'] ); + $aEvents = G::json_decode ( $_POST['events'] ); + $aGateways = G::json_decode ( $_POST['gateways'] ); + $aAnnotations = G::json_decode ( $_POST['annotations'] ); + $aSubprocess = G::json_decode ( $_POST['subprocess'] ); $fields = $oProcess->serializeProcess($idProcess); $oData = unserialize($fields); $aRoutes = $oProcess->super_unique($aRoutes); diff --git a/workflow/engine/methods/cases/cases_generatePMTable.php b/workflow/engine/methods/cases/cases_generatePMTable.php index 02eb685f9..c1dd246b6 100644 --- a/workflow/engine/methods/cases/cases_generatePMTable.php +++ b/workflow/engine/methods/cases/cases_generatePMTable.php @@ -8,7 +8,7 @@ require_once ( "classes/model/AdditionalTables.php" ); require_once ( "classes/model/Fields.php" ); // passing the parameters $pmTableName = (isset($_POST['tableName'])) ? $_POST['tableName'] : 'contenders'; -$pmTableFields = (isset($_POST['tableFields'])) ? json_decode($_POST['tableFields']) : array(); +$pmTableFields = (isset($_POST['tableFields'])) ? G::json_decode($_POST['tableFields']) : array(); // default parameters //$pmTableName = 'Sender'; diff --git a/workflow/engine/methods/cases/proxySaveReassignCasesList.php b/workflow/engine/methods/cases/proxySaveReassignCasesList.php index 0e906177b..58dc7ae4b 100644 --- a/workflow/engine/methods/cases/proxySaveReassignCasesList.php +++ b/workflow/engine/methods/cases/proxySaveReassignCasesList.php @@ -22,7 +22,7 @@ * Coral Gables, FL, 33134, USA, or email info@colosa.com. * */ - $aData = json_decode($_POST['data']); + $aData = G::json_decode($_POST['data']); $appSelectedUids = array (); $items = explode(",",$_POST['APP_UIDS']); foreach ($items as $item) { diff --git a/workflow/engine/methods/dynaforms/dynaforms_Save.php b/workflow/engine/methods/dynaforms/dynaforms_Save.php index 886fdd8a5..b537b4234 100644 --- a/workflow/engine/methods/dynaforms/dynaforms_Save.php +++ b/workflow/engine/methods/dynaforms/dynaforms_Save.php @@ -82,8 +82,8 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons $aVariables = array(); if(isset($aData['FIELDS'])) { - $aFields = json_decode($_POST['FIELDS']); - $aVariables = json_decode($_POST['VARIABLES']); + $aFields = G::json_decode($_POST['FIELDS']); + $aVariables = G::json_decode($_POST['VARIABLES']); } $aData['FIELDS'] = array(); for($i=0;$iprocessFilesManager($oData->pro_uid); break; case 'exploreDirectory': - $objData = json_decode($_REQUEST['data']); + $objData = G::json_decode($_REQUEST['data']); $_SESSION['PFMDirectory'] = $objData->{'main_directory'}; $oProcessMap->exploreDirectory($oData->pro_uid, $oData->main_directory, $oData->directory); break; @@ -505,4 +505,4 @@ try { catch (Exception $oException) { die($oException->getMessage() . "\n" . $oException->getTraceAsString()); } -?> \ No newline at end of file +?>