Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r4a680f26c99112633d8942f9840de1ab8a33ce6c -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4a680f26c99112633d8942f9840de1ab8a33ce6c) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -127,8 +127,6 @@ sysadmin.organisation =Organisation audit.organisation.change =Changed {0} for organisation: {1} from: {2} to: {3} audit.organisation.create =Created organisation: {0} of type: {1} -audit.user.password.change =Password changed for: {0} -audit.user.create =Created user: {0}, Full Name: {1} audit.user.disable =Disabled userId: {0} audit.user.delete =Deleted userId: {0} label.yes =Yes Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r4a680f26c99112633d8942f9840de1ab8a33ce6c -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 4a680f26c99112633d8942f9840de1ab8a33ce6c) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -127,8 +127,6 @@ sysadmin.organisation =Organisation audit.organisation.change =Changed {0} for organisation: {1} from: {2} to: {3} audit.organisation.create =Created organisation: {0} of type: {1} -audit.user.password.change =Password changed for: {0} -audit.user.create =Created user: {0}, Full Name: {1} audit.user.disable =Disabled userId: {0} audit.user.delete =Deleted userId: {0} label.yes =Yes Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java =================================================================== diff -u -rdd52773c8069dc9c17d4350ae525123c64de6c66 -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java (.../UserSaveAction.java) (revision dd52773c8069dc9c17d4350ae525123c64de6c66) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java (.../UserSaveAction.java) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -148,7 +148,7 @@ log.debug("editing userId: " + userId); // hash the new password if necessary, and audit the fact if (passwordChanged) { - writeAuditLog(user, new String[1]); + service.auditPasswordChanged(user, AdminConstants.MODULE_NAME); userForm.set("password", HashUtil.sha1((String)userForm.get("password"))); } else { userForm.set("password", user.getPassword()); @@ -173,7 +173,7 @@ service.save(user); // make 'create user' audit log entry - writeAuditLog(user, new String[2]); + service.auditUserCreated(user, AdminConstants.MODULE_NAME); log.debug("user: " + user.toString()); } @@ -199,22 +199,5 @@ return mapping.findForward("user"); } } - - private void writeAuditLog(User user, String[] args) { - if (args.length==1) { // password changed - args[0] = user.getLogin()+"("+user.getUserId()+")"; - String message = AdminServiceProxy.getMessageService(getServlet().getServletContext()) - .getMessage("audit.user.password.change",args); - AdminServiceProxy.getAuditService(getServlet().getServletContext()) - .log(AdminConstants.MODULE_NAME, message); - } else if (args.length==2) { // user created - args[0] = user.getLogin()+"("+user.getUserId()+")"; - args[1] = user.getFullName(); - String message = AdminServiceProxy.getMessageService(getServlet().getServletContext()) - .getMessage("audit.user.create", args); - AdminServiceProxy.getAuditService(getServlet().getServletContext()) - .log(AdminConstants.MODULE_NAME, message); - } - } } Index: lams_common/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r03fb29dacad3f77cacd7dc5ae21f5c58c9c838bd -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 03fb29dacad3f77cacd7dc5ae21f5c58c9c838bd) +++ lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -38,5 +38,7 @@ import.shareresources.warning =The sequence contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the learners. Links to external websites should not cause any errors. validation.error.grouping.missing=Grouping object for the grouping activity is missing. validation.error.group.count.mismatch=Grouping has more groups than the requested number of groups. +audit.user.password.change =Password changed for: {0} +audit.user.create =Created user: {0}, Full Name: {1} #======= End labels: Exported 30 labels for en AU ===== Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r03fb29dacad3f77cacd7dc5ae21f5c58c9c838bd -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 03fb29dacad3f77cacd7dc5ae21f5c58c9c838bd) +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -38,6 +38,8 @@ import.shareresources.warning =The sequence contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the learners. Links to external websites should not cause any errors. validation.error.grouping.missing=Grouping object for the grouping activity is missing. validation.error.group.count.mismatch=Grouping has more groups than the requested number of groups. +audit.user.password.change =Password changed for: {0} +audit.user.create =Created user: {0}, Full Name: {1} #======= End labels: Exported 30 labels for en AU ===== Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -raa7e502bb28fa1df94980fadea3876a83e842ae4 -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision aa7e502bb28fa1df94980fadea3876a83e842ae4) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -396,4 +396,8 @@ * @return server default supported locale object */ public SupportedLocale getDefaultLocale(); + + public void auditPasswordChanged(User user, String moduleName); + + public void auditUserCreated(User user, String moduleName); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -raa7e502bb28fa1df94980fadea3876a83e842ae4 -rd2ea89fd48d3a27209865fa2d92ccf2901b531fd --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision aa7e502bb28fa1df94980fadea3876a83e842ae4) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision d2ea89fd48d3a27209865fa2d92ccf2901b531fd) @@ -59,8 +59,13 @@ import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.MessageService; +import org.lamsfoundation.lams.util.audit.AuditService; +import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.util.HttpSessionManager; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; /** *

@@ -84,6 +89,15 @@ private IGroupDAO groupDAO; private IRoleDAO roleDAO; protected MessageService messageService; + private static IAuditService auditService; + + private IAuditService getAuditService() { + if (auditService == null) { + WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager.getInstance().getServletContext()); + auditService = (IAuditService) ctx.getBean("auditService"); + } + return auditService; + } /** * Set i18n MessageService @@ -897,4 +911,20 @@ String localeName = Configuration.get(ConfigurationKeys.SERVER_LANGUAGE); return getSupportedLocale(localeName.substring(0,2),localeName.substring(3)); } + + public void auditPasswordChanged(User user, String moduleName) { + String[] args = new String[1]; + args[0] = user.getLogin() + "(" + user.getUserId() + ")"; + String message = messageService.getMessage("audit.user.password.change", args); + getAuditService().log(moduleName, message); + } + + public void auditUserCreated(User user, String moduleName) { + String[] args = new String[2]; + args[0] = user.getLogin() + "(" + user.getUserId() + ")"; + args[1] = user.getFullName(); + String message = messageService.getMessage("audit.user.create", args); + getAuditService().log(moduleName, message); + } + } \ No newline at end of file