From 5730151a210d66af1a255eff2529e48f4f73e865 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Wed, 13 May 2015 10:43:37 -0400
Subject: [PATCH 01/15] =?UTF-8?q?PM-1185=20Los=20triggers=20UserInfo=20y?=
 =?UTF-8?q?=20WSInformationUser=20despliegan=20el=20codigo=20del=20calenda?=
 =?UTF-8?q?r=20y=20del=20campo=20replaced=20by=20en=20lugar=20de=20la=20de?=
 =?UTF-8?q?scripci=C3=B3Causa=20:=20Definida=20asi.=20Soluci=C3=B3=20Se=20?=
 =?UTF-8?q?agrego=202=20campos=20mas=20que=20muestran=20su=20descripciion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/classes/model/CalendarDefinition.php | 9 +++++++++
 workflow/engine/classes/model/Users.php              | 9 ++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/model/CalendarDefinition.php b/workflow/engine/classes/model/CalendarDefinition.php
index 6c7b6a9b6..64b4ff0fe 100755
--- a/workflow/engine/classes/model/CalendarDefinition.php
+++ b/workflow/engine/classes/model/CalendarDefinition.php
@@ -450,5 +450,14 @@ class CalendarDefinition extends BaseCalendarDefinition
         $oDataset->next();
         return $oDataset->getRow();
     }
+
+    public function calendarName ($calendarUid)
+    {
+        $tr = CalendarDefinitionPeer::retrieveByPK( $calendarUid );
+        if ((is_object( $tr ) && get_class( $tr ) == 'CalendarDefinition')) {
+            return $tr->getCalendarName();
+        }
+        return false; 
+    }
 }
 
diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index bc1317365..3cde3ad74 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -261,7 +261,7 @@ class Users extends BaseUsers
             //Calendar
             $calendar = new Calendar();
             $calendarInfo = $calendar->getCalendarFor( $userUid, $userUid, $userUid );
-            $aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";
+            $aFields["USR_CALENDAR"] = ($calendarInfo["CALENDAR_APPLIED"] != "DEFAULT") ? $calendarInfo["CALENDAR_UID"] : "";                        
 
             //Photo
             $pathPhoto = PATH_IMAGES_ENVIRONMENT_USERS . $userUid . ".gif";
@@ -287,8 +287,15 @@ class Users extends BaseUsers
             $arrayData["birthday"] = $aFields["USR_BIRTHDAY"];
             $arrayData["position"] = $aFields["USR_POSITION"];
             $arrayData["replacedby"] = $aFields["USR_REPLACED_BY"];
+            if(strlen($arrayData["replacedby"]!=0)){
+                $oUser = UsersPeer::retrieveByPK( $arrayData["replacedby"] );
+                $arrayData["replacedbyfullname"] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
+            } 
             $arrayData["duedate"] = $aFields["USR_DUE_DATE"];
             $arrayData["calendar"] = $aFields["USR_CALENDAR"];
+            if(strlen($aFields["USR_CALENDAR"]!=0)){
+                $arrayData["calendarname"] = $calendar->calendarName( $aFields["USR_CALENDAR"] );
+            }            
             $arrayData["status"] = $aFields["USR_STATUS"];
             $arrayData["department"] = $aFields["DEP_UID"];
             $arrayData["reportsto"] = $aFields["USR_REPORTS_TO"];

From 6f73401b2cb38939ed4c34e892bfc2afe184b1dc Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Tue, 19 May 2015 10:38:06 -0400
Subject: [PATCH 02/15] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log?=
 =?UTF-8?q?:=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indi?=
 =?UTF-8?q?ca=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proce?=
 =?UTF-8?q?so.=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 <dheeyi@gmail.com>
Date: Tue, 19 May 2015 11:14:43 -0400
Subject: [PATCH 03/15] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log?=
 =?UTF-8?q?:=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indi?=
 =?UTF-8?q?ca=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proce?=
 =?UTF-8?q?so.=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 <dheeyi@gmail.com>
