From a6f7a330f7d0ad98c8a959d0ba9aecc43040767b Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 9 Apr 2014 08:48:04 -0400 Subject: [PATCH 1/3] little fix, remove a debug die() class --- workflow/engine/methods/processes/processes_Import_Ajax.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 9ca48d0a1..42b9878d5 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -77,7 +77,7 @@ if (isset($_FILES["PROCESS_FILENAME"])) { die($e->getMessage()); } } -die; + function reservedWordsSqlValidate ($data) { $arrayAux = array (); @@ -118,6 +118,7 @@ if ($action == "uploadFileNewProcess") { try { //type of file: only pm $processFileType = $_REQUEST["processFileType"]; + $oProcess = new stdClass(); $oData = new stdClass(); From 3b0f5fafa6ad4e23266da81d1da67ed6028dbacb Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Wed, 9 Apr 2014 09:18:53 -0400 Subject: [PATCH 2/3] little update, on case that a error occurs while importing existing bpmn process --- .../processes/processes_Import_Ajax.php | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 42b9878d5..d2694b62e 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -21,13 +21,16 @@ * For more information, contact Colosa Inc, 2566 Le Jeune Rd., * Coral Gables, FL, 33134, USA, or email info@colosa.com. */ + +use ProcessMaker\Importer\XmlImporter; + ini_set( 'max_execution_time', '0' ); if (isset($_FILES["PROCESS_FILENAME"])) { $ext = pathinfo($_FILES["PROCESS_FILENAME"]["name"], PATHINFO_EXTENSION); if ($ext == "pmx") { - $importer = new \ProcessMaker\Importer\XmlImporter(); + $importer = new XmlImporter(); $importer->setData("usr_uid", $_SESSION['USER_LOGGED']); $importer->setSaveDir(PATH_DOCUMENT . 'input'); $importer->setSourceFromGlobals("PROCESS_FILENAME"); @@ -50,7 +53,7 @@ if (isset($_FILES["PROCESS_FILENAME"])) { "ExistProcessInDatabase" => 1, "ExistGroupsInDatabase" => 0, "groupBeforeAccion" => "uploadFileNewProcess", - "sNewProUid" => "63626727053359dabb8fee8019503780", + "sNewProUid" => "", "proFileName" => $_FILES['PROCESS_FILENAME']['name'], "project_type" => "bpmn" ); @@ -62,20 +65,31 @@ if (isset($_FILES["PROCESS_FILENAME"])) { } elseif (isset($_POST["PRO_FILENAME"]) && file_exists(PATH_DOCUMENT . 'input' . PATH_SEP . $_POST["PRO_FILENAME"])) { switch ($_POST["IMPORT_OPTION"]) { - case 1: $option = ProcessMaker\Importer\XmlImporter::IMPORT_OPTION_OVERWRITE; break; - case 2: $option = ProcessMaker\Importer\XmlImporter::IMPORT_OPTION_DISABLE_AND_CREATE_NEW; break; - case 3: $option = ProcessMaker\Importer\XmlImporter::IMPORT_OPTION_CREATE_NEW; break; + case 1: $option = XmlImporter::IMPORT_OPTION_OVERWRITE; break; + case 2: $option = XmlImporter::IMPORT_OPTION_DISABLE_AND_CREATE_NEW; break; + case 3: $option = XmlImporter::IMPORT_OPTION_CREATE_NEW; break; } - $importer = new ProcessMaker\Importer\XmlImporter(); + $importer = new XmlImporter(); $importer->setData("usr_uid", $_SESSION['USER_LOGGED']); $importer->setSourceFile(PATH_DOCUMENT . 'input' . PATH_SEP . $_POST["PRO_FILENAME"]); try { $res = $importer->import($option); } catch (\Exception $e) { - die($e->getMessage()); + $result = array( + "success" => true, + "catchMessage" => $e->getMessage(), + "ExistProcessInDatabase" => 1, + "ExistGroupsInDatabase" => 0, + "groupBeforeAccion" => "uploadFileNewProcess", + "sNewProUid" => "", + "proFileName" => "", + "project_type" => "bpmn" + ); } + + exit(0); } function reservedWordsSqlValidate ($data) From d0a1b4859c5e8e3015c7d086467d90f2988e3629 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Wed, 9 Apr 2014 10:52:53 -0400 Subject: [PATCH 3/3] Arreglo de datos GET en MULTIPART --- framework/src/Maveriks/WebApplication.php | 6 +++++- workflow/engine/src/ProcessMaker/Services/api.ini | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index edc86752e..cfa325f4d 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -121,11 +121,15 @@ class WebApplication } } - $baseUrl = (empty($input->base_url)) ? $uri : $input->base_url; foreach($input->calls as $value) { $_SERVER["REQUEST_METHOD"] = (empty($value->method)) ? 'GET' : $value->method; $uriTemp = trim($baseUrl) . trim($value->url); + if (strpos($uriTemp, '?') !== false) { + $dataGet = explode('?', $uriTemp); + parse_str($dataGet[1], $get); + $_GET = array_merge($_GET, $get); + } $inputExecute = (empty($value->data)) ? '' : json_encode($value->data); $this->responseMultipart[] = $this->dispatchApiRequest($uriTemp, $version, true, $inputExecute); } diff --git a/workflow/engine/src/ProcessMaker/Services/api.ini b/workflow/engine/src/ProcessMaker/Services/api.ini index 7fc422687..92b162340 100644 --- a/workflow/engine/src/ProcessMaker/Services/api.ini +++ b/workflow/engine/src/ProcessMaker/Services/api.ini @@ -40,6 +40,9 @@ debug = 1 [alias: projects] project = "ProcessMaker\Services\Api\Project" +[alias: departments] + project = "ProcessMaker\Services\Api\Department" + [alias: group] group = "ProcessMaker\Services\Api\Group" user = "ProcessMaker\Services\Api\Group\User"