From ab4f94d8466d813a82d8fe361489c75f5e42484e Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Mon, 13 Oct 2014 16:10:40 -0400
Subject: [PATCH] BUG-12021 Audit Log Records

Audit Log Records
---
 rbac/engine/classes/model/Roles.php          | 4 ++--
 workflow/engine/classes/class.groups.php     | 2 +-
 workflow/engine/classes/model/Department.php | 2 +-
 workflow/engine/classes/model/GroupUser.php  | 2 +-
 workflow/engine/methods/users/users_Ajax.php | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php
index 1b0293aae..26fd87cd9 100755
--- a/rbac/engine/classes/model/Roles.php
+++ b/rbac/engine/classes/model/Roles.php
@@ -517,7 +517,7 @@ class Roles extends BaseRoles {
         $rol = $this->load($aData['ROL_UID']);
         $oUsersRbac = new RbacUsers();
         $user = $oUsersRbac->load($aData['USR_UID']);
-        G::auditLog("AssignUsersToRole", "Assign user ".$user['USR_USERNAME']." (".$aData['USR_UID'].") to Role ".$rol['ROL_NAME']." (".$aData['ROL_UID'].") ");
+        G::auditLog("AssignUserToRole", "Assign user ".$user['USR_USERNAME']." (".$aData['USR_UID'].") to Role ".$rol['ROL_NAME']." (".$aData['ROL_UID'].") ");
     }
 
     function deleteUserRole($ROL_UID, $USR_UID) {
@@ -532,7 +532,7 @@ class Roles extends BaseRoles {
         $oUsersRbac = new RbacUsers();
         $user = $oUsersRbac->load($USR_UID);
         
-        G::auditLog("DeleteUsersToRole", "Delete user ".$user['USR_USERNAME']." (".$USR_UID.") to Role ".$rol['ROL_NAME']." (".$ROL_UID.") ");
+        G::auditLog("DeleteUserToRole", "Delete user ".$user['USR_USERNAME']." (".$USR_UID.") to Role ".$rol['ROL_NAME']." (".$ROL_UID.") ");
     }
 
     function getRolePermissions($ROL_UID, $filter='', $status=null) {
diff --git a/workflow/engine/classes/class.groups.php b/workflow/engine/classes/class.groups.php
index 7c73bb19a..e0c8241e4 100755
--- a/workflow/engine/classes/class.groups.php
+++ b/workflow/engine/classes/class.groups.php
@@ -122,7 +122,7 @@ class Groups
                 $oUsr = new Users();
                 $usrName = $oUsr->load($UsrUid);
                 
-                G::auditLog("AssignUsersToGroup", "Assign user ". $usrName['USR_USERNAME'] ." (".$UsrUid.") to group ".$grpName['CON_VALUE']." (".$GrpUid.") ");
+                G::auditLog("AssignUserToGroup", "Assign user ". $usrName['USR_USERNAME'] ." (".$UsrUid.") to group ".$grpName['CON_VALUE']." (".$GrpUid.") ");
             }
         } catch (exception $oError) {
             throw ($oError);
diff --git a/workflow/engine/classes/model/Department.php b/workflow/engine/classes/model/Department.php
index fcd1880e2..2138fc837 100755
--- a/workflow/engine/classes/model/Department.php
+++ b/workflow/engine/classes/model/Department.php
@@ -402,7 +402,7 @@ class Department extends BaseDepartment
             if (is_object( $oUser ) && get_class( $oUser ) == 'Users') {
                 $oUser->setDepUid( $depId );
                 $oUser->save();
-                G::auditLog("AssignUsersToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEPO_TITLE']." (".$depId.") ");
+                G::auditLog("AssignUserToDepartament", "Assign user ".$user['USR_USERNAME']." (".$userId.") to departament ".$dptoTitle['DEPO_TITLE']." (".$depId.") ");
             }
 
             //if the user is a manager update Department Table
diff --git a/workflow/engine/classes/model/GroupUser.php b/workflow/engine/classes/model/GroupUser.php
index fe5b45059..5bf2e6980 100755
--- a/workflow/engine/classes/model/GroupUser.php
+++ b/workflow/engine/classes/model/GroupUser.php
@@ -98,7 +98,7 @@ class GroupUser extends BaseGroupUser
                 $oUsr = new Users();
                 $usrName = $oUsr->load($sUserUid);
                 
-                G::auditLog("AssignUsersToGroup", "Remove user: ".$usrName['USR_USERNAME'] ." (".$sUserUid.") from group ".$grpName['CON_VALUE']." (".$sGrpUid.") ");
+                G::auditLog("AssignUserToGroup", "Remove user: ".$usrName['USR_USERNAME'] ." (".$sUserUid.") from group ".$grpName['CON_VALUE']." (".$sGrpUid.") ");
 
                 return $iResult;
             } else {
diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php
index 9cc5005ba..7574185af 100644
--- a/workflow/engine/methods/users/users_Ajax.php
+++ b/workflow/engine/methods/users/users_Ajax.php
@@ -230,7 +230,7 @@ try {
                 $userData['USR_STATUS'] = $_REQUEST['NEW_USR_STATUS'];
                 $userInstance->update($userData);
                 
-                $msg = $_REQUEST['NEW_USR_STATUS'] == 'ACTIVE'? "Enable User" : "Disable User";
+                $msg = $_REQUEST['NEW_USR_STATUS'] == 'ACTIVE'? "EnableUser" : "DisableUser";
                 G::auditLog($msg, "User Name: ".$userData['USR_USERNAME']." User ID: (".$userData['USR_UID'].") ");
                 $response->status = 'OK';
             } else {
@@ -357,7 +357,7 @@ try {
             }
             $aData['USR_AUTH_USER_DN'] = $auth_dn;
             $RBAC->updateUser($aData);
-            g::auditLog("AssignAuthenticationSource", "User Name: ".$aData['USR_USERNAME'].' User ID: ('.$aData['USR_UID'].') assign to '.$aData['USR_AUTH_TYPE']);
+            G::auditLog("AssignAuthenticationSource", "User Name: ".$aData['USR_USERNAME'].' User ID: ('.$aData['USR_UID'].') assign to '.$aData['USR_AUTH_TYPE']);
             echo '{success: true}';
             break;
         case 'usersList':