Date: Tue, 19 May 2015 15:51:41 -0400
Subject: [PATCH 04/15] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log?=
 =?UTF-8?q?:=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indi?=
 =?UTF-8?q?ca=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proce?=
 =?UTF-8?q?so.=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 7622719cb6030ce8cabe38cadaa501c293361a04 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Wed, 20 May 2015 12:02:54 -0400
Subject: [PATCH 05/15] =?UTF-8?q?PM-1185=20Los=20triggers=20UserInfo=20y?=
 =?UTF-8?q?=20WSInformationUser=20despliegan=20el=20codigo=20del=20calenda?=
 =?UTF-8?q?r=20y=20del=20campo=20replaced=20by=20en=20lugar=20de=20la=20de?=
 =?UTF-8?q?scripci=C3=B3Causa=20:=20Definida=20asi.=20Soluci=C3=B3=20Se=20?=
 =?UTF-8?q?agrego=203=20campos=20mas=20que=20muestran=20su=20descripci?=
 =?UTF-8?q?=C3=B3:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/classes/model/Users.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php
index 3cde3ad74..9b7ad4e9b 100755
--- a/workflow/engine/classes/model/Users.php
+++ b/workflow/engine/classes/model/Users.php
@@ -287,17 +287,21 @@ class Users extends BaseUsers
             $arrayData["birthday"] = $aFields["USR_BIRTHDAY"];
             $arrayData["position"] = $aFields["USR_POSITION"];
             $arrayData["replacedby"] = $aFields["USR_REPLACED_BY"];
