diff --git a/rbac/engine/classes/model/AuthenticationSource.php b/rbac/engine/classes/model/AuthenticationSource.php index e0c5481c2..098607f98 100755 --- a/rbac/engine/classes/model/AuthenticationSource.php +++ b/rbac/engine/classes/model/AuthenticationSource.php @@ -69,7 +69,20 @@ class AuthenticationSource extends BaseAuthenticationSource { $oConnection->begin(); $iResult = $oAuthenticationSource->save(); $oConnection->commit(); - G::auditLog("CreateAuthSource", "Authentication Source Name: ". $aData['AUTH_SOURCE_NAME']); + + $authSourceServerName = isset($aData['AUTH_SOURCE_SERVER_NAME']) ? ' - Server Name: '.$aData['AUTH_SOURCE_SERVER_NAME'] : ''; + $authSourcePort = isset($aData['AUTH_SOURCE_PORT']) ? ' - Port: '.$aData['AUTH_SOURCE_PORT'] : ''; + $authSourceEnabledTLS = isset($aData['AUTH_SOURCE_ENABLED_TLS']) ? ' - TLS: '.$aData['AUTH_SOURCE_ENABLED_TLS'] : ''; + $authSourceVersion = isset($aData['AUTH_SOURCE_VERSION']) ? ' - Version: '.$aData['AUTH_SOURCE_VERSION'] : ''; + $authSourceBaseDn = isset($aData['AUTH_SOURCE_BASE_DN']) ? ' - BaseDN: '.$aData['AUTH_SOURCE_BASE_DN'] : ''; + $authAnonymous = $aData['AUTH_ANONYMOUS'] = 1? ' - Anonymous: YES' : ' - Anonymous: NO'; + $authSourceSearchUser = isset($aData['AUTH_SOURCE_SEARCH_USER']) ? ' - Search User: '. $aData['AUTH_SOURCE_SEARCH_USER'] : ''; + $authSourceLdapType = isset($aData['AUTH_SOURCE_DATA']['LDAP_TYPE']) ? ' - LDAP type: '.$aData['AUTH_SOURCE_DATA']['LDAP_TYPE'] : ''; + $authSourceIdentifier = isset($aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER']) ? ' - Identifier: '.$aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'] : ''; + $authSourceFilter = isset($aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_ADDITIONAL_FILTER']) ? ' - Aditional Filter: '.$aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_ADDITIONAL_FILTER'] : ''; + + G::auditLog("CreateAuthSource", "Authentication Source Name: ".$aData['AUTH_SOURCE_NAME']." - Authentication Source ID: (".$aData['AUTH_SOURCE_UID'].") ".$authSourceServerName.$authSourcePort.$authSourceEnabledTLS.$authSourceVersion.$authSourceBaseDn.$authAnonymous.$authSourceSearchUser.$authSourceLdapType.$authSourceIdentifier.$authSourceFilter); + return $aData['AUTH_SOURCE_UID']; } else { @@ -88,6 +101,17 @@ class AuthenticationSource extends BaseAuthenticationSource { } function update($aData) { + $authSourceServerName = isset($aData['AUTH_SOURCE_SERVER_NAME']) ? ' - Server Name: '.$aData['AUTH_SOURCE_SERVER_NAME'] : ''; + $authSourcePort = isset($aData['AUTH_SOURCE_PORT']) ? ' - Port: '.$aData['AUTH_SOURCE_PORT'] : ''; + $authSourceEnabledTLS = isset($aData['AUTH_SOURCE_ENABLED_TLS']) ? ' - TLS: '.$aData['AUTH_SOURCE_ENABLED_TLS'] : ''; + $authSourceVersion = isset($aData['AUTH_SOURCE_VERSION']) ? ' - Version: '.$aData['AUTH_SOURCE_VERSION'] : ''; + $authSourceBaseDn = isset($aData['AUTH_SOURCE_BASE_DN']) ? ' - BaseDN: '.$aData['AUTH_SOURCE_BASE_DN'] : ''; + $authAnonymous = $aData['AUTH_ANONYMOUS'] = 1? ' - Anonymous: YES' : ' - Anonymous: NO'; + $authSourceSearchUser = isset($aData['AUTH_SOURCE_SEARCH_USER']) ? ' - Search User: '. $aData['AUTH_SOURCE_SEARCH_USER'] : ''; + $authSourceLdapType = isset($aData['AUTH_SOURCE_DATA']['LDAP_TYPE']) ? ' - LDAP type: '.$aData['AUTH_SOURCE_DATA']['LDAP_TYPE'] : ''; + $authSourceIdentifier = isset($aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER']) ? ' - Identifier: '.$aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_IDENTIFIER_FOR_USER'] : ''; + $authSourceFilter = isset($aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_ADDITIONAL_FILTER']) ? ' - Aditional Filter: '.$aData['AUTH_SOURCE_DATA']['AUTH_SOURCE_ADDITIONAL_FILTER'] : ''; + $aData['AUTH_SOURCE_DATA'] = (is_array($aData['AUTH_SOURCE_DATA']) ? serialize($aData['AUTH_SOURCE_DATA']) : $aData['AUTH_SOURCE_DATA']); $oConnection = Propel::getConnection(AuthenticationSourcePeer::DATABASE_NAME); try { @@ -98,7 +122,7 @@ class AuthenticationSource extends BaseAuthenticationSource { $oConnection->begin(); $iResult = $oAuthenticationSource->save(); $oConnection->commit(); - G::auditLog("UpdateAuthSource", "Authentication Source Name: ".$aData['AUTH_SOURCE_NAME']." Authentication Source ID: (".$aData['AUTH_SOURCE_UID'].") "); + G::auditLog("UpdateAuthSource", "Authentication Source Name: ".$aData['AUTH_SOURCE_NAME']." - Authentication Source ID: (".$aData['AUTH_SOURCE_UID'].") ".$authSourceServerName.$authSourcePort.$authSourceEnabledTLS.$authSourceVersion.$authSourceBaseDn.$authAnonymous.$authSourceSearchUser.$authSourceLdapType.$authSourceIdentifier.$authSourceFilter); return $iResult; } else { diff --git a/rbac/engine/classes/model/Roles.php b/rbac/engine/classes/model/Roles.php index fc23600bd..9c9ba437e 100755 --- a/rbac/engine/classes/model/Roles.php +++ b/rbac/engine/classes/model/Roles.php @@ -218,6 +218,7 @@ class Roles extends BaseRoles { $con->begin(); $sRolCode = $aData['ROL_CODE']; $sRolSystem = $aData['ROL_SYSTEM']; + $status = $fields['ROL_STATUS'] = 1 ? 'ACTIVE' : 'INACTIVE'; $oCriteria = new Criteria('rbac'); $oCriteria->add(RolesPeer::ROL_CODE, $sRolCode); $oCriteria->add(RolesPeer::ROL_SYSTEM, $sRolSystem); @@ -238,7 +239,7 @@ class Roles extends BaseRoles { $result = $obj->save(); $con->commit(); $obj->setRolName($rol_name); - G::auditLog("CreateRole", "Role Name: ". $rol_name); + G::auditLog("CreateRole", "Role Name: ". $rol_name ." - Role Code: ".$aData['ROL_CODE']." - Role Status: ".$status); } else { $e = new Exception("Failed Validation in class " . get_class($this) . "."); $e->aValidationFailures = $this->getValidationFailures(); @@ -264,7 +265,8 @@ class Roles extends BaseRoles { $result = $this->save(); $con->commit(); $this->setRolName($rol_name); - G::auditLog("UpdateRole", "Role Name: ".$rol_name." Role ID: (".$fields['ROL_UID'].") "); + $status = $fields['ROL_STATUS'] = 1 ? 'ACTIVE' : 'INACTIVE'; + G::auditLog("UpdateRole", "Role Name: ".$rol_name." - Role ID: (".$fields['ROL_UID'].") - Role Code: ".$fields['ROL_CODE']." - Role Status: ".$status); return $result; } else { $con->rollback(); diff --git a/workflow/engine/methods/departments/departments_Ajax.php b/workflow/engine/methods/departments/departments_Ajax.php index eea0681ec..05940d560 100755 --- a/workflow/engine/methods/departments/departments_Ajax.php +++ b/workflow/engine/methods/departments/departments_Ajax.php @@ -234,10 +234,26 @@ switch ($_POST['action']) { $oDept->update( $editDepartment ); $oDept->updateDepartmentManager( $dep_uid ); + $managerName = ' - No Manager Selected'; + + if ($_REQUEST['manager'] != '') { + $oCriteria = new Criteria( 'workflow' ); + $oCriteria->addSelectColumn( UsersPeer::USR_USERNAME ); + $oCriteria->add( UsersPeer::USR_UID, $dep_manager); + + $oDataset = UsersPeer::doSelectRS( $oCriteria ); + $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + + while ($oDataset->next()) { + $aRow = $oDataset->getRow(); + $managerName = $aRow['USR_USERNAME'] ? " - Department Manager: ".$aRow['USR_USERNAME'] : 'No Manager'; + } + } + if ($dep_parent == '') { - G::auditLog("UpdateDepartament", "Departament Name: ".$dep_name." (".$dep_uid.") "); + G::auditLog("UpdateDepartament", "Department Name: ".$dep_name." (".$dep_uid.") - Department Status: ".$dep_status.$managerName); } else { - G::auditLog("UpdateSubDepartament", "Sub Departament Name: ".$dep_name." (".$dep_uid.") "); + G::auditLog("UpdateSubDepartament", "Sub Department Name: ".$dep_name." (".$dep_uid.") - Sub Department Status: ".$dep_status.$managerName); } echo '{success: true}'; diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php index 5911a519f..71f8f67a0 100644 --- a/workflow/engine/methods/groups/groups_Ajax.php +++ b/workflow/engine/methods/groups/groups_Ajax.php @@ -149,7 +149,7 @@ switch ($_POST['action']) { unset( $newGroup['GRP_UID'] ); $group = new Groupwf(); $group->create( $newGroup ); - G::auditLog("CreateGroup", "Group Name: ".$newGroup['GRP_TITLE']); + G::auditLog("CreateGroup", "Group Name: ".$newGroup['GRP_TITLE']." - Group Status: ".$newGroup['GRP_STATUS']); echo '{success: true}'; @@ -161,7 +161,7 @@ switch ($_POST['action']) { $editGroup['GRP_TITLE'] = trim( $_POST['name'] ); $group = new Groupwf(); $group->update( $editGroup ); - G::auditLog("UpdateGroup", "Group Name: ".$editGroup['GRP_TITLE']." Group ID: (".$_POST['grp_uid'].") "); + G::auditLog("UpdateGroup", "Group Name: ".$editGroup['GRP_TITLE']." - Group ID: (".$_POST['grp_uid'].") - Group Status: ".$editGroup['GRP_STATUS']); echo '{success: true}'; break; case 'deleteGroup': diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index 9842db631..feaf49560 100755 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -145,6 +145,17 @@ switch ($_POST['action']) { $form['USR_LOGGED_NEXT_TIME'] = 0; } + $firstName = $form['USR_FIRSTNAME'] ? " - First Name: ". $form['USR_FIRSTNAME'] : ""; + $lastName = $form['USR_LASTNAME'] ? " - Last Name: ". $form['USR_LASTNAME'] : ""; + $email = $form['USR_EMAIL'] ? " - Email: ". $form['USR_EMAIL'] : ""; + $dueDate = $form['USR_DUE_DATE'] ? " - Due Date: ". $form['USR_DUE_DATE'] : ""; + $status = $form['USR_STATUS'] ? " - Status: ". $form['USR_STATUS'] : ""; + $address = $form['USR_ADDRESS'] ? " - Address: ". $form['USR_ADDRESS'] : ""; + $phone = $form['USR_PHONE'] ? " - Phone: ". $form['USR_PHONE'] : ""; + $zipCode = $form['USR_ZIP_CODE'] ? " - Zip Code: ". $form['USR_ZIP_CODE'] : ""; + $position = $form['USR_POSITION'] ? " - Position: ". $form['USR_POSITION'] : ""; + $role = $form['USR_ROLE'] ? " - Role: ". $form['USR_ROLE'] : ""; + if ($form['USR_UID'] == '') { $criteria = new Criteria(); $criteria->addSelectColumn(UsersPeer::USR_USERNAME); @@ -187,8 +198,8 @@ switch ($_POST['action']) { require_once 'classes/model/Users.php'; $oUser = new Users(); $oUser->create($aData); - G::auditLog("CreateUser", "User Name: ". $aData['USR_USERNAME']); - + G::auditLog("CreateUser", "User Name: ". $aData['USR_USERNAME']." - User ID: (".$aData['USR_UID'].") ".$firstName.$lastName.$email.$dueDate.$status.$address.$phone.$zipCode.$position.$role ); + if ($_FILES['USR_PHOTO']['error'] != 1) { //print (PATH_IMAGES_ENVIRONMENT_USERS); if ($_FILES['USR_PHOTO']['tmp_name'] != '') { @@ -364,7 +375,7 @@ switch ($_POST['action']) { require_once 'classes/model/Users.php'; $oUser = new Users(); $oUser->update($aData); - G::auditLog("UpdateUser", "User Name: ". $aData['USR_USERNAME']." User ID: (".$aData['USR_UID'].") "); + G::auditLog("UpdateUser", "User Name: ". $aData['USR_USERNAME']." - User ID: (".$aData['USR_UID'].") ".$firstName.$lastName.$email.$dueDate.$status.$address.$phone.$zipCode.$position.$role ); if ($_FILES['USR_PHOTO']['error'] != 1) { if ($_FILES['USR_PHOTO']['tmp_name'] != '') { $aAux = explode('.', $_FILES['USR_PHOTO']['name']);