Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.16 -r1.17 --- lams_admin/conf/language/lams/ApplicationResources.properties 15 Sep 2007 05:22:08 -0000 1.16 +++ lams_admin/conf/language/lams/ApplicationResources.properties 17 Sep 2007 07:00:01 -0000 1.17 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.15 -r1.16 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 15 Sep 2007 05:22:08 -0000 1.15 +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 17 Sep 2007 07:00:01 -0000 1.16 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java,v diff -u -r1.32 -r1.33 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 13 Sep 2007 08:10:56 -0000 1.32 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 17 Sep 2007 07:00:02 -0000 1.33 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources.properties,v diff -u -r1.2 -r1.3 --- lams_common/conf/language/lams/ApplicationResources.properties 2 Aug 2007 04:22:47 -0000 1.2 +++ lams_common/conf/language/lams/ApplicationResources.properties 17 Sep 2007 07:00:01 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.2 -r1.3 --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties 2 Aug 2007 04:23:53 -0000 1.2 +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties 17 Sep 2007 07:00:01 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v diff -u -r1.46 -r1.47 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 20 Aug 2007 04:28:22 -0000 1.46 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 17 Sep 2007 07:00:01 -0000 1.47 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.78 -r1.79 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 20 Aug 2007 04:28:22 -0000 1.78 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 17 Sep 2007 07:00:01 -0000 1.79 @@ -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