-            if(strlen($arrayData["replacedby"]!=0)){
+            if(strlen($arrayData["replacedby"] != 0)){
                 $oUser = UsersPeer::retrieveByPK( $arrayData["replacedby"] );
                 $arrayData["replacedbyfullname"] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname();
             } 
             $arrayData["duedate"] = $aFields["USR_DUE_DATE"];
             $arrayData["calendar"] = $aFields["USR_CALENDAR"];
-            if(strlen($aFields["USR_CALENDAR"]!=0)){
-                $arrayData["calendarname"] = $calendar->calendarName( $aFields["USR_CALENDAR"] );
+            if(strlen($aFields["USR_CALENDAR"] != 0)){
+                $arrayData["calendarname"] = $calendar->calendarName( $aFields["USR_CALENDAR"] );                
             }            
             $arrayData["status"] = $aFields["USR_STATUS"];
             $arrayData["department"] = $aFields["DEP_UID"];
+            if (strlen($arrayData["department"]) != 0) {
+                $oDepart = DepartmentPeer::retrieveByPk( $arrayData["department"] );
+                $arrayData["departmentname"] = $oDepart->getDepTitle();
+            }
             $arrayData["reportsto"] = $aFields["USR_REPORTS_TO"];
             $arrayData["userexperience"] = $aFields["USR_UX"];
             $arrayData["photo"] = $pathPhoto;

From fe5b7eb5b873c3f54e94d4acb5a4b53c86db22ed Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Wed, 20 May 2015 12:07:39 -0400
Subject: [PATCH 06/15] =?UTF-8?q?PM-2633=20Admin>Settings>Logs>Audit=20Log?=
 =?UTF-8?q?:=20Al=20importar=20un=20proceso=20el=20audit=20log=20no=20indi?=
 =?UTF-8?q?ca=20que=20lo=20importa=20indica=20que=20se=20creo=20el=20proce?=
 =?UTF-8?q?so.=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 <dheeyi@gmail.com>
Date: Wed, 20 May 2015 12:38:23 -0400
Subject: [PATCH 07/15] 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);

From de8ccb885f38e6e182a22e80c854f9dfd7183fd2 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Thu, 21 May 2015 11:28:38 -0400
Subject: [PATCH 08/15] PM-2795: al autenficarse con REST no verifica contra el
 LdapAdvanced

---
 workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
index efdf78e59..f722501d5 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -190,8 +190,11 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
     /* OAuth2_Storage_UserCredentialsInterface */
     public function checkUserCredentials($username, $password)
     {
-        if ($user = $this->getUser($username)) {
-            return $this->checkPassword($user, $password);
+        $RBAC = \RBAC::getSingleton();
+        $RBAC->initRBAC();
+        $uid = $RBAC->VerifyLogin($username , $password);
+        if($uid != ''){
+           return true;
         }
         return false;
     }

From b55eb92644fbe7a1a59c0be106e28c2f2818b08e Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Thu, 21 May 2015 14:01:28 -0400
Subject: [PATCH 09/15] PM-2795: I validated when is < 0

---
 workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
index f722501d5..89e7aeed6 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -193,6 +193,9 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
         $RBAC = \RBAC::getSingleton();
         $RBAC->initRBAC();
         $uid = $RBAC->VerifyLogin($username , $password);
+        if($uid < 0){
+           return false;
+        }
         if($uid != ''){
            return true;
         }

From 81315f825701aae90a7805a27fee5f2b4165b0db Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 22 May 2015 09:39:58 -0400
Subject: [PATCH 10/15] PM-2800

---
 workflow/public_html/Web.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/public_html/Web.config b/workflow/public_html/Web.config
index 7d43ba287..2e853663c 100755
--- a/workflow/public_html/Web.config
+++ b/workflow/public_html/Web.config
@@ -5,7 +5,7 @@
             <rules>
                 <rule name="ProcessMaker Rule" stopProcessing="true">
                     <match url="^.*/(.*)$" ignoreCase="true" />
-                    <action type="Rewrite" url="sysGeneric.php" />
+                    <action type="Rewrite" url="app.php" />
                 </rule>
             </rules>
         </rewrite>

From 9e0e005c37a56a82e926b0fe93dca2b9020318b0 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 22 May 2015 11:35:51 -0400
Subject: [PATCH 11/15] PM-2762

---
 gulliver/system/class.g.php                                   | 2 ++
 .../engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php  | 4 ++++
 workflow/engine/src/ProcessMaker/Services/Api/System.php      | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index 69feae7d6..e8928a7ed 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -5354,11 +5354,13 @@ class G
         $ipClient = G::getIpAddress();
 
         $licensedFeatures = PMLicensedFeatures::getSingleton();
+        /*----------------------------------********---------------------------------*/
         if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
             $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User';
             $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-';
             G::log("|". $workspace ."|". $ipClient ."|". $username . "|" . $fullname ."|" . $actionToLog . "|" . $valueToLog, PATH_DATA, "audit.log");
         }
+        /*----------------------------------********---------------------------------*/
     }
 
     /**
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index 6fde65015..611d81910 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -11,6 +11,7 @@ class ActionsByEmail
 
     public function saveConfiguration($params)
     {
+        /*----------------------------------********---------------------------------*/
         if (\PMLicensedFeatures
                 ::getSingleton()
                 ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
@@ -31,10 +32,12 @@ class ActionsByEmail
                     break;
             }
         }
+        /*----------------------------------********---------------------------------*/
     }
 
     public function loadConfiguration($params)
     {
+        /*----------------------------------********---------------------------------*/
         if ($params['type'] != 'activity' 
             || !\PMLicensedFeatures
                 ::getSingleton()
@@ -42,6 +45,7 @@ class ActionsByEmail
         {
             return false;
         }
+        /*----------------------------------********---------------------------------*/
         require_once 'classes/model/AbeConfiguration.php';
 
         $criteria = new \Criteria();
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/System.php b/workflow/engine/src/ProcessMaker/Services/Api/System.php
index 2c43cd0f7..f7106fed6 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/System.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/System.php
@@ -52,7 +52,7 @@ class System extends Api
         }
     }
 
-    /**
+    /**t
      * @return array
      *
      * @author Gustavo Cruz <gustavo.cruz@colosa.com>
@@ -64,6 +64,7 @@ class System extends Api
     {
         try {
             $enabledFeatures = array();
+            /*----------------------------------********---------------------------------*/
             $keys = array ('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=');
             foreach ($keys as $key) {
                 if (\PMLicensedFeatures
@@ -72,6 +73,7 @@ class System extends Api
                     $enabledFeatures[] = $key;
                 }
             }
+            /*----------------------------------********---------------------------------*/
             return $enabledFeatures;
         } catch (\Exception $e) {
             throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));

