Index: lams_admin/conf/language/ApplicationResources.properties =================================================================== diff -u -r947304d14428ce9af51dd56536d02ddefb417786 -r36dec686075045d22059eaecf6e8d310ea3b6a50 --- lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 947304d14428ce9af51dd56536d02ddefb417786) +++ lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) @@ -1,6 +1,14 @@ # CVS ID: $Id$ # Language strings for the Admin classes and screens. +#==================== Audit Labels ====================# +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} + #=========================List jobs in Quartz===========================# title.job.list = Jobs lable.job.name= Job name Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== diff -u -rb822a1e2825418f944ad7194a8b69be2ec9fee6d -r36dec686075045d22059eaecf6e8d310ea3b6a50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision b822a1e2825418f944ad7194a8b69be2ec9fee6d) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java (.../UserAction.java) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) @@ -197,7 +197,10 @@ Integer orgId = WebUtil.readIntParam(request,"orgId"); Integer userId = WebUtil.readIntParam(request,"userId",true); getService().disableUser(userId); - getAuditService().log(AdminConstants.MODULE_NAME, "Disabled userId: "+userId); + String[] args = new String[1]; + args[0] = userId.toString(); + String message = getMessageService().getMessage("audit.user.disable", args); + getAuditService().log(AdminConstants.MODULE_NAME, message); request.setAttribute("org",orgId); return mapping.findForward("userlist"); @@ -223,7 +226,10 @@ request.setAttribute("errorMessage",e.getMessage()); return mapping.findForward("error"); } - getAuditService().log(AdminConstants.MODULE_NAME, "Deleted userId: "+userId); + String[] args = new String[1]; + args[0] = userId.toString(); + String message = getMessageService().getMessage("audit.user.delete", args); + getAuditService().log(AdminConstants.MODULE_NAME, message); request.setAttribute("org",orgId); return mapping.findForward("userlist"); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java =================================================================== diff -u -rb5a5cd364990006a849db8385a1d5ed4d66e9466 -r36dec686075045d22059eaecf6e8d310ea3b6a50 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java (.../UserSaveAction.java) (revision b5a5cd364990006a849db8385a1d5ed4d66e9466) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java (.../UserSaveAction.java) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) @@ -27,9 +27,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.HashSet; import java.util.List; -import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -51,12 +49,11 @@ import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.usermanagement.UserOrganisation; -import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.IAuditService; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -128,6 +125,7 @@ WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); IAuditService auditService = (IAuditService) ctx.getBean("auditService"); + MessageService messageService = (MessageService)ctx.getBean("adminMessageService"); if (errors.isEmpty()) { String[] roles = (String[]) userForm.get("roles"); @@ -136,7 +134,10 @@ User user = (User)getService().findById(User.class, userId); if (passwordChanged) { // make 'password changed' audit log entry - auditService.log(AdminConstants.MODULE_NAME, "Password changed for: "+user.getLogin()+"("+userId+")"); + String[] args = new String[1]; + args[0] = user.getLogin()+"("+userId+")"; + String message = messageService.getMessage("audit.user.password.change",args); + auditService.log(AdminConstants.MODULE_NAME, message); userForm.set("password", HashUtil.sha1((String) userForm.get("password"))); } else { userForm.set("password", user.getPassword()); @@ -177,8 +178,11 @@ getService().save(user); // make 'create user' audit log entry - auditService.log(AdminConstants.MODULE_NAME, "Created user: "+user.getLogin() - +"("+user.getUserId()+"), Full Name: "+user.getFullName()); + String[] args = new String[2]; + args[0] = user.getLogin()+"("+user.getUserId()+")"; + args[1] = user.getFullName(); + String message = messageService.getMessage("audit.user.create", args); + auditService.log(AdminConstants.MODULE_NAME, message); log.debug("user: " + user.toString()); List orgs = new ArrayList(); Index: lams_central/conf/language/ApplicationResources.properties =================================================================== diff -u -r46974030fbfd07f066989ce96e8839d7e23c7643 -r36dec686075045d22059eaecf6e8d310ea3b6a50 --- lams_central/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 46974030fbfd07f066989ce96e8839d7e23c7643) +++ lams_central/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) @@ -154,6 +154,7 @@ title.change.portrait.window =LAMS :: Change My Portrait error.portrait.not.image =The file is not an image (PNG, GIF, JPG, WBMP and BMP formats allowed). msg.portrait.resized =Note: image will be resized to fit inside 120x120 pixels. The image formats allowed are: PNG, GIF, JPG, WBMP and BMP. +audit.user.password.change = Password changed for: {0} #======= End labels: Exported 148 labels for en AU ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java =================================================================== diff -u -ra303153c0e7ba699c5c0649a4f8d1caf786d114a -r36dec686075045d22059eaecf6e8d310ea3b6a50 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java (.../PasswordChangeAction.java) (revision a303153c0e7ba699c5c0649a4f8d1caf786d114a) +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java (.../PasswordChangeAction.java) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) @@ -38,6 +38,7 @@ import org.lamsfoundation.lams.usermanagement.service.UserManagementService; import org.lamsfoundation.lams.util.CentralConstants; import org.lamsfoundation.lams.util.HashUtil; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.IAuditService; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -121,7 +122,11 @@ // make 'password changed' audit log entry IAuditService auditService = (IAuditService) ctx.getBean("auditService"); - auditService.log(CentralConstants.MODULE_NAME, "Password changed for: "+user.getLogin()+"("+user.getUserId()+")"); + MessageService messageService = (MessageService)ctx.getBean("centralMessageService"); + String[] args = new String[1]; + args[0] = user.getLogin()+"("+user.getUserId()+")"; + String message = messageService.getMessage("audit.user.password.change",args); + auditService.log(CentralConstants.MODULE_NAME, message); } } Index: lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml =================================================================== diff -u -r8f6d6a60fc7c387a228d25067500c316e3bff68b -r36dec686075045d22059eaecf6e8d310ea3b6a50 --- lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml (.../webApplicationContext.xml) (revision 8f6d6a60fc7c387a228d25067500c316e3bff68b) +++ lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml (.../webApplicationContext.xml) (revision 36dec686075045d22059eaecf6e8d310ea3b6a50) @@ -8,4 +8,11 @@ + + org.lamsfoundation.lams.central.ApplicationResources + + + + + \ No newline at end of file