From 5884bc478e8dc23353959b19b10486f761245e33 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Wed, 28 Jun 2017 11:39:03 -0400 Subject: [PATCH] HOR-3450 --- workflow/engine/methods/users/users_Ajax.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index e9ebbc1c2..91aa26f35 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -109,9 +109,10 @@ try { echo $response; break; case 'deleteUser': + $usrUid = $_POST['USR_UID']; //Check if the user was defined in a process permissions $oObjectPermission = new ObjectPermission(); - $aProcess = $oObjectPermission->objectPermissionPerUser($_POST['USR_UID'], 1); + $aProcess = $oObjectPermission->objectPermissionPerUser($usrUid, 1); if (count($aProcess) > 0) { echo G::json_encode(array( "status" => 'ERROR', @@ -123,19 +124,19 @@ try { //Remove from tasks G::LoadClass('tasks'); $oTasks = new Tasks(); - $oTasks->ofToAssignUserOfAllTasks($UID); + $oTasks->ofToAssignUserOfAllTasks($usrUid); //Remove from groups G::LoadClass('groups'); $oGroups = new Groups(); - $oGroups->removeUserOfAllGroups($UID); + $oGroups->removeUserOfAllGroups($usrUid); //Update the table Users require_once 'classes/model/Users.php'; - $RBAC->changeUserStatus($UID, 'CLOSED'); - $RBAC->updateUser(array('USR_UID' => $UID,'USR_USERNAME' => ''), ''); + $RBAC->changeUserStatus($usrUid, 'CLOSED'); + $RBAC->updateUser(array('USR_UID' => $usrUid,'USR_USERNAME' => ''), ''); $oUser = new Users(); - $aFields = $oUser->load($UID); + $aFields = $oUser->load($usrUid); $aFields['USR_STATUS'] = 'CLOSED'; $userName = $aFields['USR_USERNAME']; $aFields['USR_USERNAME'] = ''; @@ -144,16 +145,16 @@ try { //Delete Dashboard require_once 'classes/model/DashletInstance.php'; $criteria = new Criteria( 'workflow' ); - $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $UID ); + $criteria->add( DashletInstancePeer::DAS_INS_OWNER_UID, $usrUid ); $criteria->add( DashletInstancePeer::DAS_INS_OWNER_TYPE , 'USER'); DashletInstancePeer::doDelete( $criteria ); //Delete users as supervisor $criteria = new Criteria("workflow"); - $criteria->add(ProcessUserPeer::USR_UID, $UID, Criteria::EQUAL); + $criteria->add(ProcessUserPeer::USR_UID, $usrUid, Criteria::EQUAL); $criteria->add(ProcessUserPeer::PU_TYPE, "SUPERVISOR", Criteria::EQUAL); ProcessUserPeer::doDelete($criteria); - G::auditLog("DeleteUser", "User Name: ". $userName." User ID: (".$UID.") "); + G::auditLog("DeleteUser", "User Name: ". $userName." User ID: (".$usrUid.") "); break; case 'changeUserStatus': //When the user change the status: ACTIVE, INACTIVE, VACATION