From f63be7127563153aa0f52b5b6d8823b7fd701088 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 22 May 2015 11:40:01 -0400
Subject: [PATCH 12/15] PM-2762

---
 workflow/engine/src/ProcessMaker/Services/Api/System.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/src/ProcessMaker/Services/Api/System.php b/workflow/engine/src/ProcessMaker/Services/Api/System.php
index f7106fed6..9e49e74ae 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/System.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/System.php
@@ -52,7 +52,7 @@ class System extends Api
         }
     }
 
-    /**t
+    /**
      * @return array
      *
      * @author Gustavo Cruz <gustavo.cruz@colosa.com>

From 1d71964fd6b911a3072147ada674e3552261d343 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 22 May 2015 12:11:41 -0400
Subject: [PATCH 13/15] PM-2762

---
 gulliver/system/class.g.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index e8928a7ed..a9dbb3161 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -5353,8 +5353,8 @@ class G
         $sflagAudit = $oServerConf->getAuditLogProperty( 'AL_OPTION', $workspace );
         $ipClient = G::getIpAddress();
 
-        $licensedFeatures = PMLicensedFeatures::getSingleton();
         /*----------------------------------********---------------------------------*/
+        $licensedFeatures = PMLicensedFeatures::getSingleton();        
         if ($sflagAudit && $licensedFeatures->verifyfeature('vtSeHNhT0JnSmo1bTluUVlTYUxUbUFSVStEeXVqc1pEUG5EeXc0MGd2Q3ErYz0=')) {
             $username = isset($_SESSION['USER_LOGGED']) && $_SESSION['USER_LOGGED'] != '' ? $_SESSION['USER_LOGGED'] : 'Unknow User';
             $fullname = isset($_SESSION['USR_FULLNAME']) && $_SESSION['USR_FULLNAME'] != '' ? $_SESSION['USR_FULLNAME'] : '-';

From b6a1bf7769697129dc1a3054dabb2fa2a03b1af6 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 22 May 2015 12:19:43 -0400
Subject: [PATCH 14/15] PM-2762

---
 .../engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index 611d81910..6fde65015 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -11,7 +11,6 @@ class ActionsByEmail
 
     public function saveConfiguration($params)
     {
-        /*----------------------------------********---------------------------------*/
         if (\PMLicensedFeatures
                 ::getSingleton()
                 ->verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) {
@@ -32,12 +31,10 @@ class ActionsByEmail
                     break;
             }
         }
-        /*----------------------------------********---------------------------------*/
     }
 
     public function loadConfiguration($params)
     {
-        /*----------------------------------********---------------------------------*/
         if ($params['type'] != 'activity' 
             || !\PMLicensedFeatures
                 ::getSingleton()
@@ -45,7 +42,6 @@ class ActionsByEmail
         {
             return false;
         }
-        /*----------------------------------********---------------------------------*/
         require_once 'classes/model/AbeConfiguration.php';
 
         $criteria = new \Criteria();

From b1ac3747732897dca6cd2e1e77f2d84300e55fa0 Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 22 May 2015 12:46:50 -0400
Subject: [PATCH 15/15] PM-2796

---
 workflow/engine/src/ProcessMaker/Services/Api/Project.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project.php b/workflow/engine/src/ProcessMaker/Services/Api/Project.php
index 2b30e1bc0..bcb558d51 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project.php
@@ -111,7 +111,7 @@ class Project extends Api
 
         $outputDir = PATH_DATA . "sites" . PATH_SEP . SYS_SYS . PATH_SEP . "files" . PATH_SEP . "output" . PATH_SEP;
         $version = \ProcessMaker\Util\Common::getLastVersion($outputDir . $exporter->getProjectName() . "-*.pmx") + 1;
-        $outputFilename = $outputDir . sprintf("%s-%s.%s", $exporter->getProjectName(), $version, "pmx");
+        $outputFilename = $outputDir . sprintf("%s-%s.%s", str_replace(" ", "_", $exporter->getProjectName()), $version, "pmx");
 
         $exporter->setMetadata("export_version", $version);
         $exporter->saveExport($outputFilename);