From 6f73401b2cb38939ed4c34e892bfc2afe184b1dc Mon Sep 17 00:00:00 2001 From: dheeyi Date: Tue, 19 May 2015 10:38:06 -0400 Subject: [PATCH 1/5] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log:?= =?UTF-8?q?=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indic?= =?UTF-8?q?a=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proces?= =?UTF-8?q?o.=20Causa=20:=20Llamada=20al=20metodo=20Auditlog=20en=20esas?= =?UTF-8?q?=20situaciones(Importaci=C3=B3=20Eliminaci=C3=B3e=20procesos).?= =?UTF-8?q?=20Soluci=C3=B3=20=20Agregar=20el=20registro=20para=20el=20Audi?= =?UTF-8?q?tlog=20en=20situaciones=20de=20Importaci=C3=B3=20Eliminaci?= =?UTF-8?q?=C3=B3n=20procesos=20.pm,=20.pmx=20y=20bpmn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/methods/processes/processes_Delete.php | 3 +-- workflow/engine/methods/processes/processes_Import_Ajax.php | 1 + workflow/engine/methods/setup/auditLog.php | 4 +++- .../engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 2 ++ .../engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Delete.php b/workflow/engine/methods/processes/processes_Delete.php index e3a5a15b1..7716414fc 100755 --- a/workflow/engine/methods/processes/processes_Delete.php +++ b/workflow/engine/methods/processes/processes_Delete.php @@ -42,7 +42,6 @@ if ($access != 1) { //$oProcessMap = new ProcessMap(); $uids = explode(',', $_POST['PRO_UIDS']); - try { foreach ($uids as $uid) { //$oProcessMap->deleteProcess($uid); @@ -53,7 +52,7 @@ try { $resp = new StdClass(); $resp->status = 0; $resp->msg = 'All process was deleted successfully'; - + G::auditLog("DeleteProcess", "Process UID : " . $_POST['PRO_UIDS']); echo G::json_encode($resp); } catch (Exception $e) { diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index b5e6bb253..0621053a1 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -226,6 +226,7 @@ if ($action == "uploadFileNewProcess") { $result->ExistGroupsInDatabase = ""; //"" -Default //0 -Dont exist process //1 -exist process + G::auditLog("ImportProcess", " PM -> Process UID : "); $optionGroupExistInDatabase = isset( $_REQUEST["optionGroupExistInDatabase"] ) ? $_REQUEST["optionGroupExistInDatabase"] : null; //!Upload file diff --git a/workflow/engine/methods/setup/auditLog.php b/workflow/engine/methods/setup/auditLog.php index 873bc590b..80f02f02c 100644 --- a/workflow/engine/methods/setup/auditLog.php +++ b/workflow/engine/methods/setup/auditLog.php @@ -150,7 +150,9 @@ $arrayAction = array( "AssignUserTask" => G::LoadTranslation("ID_ASSIGN_USER_TASK"), "AssignGroupTask" => G::LoadTranslation("ID_ASSIGN_GROUP_TASK"), "DeleteUserTask" => G::LoadTranslation("ID_DELETE_USER_TASK"), - "DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK") + "DeleteGroupTask" => G::LoadTranslation("ID_DELETE_GROUP_TASK"), + "ImportProcess" => G::LoadTranslation("ID_IMPORT_PROCESS"), + "DeleteProcess" => G::LoadTranslation("ID_DELETE_PROCESS") ); asort($arrayAction); diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 1fb12390e..1d29c769b 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -75,6 +75,8 @@ class BpmnWorkflow extends Project\Bpmn } $this->wp = new Project\Workflow(); + //Add AudiLog Import Process + \G::auditLog("ImportProcess", " PMX -> Process UID : " . $this->getUid()); $this->wp->create($wpData); } catch (\Exception $e) { diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php index 80b153d0f..f7885213b 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php @@ -59,6 +59,8 @@ class WorkflowBpmn extends Project\Workflow } $this->bp = new Project\Bpmn(); + //Add AudiLog Import Process + \G::auditLog("ImportProcess", " BPMN -> Process UID : " . $this->getUid()); $this->bp->create($bpData); // At this time we will add a default diagram and process From 082748082897ba2150335e4953306700dceb02e6 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Tue, 19 May 2015 11:14:43 -0400 Subject: [PATCH 2/5] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log:?= =?UTF-8?q?=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indic?= =?UTF-8?q?a=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proces?= =?UTF-8?q?o.=20Causa=20:=20Llamada=20al=20metodo=20Auditlog=20en=20esas?= =?UTF-8?q?=20situaciones(Importaci=C3=B3=20Eliminaci=C3=B3e=20procesos).?= =?UTF-8?q?=20Soluci=C3=B3=20=20Agregar=20el=20registro=20para=20el=20Audi?= =?UTF-8?q?tlog=20en=20situaciones=20de=20Importaci=C3=B3=20Eliminaci?= =?UTF-8?q?=C3=B3n=20procesos=20.pm,=20.pmx=20y=20bpmn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/methods/processes/processes_Delete.php | 1 + .../engine/methods/processes/processes_Import_Ajax.php | 7 +++++-- .../src/ProcessMaker/Project/Adapter/BpmnWorkflow.php | 2 +- .../src/ProcessMaker/Project/Adapter/WorkflowBpmn.php | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Delete.php b/workflow/engine/methods/processes/processes_Delete.php index 7716414fc..23cdf2917 100755 --- a/workflow/engine/methods/processes/processes_Delete.php +++ b/workflow/engine/methods/processes/processes_Delete.php @@ -52,6 +52,7 @@ try { $resp = new StdClass(); $resp->status = 0; $resp->msg = 'All process was deleted successfully'; + //Add Audit Log G::auditLog("DeleteProcess", "Process UID : " . $_POST['PRO_UIDS']); echo G::json_encode($resp); diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 0621053a1..2ef0e9f6e 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -225,8 +225,7 @@ if ($action == "uploadFileNewProcess") { //1 -exist process $result->ExistGroupsInDatabase = ""; //"" -Default //0 -Dont exist process - //1 -exist process - G::auditLog("ImportProcess", " PM -> Process UID : "); + //1 -exist process $optionGroupExistInDatabase = isset( $_REQUEST["optionGroupExistInDatabase"] ) ? $_REQUEST["optionGroupExistInDatabase"] : null; //!Upload file @@ -257,6 +256,9 @@ if ($action == "uploadFileNewProcess") { $oData = $oProcess->getProcessData( $path . $filename ); } + //Add Audit Log + G::auditLog("ImportProcess", " PM -> Process UID : " . $oData->process['PRO_UID']); + $importer->throwExceptionIfExistsReservedWordsSql($oData); //!Upload file @@ -304,6 +306,7 @@ if ($action == "uploadFileNewProcess") { //!data ouput $result->sNewProUid = $sProUid; $result->proFileName = $Fields['PRO_FILENAME']; + } catch (Exception $e) { $result->response = $e->getMessage(); $result->catchMessage = $e->getMessage(); diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 1d29c769b..941eb74f3 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -75,7 +75,7 @@ class BpmnWorkflow extends Project\Bpmn } $this->wp = new Project\Workflow(); - //Add AudiLog Import Process + //Add Audit Log \G::auditLog("ImportProcess", " PMX -> Process UID : " . $this->getUid()); $this->wp->create($wpData); diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php index f7885213b..2002a89f1 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php @@ -59,7 +59,7 @@ class WorkflowBpmn extends Project\Workflow } $this->bp = new Project\Bpmn(); - //Add AudiLog Import Process + //Add Audit Log \G::auditLog("ImportProcess", " BPMN -> Process UID : " . $this->getUid()); $this->bp->create($bpData); From 14566e1de00f0e9cd79383644d302c634aecb065 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Tue, 19 May 2015 15:51:41 -0400 Subject: [PATCH 3/5] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log:?= =?UTF-8?q?=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indic?= =?UTF-8?q?a=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proces?= =?UTF-8?q?o.=20Causa=20:=20Llamada=20al=20metodo=20Auditlog=20en=20esas?= =?UTF-8?q?=20situaciones(Importaci=C3=B3=20Eliminaci=C3=B3e=20procesos).?= =?UTF-8?q?=20Soluci=C3=B3=20=20Agregar=20el=20registro=20para=20el=20Audi?= =?UTF-8?q?tlog=20en=20situaciones=20de=20Importaci=C3=B3=20Eliminaci?= =?UTF-8?q?=C3=B3n=20procesos=20.pm,=20.pmx=20y=20bpmn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/methods/processes/processes_Delete.php | 10 ++++++++-- .../methods/processes/processes_Import_Ajax.php | 12 ++++++++---- .../ProcessMaker/Project/Adapter/BpmnWorkflow.php | 8 ++++++-- .../ProcessMaker/Project/Adapter/WorkflowBpmn.php | 9 +++++++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Delete.php b/workflow/engine/methods/processes/processes_Delete.php index 23cdf2917..b0ad2f9d7 100755 --- a/workflow/engine/methods/processes/processes_Delete.php +++ b/workflow/engine/methods/processes/processes_Delete.php @@ -43,6 +43,13 @@ if ($access != 1) { $uids = explode(',', $_POST['PRO_UIDS']); try { + + //Add Audit Log + $oProcess = new Process(); + $process=$oProcess->load($_POST['PRO_UIDS']); + $nameProcess=$process['PRO_TITLE']; + G::auditLog("DeleteProcess", $nameProcess. ' ('.$_POST['PRO_UIDS'].')' .' Deleted'); + foreach ($uids as $uid) { //$oProcessMap->deleteProcess($uid); ProcessMaker\Project\Workflow::removeIfExists($uid); @@ -52,8 +59,7 @@ try { $resp = new StdClass(); $resp->status = 0; $resp->msg = 'All process was deleted successfully'; - //Add Audit Log - G::auditLog("DeleteProcess", "Process UID : " . $_POST['PRO_UIDS']); + echo G::json_encode($resp); } catch (Exception $e) { diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 2ef0e9f6e..27d6513d0 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -254,10 +254,7 @@ if ($action == "uploadFileNewProcess") { //if file is a .pm file continues normally the importing if ($processFileType == "pm") { $oData = $oProcess->getProcessData( $path . $filename ); - } - - //Add Audit Log - G::auditLog("ImportProcess", " PM -> Process UID : " . $oData->process['PRO_UID']); + } $importer->throwExceptionIfExistsReservedWordsSql($oData); @@ -307,6 +304,13 @@ if ($action == "uploadFileNewProcess") { $result->sNewProUid = $sProUid; $result->proFileName = $Fields['PRO_FILENAME']; + //Add Audit Log + $ogetProcess = new Process(); + $getprocess=$ogetProcess->load($oData->process['PRO_UID']); + print_r($getprocess); + $nameProcess=$getprocess['PRO_TITLE']; + G::auditLog("ImportProcess", 'PM File Imported '.$nameProcess. ' ('.$oData->process['PRO_UID'].')'); + } catch (Exception $e) { $result->response = $e->getMessage(); $result->catchMessage = $e->getMessage(); diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php index 941eb74f3..62bcf8c94 100755 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php @@ -75,10 +75,14 @@ class BpmnWorkflow extends Project\Bpmn } $this->wp = new Project\Workflow(); - //Add Audit Log - \G::auditLog("ImportProcess", " PMX -> Process UID : " . $this->getUid()); $this->wp->create($wpData); + //Add Audit Log + $ogetProcess = new \Process(); + $getprocess=$ogetProcess->load($this->getUid()); + $nameProcess=$getprocess['PRO_TITLE']; + \G::auditLog("ImportProcess", 'PMX File Imported '.$nameProcess. ' ('.$this->getUid().')'); + } catch (\Exception $e) { $prjUid = $this->getUid(); //$this->remove(); diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php index 2002a89f1..1cee222b2 100644 --- a/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php +++ b/workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php @@ -59,13 +59,18 @@ class WorkflowBpmn extends Project\Workflow } $this->bp = new Project\Bpmn(); - //Add Audit Log - \G::auditLog("ImportProcess", " BPMN -> Process UID : " . $this->getUid()); $this->bp->create($bpData); // At this time we will add a default diagram and process $this->bp->addDiagram(); $this->bp->addProcess(); + + //Add Audit Log + $ogetProcess = new \Process(); + $getprocess=$ogetProcess->load($this->getUid()); + $nameProcess=$getprocess['PRO_TITLE']; + \G::auditLog("ImportProcess", 'BPMN Imported '.$nameProcess. ' ('.$this->getUid().')'); + } catch (\Exception $e) { $prjUid = $this->getUid(); $this->remove(); From fe5b7eb5b873c3f54e94d4acb5a4b53c86db22ed Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 20 May 2015 12:07:39 -0400 Subject: [PATCH 4/5] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log:?= =?UTF-8?q?=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indic?= =?UTF-8?q?a=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proces?= =?UTF-8?q?o.=20Causa=20:=20Llamada=20al=20metodo=20Auditlog=20en=20esas?= =?UTF-8?q?=20situaciones(Importaci=C3=B3=20Eliminaci=C3=B3e=20procesos).?= =?UTF-8?q?=20Soluci=C3=B3=20=20Agregar=20el=20registro=20para=20el=20Audi?= =?UTF-8?q?tlog=20en=20situaciones=20de=20Importaci=C3=B3=20Eliminaci?= =?UTF-8?q?=C3=B3n=20procesos=20.pm,=20.pmx=20y=20bpmn.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/methods/processes/processes_Import_Ajax.php | 1 - 1 file changed, 1 deletion(-) diff --git a/workflow/engine/methods/processes/processes_Import_Ajax.php b/workflow/engine/methods/processes/processes_Import_Ajax.php index 27d6513d0..a9c75b6e6 100644 --- a/workflow/engine/methods/processes/processes_Import_Ajax.php +++ b/workflow/engine/methods/processes/processes_Import_Ajax.php @@ -307,7 +307,6 @@ if ($action == "uploadFileNewProcess") { //Add Audit Log $ogetProcess = new Process(); $getprocess=$ogetProcess->load($oData->process['PRO_UID']); - print_r($getprocess); $nameProcess=$getprocess['PRO_TITLE']; G::auditLog("ImportProcess", 'PM File Imported '.$nameProcess. ' ('.$oData->process['PRO_UID'].')'); From a77ad10964524ba541ba5ac7cac2a2b5ce5d4851 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Wed, 20 May 2015 12:38:23 -0400 Subject: [PATCH 5/5] i --- .../engine/methods/processes/processes_Delete.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/workflow/engine/methods/processes/processes_Delete.php b/workflow/engine/methods/processes/processes_Delete.php index b0ad2f9d7..3e88c8ccd 100755 --- a/workflow/engine/methods/processes/processes_Delete.php +++ b/workflow/engine/methods/processes/processes_Delete.php @@ -42,15 +42,15 @@ if ($access != 1) { //$oProcessMap = new ProcessMap(); $uids = explode(',', $_POST['PRO_UIDS']); -try { +try { - //Add Audit Log - $oProcess = new Process(); - $process=$oProcess->load($_POST['PRO_UIDS']); - $nameProcess=$process['PRO_TITLE']; - G::auditLog("DeleteProcess", $nameProcess. ' ('.$_POST['PRO_UIDS'].')' .' Deleted'); + foreach ($uids as $uid) { + //Add Audit Log + $oProcess = new Process(); + $process=$oProcess->load($uid); + $nameProcess=$process['PRO_TITLE']; + G::auditLog("DeleteProcess", $nameProcess. ' ('.$uid.')' .' Deleted'); - foreach ($uids as $uid) { //$oProcessMap->deleteProcess($uid); ProcessMaker\Project\Workflow::removeIfExists($uid); ProcessMaker\Project\Bpmn::removeIfExists($uid);