Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java,v
diff -u -r1.11 -r1.12
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	21 Jan 2010 08:18:32 -0000	1.11
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	6 Mar 2010 22:39:02 -0000	1.12
@@ -25,6 +25,7 @@
 
 import javax.servlet.ServletContext;
 
+import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
@@ -56,6 +57,7 @@
 	private static Configuration configurationService;
 	private static ILessonService lessonService;
 	private static IMonitoringService monitoringService;
+	private static IEventNotificationService eventNotificationService;
 	
 	public static final IUserManagementService getService(ServletContext servletContext) {
 		if (manageService == null) {
@@ -135,6 +137,13 @@
 		return monitoringService;
 	}
 	
+	public static final IEventNotificationService getEventNotificationService(ServletContext servletContext) {
+		if (eventNotificationService == null) {
+		    eventNotificationService = (IEventNotificationService)getDomainService(servletContext, "eventNotificationService");
+		}
+		return eventNotificationService;
+	}
+	
 	private static Object getDomainService(ServletContext servletContext,String serviceName) {
         WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
         return wac.getBean(serviceName);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/EmailUserAction.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/EmailUserAction.java	6 Mar 2010 22:39:02 -0000	1.1
@@ -0,0 +1,137 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id: EmailUserAction.java,v 1.1 2010/03/06 22:39:02 andreyb Exp $ */  
+package org.lamsfoundation.lams.admin.web.action;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+import org.lamsfoundation.lams.admin.AdminConstants;
+import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.admin.web.dto.UserOrgRoleDTO;
+import org.lamsfoundation.lams.admin.web.form.EmailForm;
+import org.lamsfoundation.lams.events.DeliveryMethodMail;
+import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.themes.Theme;
+import org.lamsfoundation.lams.themes.service.IThemeService;
+import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.OrganisationState;
+import org.lamsfoundation.lams.usermanagement.OrganisationType;
+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.dto.UserDTO;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.LanguageUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+/**
+ * @author Andrey Balan
+ * 
+ * @struts:action path="/emailUser" name="emailForm" scope="request"
+ *                parameter="method" validate="false"
+ * 
+ * @struts:action-forward name="emailuser" path=".emailuser"
+ * @struts:action-forward name="usersearch" path="/usersearch.do"
+ */
+public class EmailUserAction extends LamsDispatchAction {
+
+    private static Logger log = Logger.getLogger(EmailUserAction.class);
+    private IUserManagementService service;
+    private MessageService messageService;
+    private IEventNotificationService eventNotificationService;
+
+    private void initServices() {
+	if (service == null) {
+	    service = AdminServiceProxy.getService(getServlet().getServletContext());
+	}
+	if (messageService == null) {
+	    messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+	}
+	if (eventNotificationService == null) {
+	    eventNotificationService = AdminServiceProxy.getEventNotificationService(getServlet().getServletContext());
+	}
+    }
+    
+    public ActionForward composeMail(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	initServices();
+	
+	if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+	    request.setAttribute("errorName", "UserAction");
+	    request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+	    return mapping.findForward("error");
+	}
+	
+	Integer userId = WebUtil.readIntParam(request, "userId");
+	User user = (User) service.findById(User.class, userId);
+	request.setAttribute("user", user);
+
+	return mapping.findForward("emailuser");
+    }
+    
+    public ActionForward send(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	initServices();
+	
+	if (!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())) {
+	    request.setAttribute("errorName", "UserAction");
+	    request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
+	    return mapping.findForward("error");
+	}
+	
+	EmailForm emailForm = (EmailForm) form;
+	Integer userId = emailForm.getUserId();
+	User user = (User) service.findById(User.class, userId);
+	
+	//String to = WebUtil.readStrParam(request, "to");
+	String subject = emailForm.getSubject();
+	String body = emailForm.getBody();
+
+	HttpSession ss1 = SessionManager.getSession();
+	UserDTO administrator = (UserDTO) ss1.getAttribute(AttributeNames.USER);
+	
+	EmailUserAction.log.debug("Administrator " + administrator.getFirstName() + " " + administrator.getLastName()
+		+ " sent email to user " + user.getFirstName() + " " + user.getLastName() + ": \n[subject] " + subject + "\n[message] " + body);
+	eventNotificationService.sendMessage(new Long(userId), DeliveryMethodMail.getInstance(), subject, body);
+	
+	return mapping.findForward("usersearch");
+    }
+
+}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/EmailForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/Attic/EmailForm.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/EmailForm.java	6 Mar 2010 22:39:02 -0000	1.1
@@ -0,0 +1,75 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id: EmailForm.java,v 1.1 2010/03/06 22:39:02 andreyb Exp $ */  
+package org.lamsfoundation.lams.admin.web.form;
+
+import org.apache.struts.action.ActionForm;
+
+/**
+ * 
+ * Form for email composing
+ * 
+ * @author Andrey Balan
+ * 
+ * @struts.form name="emailForm"
+ */
+public class EmailForm extends ActionForm {
+
+    private static final long serialVersionUID = 7775887425863041037L;
+   
+    private Integer userId;
+    
+    private String to;
+    private String subject;
+    private String body;
+    
+    public Integer getUserId() {
+        return userId;
+    }
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+    
+    public String getTo() {
+        return to;
+    }
+    public void setTo(String name) {
+        this.to = name;
+    }
+    
+    public String getSubject() {
+        return subject;
+    }
+    public void setSubject(String description) {
+        this.subject = description;
+    }
+    
+    public String getBody() {
+        return body;
+    }
+    public void setBody(String imageDirectory) {
+        this.body = imageDirectory;
+    }
+
+}
+	
Index: lams_admin/web/emailuser.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/Attic/emailuser.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/emailuser.jsp	6 Mar 2010 22:39:02 -0000	1.1
@@ -0,0 +1,60 @@
+<%@ include file="/taglibs.jsp"%>
+
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
+
+<h4><a href="orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a> </h4>
+<h1><fmt:message key="admin.email.compose.mail"/></h1>
+
+<div align="center">
+	<html:errors />
+	<html:messages id="results" message="true">
+		<bean:write name="results" />
+	</html:messages>
+</div>
+
+<logic:notEqual name="isSysadmin" value="false">
+<html:form action="/emailUser.do?method=send" method="post" styleId="emailUserForm">
+	<html:hidden property="userId" value="${user.userId}"/>
+
+	<table class="tablesorter-admin space-top">
+	
+		<tr>
+			<td style="width: 70px;">
+				<fmt:message key="admin.email.to" /> 
+			</td>
+			<td style="text-align: left;">
+				${user.firstName} ${user.lastName} &lt;${user.email}&gt;
+			</td>		
+		</tr>
+		
+		<tr>
+			<td>
+				<fmt:message key="admin.email.subject" /> 
+			</td>
+			<td style="text-align: left;">
+				<input type="text" name="subject" value="" style="width:95%;">
+			</td>		
+		</tr>
+		
+		<tr>
+			<td colspan="2">
+				<lams:STRUTS-textarea property="body" rows="16" value="" style="width:95%;" />
+			</td>
+		</tr>
+	
+	</table>
+	
+	<p align="right">
+		<a href="javascript:;" onclick="document.getElementById('emailUserForm').submit();" class="button">
+			<fmt:message key="admin.email.send" /> 
+		</a>
+		<a href="javascript:;" onclick="document.location.href ='<c:url value="/usersearch.do"/>';" class="button space-left">
+			<fmt:message key="admin.cancel" />
+		</a>
+	</p>
+	
+</html:form>
+
+<br/>
+
+</logic:notEqual>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/usersearchlist.jsp,v
diff -u -r1.20 -r1.21
--- lams_admin/web/usersearchlist.jsp	13 Nov 2009 03:13:57 -0000	1.20
+++ lams_admin/web/usersearchlist.jsp	6 Mar 2010 22:39:02 -0000	1.21
@@ -1,5 +1,8 @@
 <%@ include file="/taglibs.jsp"%>
 
+<c:set var="useInternalSMTPServer"><lams:Configuration key="InternalSMTPServer"/></c:set>
+<c:set var="smtpServer"><lams:Configuration key="SMTPServer"/></c:set>
+
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery-1.1.4.pack.js"></script>
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pack.js"></script>
 <script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.pager.js"></script>
@@ -82,6 +85,12 @@
 				<a href="user.do?method=remove&userId=<c:out value="${user.userId}"/>"><fmt:message key="admin.user.delete"/></a>
 				&nbsp;
 				<a href="<lams:LAMSURL/>/loginas.do?login=<c:out value="${user.login}"/>"><fmt:message key="label.login.as"/></a>
+				
+				<c:if test="${(not empty user.email) && (useInternalSMTPServer || not empty smtpServer)}">
+					<a href="emailUser.do?method=composeMail&userId=<c:out value="${user.userId}"/>">
+						<fmt:message key="label.email"/>
+					</a>
+				</c:if>
 			</td>
 		</tr>
 	</c:forEach>
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.29 -r1.30
--- lams_admin/web/WEB-INF/struts/struts-config.xml	18 Feb 2010 05:42:19 -0000	1.29
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	6 Mar 2010 22:39:02 -0000	1.30
@@ -14,41 +14,45 @@
   <form-beans>
 
     <form-bean
-      name="UserOrgRoleForm"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
+      name="ImportExcelForm"
+      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
     />
     <form-bean
-      name="RegisterForm"
-      type="org.lamsfoundation.lams.admin.web.RegisterForm"
-    />
-    <form-bean
       name="OrgManageForm"
       type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
     />
     <form-bean
-      name="ImportV1ContentsForm"
-      type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
+      name="ImportV1Form"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
     />
     <form-bean
-      name="ImportExcelForm"
-      type="org.lamsfoundation.lams.admin.web.ImportExcelForm"
+      name="emailForm"
+      type="org.lamsfoundation.lams.admin.web.form.EmailForm"
     />
     <form-bean
-      name="openIDForm"
-      type="org.lamsfoundation.lams.admin.web.OpenIDConfigForm"
+      name="RegisterForm"
+      type="org.lamsfoundation.lams.admin.web.RegisterForm"
     />
     <form-bean
       name="themeForm"
       type="org.lamsfoundation.lams.admin.web.form.ThemeForm"
     />
     <form-bean
-      name="CacheActionForm"
-      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
+      name="UserOrgRoleForm"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
     />
     <form-bean
-      name="ImportV1Form"
-      type="org.lamsfoundation.lams.admin.web.form.ImportV1Form"
+      name="openIDForm"
+      type="org.lamsfoundation.lams.admin.web.OpenIDConfigForm"
     />
+    <form-bean
+      name="ImportV1ContentsForm"
+      type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
+    />
+    <form-bean
+      name="CacheActionForm"
+      type="org.lamsfoundation.lams.admin.web.CacheActionForm"
+    />
 
    <form-bean name="OrganisationForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="orgId" type="java.lang.Integer" />
@@ -169,89 +173,104 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/orgmanage"
-      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
-      name="OrgManageForm"
-      scope="request"
-      input=".orglist"
+      path="/libraryManage"
+      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="orglist"
-        path=".orglist"
+        name="success"
+        path=".librarylist"
         redirect="false"
       />
     </action>
     <action
-      path="/usersearch"
-      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
-      name="UserSearchForm"
+      path="/userrolessave"
+      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
+      name="UserRolesForm"
       scope="request"
-      input=".usersearchlist"
+      input=".userroles"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="usersearchlist"
-        path=".usersearchlist"
+        name="userroles"
+        path="/userroles.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/libraryManage"
-      type="org.lamsfoundation.lams.admin.web.LibraryManageAction"
+      path="/emailUser"
+      type="org.lamsfoundation.lams.admin.web.action.EmailUserAction"
+      name="emailForm"
+      scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path=".librarylist"
+        name="emailuser"
+        path=".emailuser"
         redirect="false"
       />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/serverlist"
-      type="org.lamsfoundation.lams.admin.web.ServerListAction"
+      path="/sysadminstart"
+      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="serverlist"
-        path=".serverlist"
+        name="sysadmin"
+        path=".sysadmin"
         redirect="false"
       />
     </action>
     <action
-      path="/user/searchsingle"
-      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
+      path="/importv1contentssave"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
+      name="ImportV1ContentsForm"
+      scope="session"
+      input=".importv1contents"
       unknown="false"
       validate="false"
     >
       <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
+        name="importv1result"
+        path=".importv1result"
         redirect="false"
       />
+      <forward
+        name="sysadmin"
+        path="/sysadminstart.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/cleanup"
-      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
-      name="CleanupForm"
+      path="/usersearch"
+      type="org.lamsfoundation.lams.admin.web.UserSearchAction"
+      name="UserSearchForm"
       scope="request"
+      input=".usersearchlist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cleanup"
-        path=".cleanup"
+        name="usersearchlist"
+        path=".usersearchlist"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/organisation"
@@ -279,100 +298,50 @@
       />
     </action>
     <action
-      path="/userroles"
-      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
-      name="UserRolesForm"
-      scope="request"
-      parameter="method"
+      path="/usermanage"
+      type="org.lamsfoundation.lams.admin.web.UserManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userrole"
-        path=".userrole"
-        redirect="false"
-      />
-      <forward
         name="userlist"
-        path="/usermanage.do"
+        path=".userlist"
         redirect="false"
       />
     </action>
     <action
-      path="/config"
-      type="org.lamsfoundation.lams.admin.web.ConfigAction"
-      name="ConfigForm"
+      path="/serversave"
+      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
+      name="ServerOrgMapForm"
       scope="request"
-      input=".editconfig"
-      parameter="method"
+      input=".servermaintain"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path=".editconfig"
+        name="success"
+        path="/serverlist.do"
         redirect="false"
       />
-      <forward
-        name="ldap"
-        path=".ldap"
-        redirect="false"
-      />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/joblist"
-      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
+      path="/toolcontentlist"
+      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="list"
-        path=".joblist"
+        name="toolcontentlist"
+        path=".toolcontentlist"
         redirect="false"
       />
-    </action>
-    <action
-      path="/importuserresult"
-      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="importresult"
-        path=".importresult"
+        name="error"
+        path=".error"
         redirect="false"
       />
     </action>
     <action
-      path="/user/basiclist"
-      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="basiclist"
-        path="/user/basiclist.jsp"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/disabledmanage"
-      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="disabledlist"
-        path=".disabledlist"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/cache"
       type="org.lamsfoundation.lams.admin.web.CacheAction"
       name="CacheActionForm"
@@ -388,130 +357,119 @@
       />
     </action>
     <action
-      path="/toolcontentlist"
-      type="org.lamsfoundation.lams.admin.web.ToolContentListAction"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="toolcontentlist"
-        path=".toolcontentlist"
-        redirect="false"
-      />
-      <forward
-        name="error"
-        path=".error"
-        redirect="false"
-      />
-    </action>
-    <action
-      path="/servermaintain"
-      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
-      name="ServerOrgMapForm"
+      path="/config"
+      type="org.lamsfoundation.lams.admin.web.ConfigAction"
+      name="ConfigForm"
       scope="request"
+      input=".editconfig"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="servermaintain"
-        path=".servermaintain"
+        name="config"
+        path=".editconfig"
         redirect="false"
       />
       <forward
-        name="serverlist"
-        path="/serverlist.do"
+        name="ldap"
+        path=".ldap"
         redirect="false"
       />
-    </action>
-    <action
-      path="/userorg"
-      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
-      name="UserOrgForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="userorg"
-        path=".userorg"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/clone"
-      type="org.lamsfoundation.lams.admin.web.action.CloneLessonsAction"
+      path="/user"
+      type="org.lamsfoundation.lams.admin.web.UserAction"
+      name="UserForm"
+      scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="start"
-        path=".clone-start"
+        name="user"
+        path=".user"
         redirect="false"
       />
       <forward
-        name="availableLessonsPart"
-        path="/organisation/parts/availableLessons.jsp"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
       <forward
-        name="selectStaffPart"
-        path="/organisation/parts/selectStaff.jsp"
+        name="remove"
+        path=".remove"
         redirect="false"
       />
       <forward
-        name="selectLearnersPart"
-        path="/organisation/parts/selectLearners.jsp"
+        name="disabledlist"
+        path="/disabledmanage.do"
         redirect="false"
       />
       <forward
-        name="result"
-        path=".clone-result"
+        name="usersearch"
+        path="/usersearch.do"
         redirect="false"
       />
     </action>
     <action
-      path="/orgsave"
-      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
-      name="OrganisationForm"
-      scope="request"
-      input=".organisation"
+      path="/userorgrolesave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      input=".userorgrole"
       unknown="false"
       validate="false"
     >
       <forward
-        name="organisation"
-        path="/organisation.do?method=edit"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
       <forward
-        name="orglist"
-        path="/orgmanage.do"
+        name="userorg"
+        path="/userorg.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/user/basiclist"
+      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1contentssave"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsSaveAction"
-      name="ImportV1ContentsForm"
-      scope="session"
-      input=".importv1contents"
+      path="/serverlist"
+      type="org.lamsfoundation.lams.admin.web.ServerListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1result"
-        path=".importv1result"
+        name="serverlist"
+        path=".serverlist"
         redirect="false"
       />
+    </action>
+    <action
+      path="/importuserresult"
+      type="org.lamsfoundation.lams.admin.web.action.ImportUserResultAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="importresult"
+        path=".importresult"
         redirect="false"
       />
     </action>
@@ -542,6 +500,26 @@
       />
     </action>
     <action
+      path="/servermaintain"
+      type="org.lamsfoundation.lams.admin.web.ServerMaintainAction"
+      name="ServerOrgMapForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="servermaintain"
+        path=".servermaintain"
+        redirect="false"
+      />
+      <forward
+        name="serverlist"
+        path="/serverlist.do"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/importexcelsave"
       type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
       name="ImportExcelForm"
@@ -577,140 +555,173 @@
       />
     </action>
     <action
-      path="/usersave"
-      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
-      name="UserForm"
+      path="/importv1save"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
+      name="ImportV1Form"
       scope="request"
-      input=".user"
+      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="user"
-        path="/user.do?method=edit"
+        name="importv1contents"
+        path="/importv1contents.do"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
       <forward
-        name="userroles"
-        path="/userroles.do"
+        name="importv1"
+        path="/importv1.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="usersearch"
-        path="/usersearch.do"
+        name="disabledlist"
+        path=".disabledlist"
         redirect="false"
       />
     </action>
     <action
-      path="/serversave"
-      type="org.lamsfoundation.lams.admin.web.ServerSaveAction"
-      name="ServerOrgMapForm"
-      scope="request"
-      input=".servermaintain"
+      path="/user/searchsingle"
+      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="success"
-        path="/serverlist.do"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/sysadminstart"
-      type="org.lamsfoundation.lams.admin.web.action.SysAdminStartAction"
+      path="/ldap"
+      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
       unknown="false"
       validate="false"
     >
       <forward
+        name="ldap"
+        path=".ldap"
+        redirect="false"
+      />
+      <forward
         name="sysadmin"
-        path=".sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1save"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1SaveAction"
-      name="ImportV1Form"
+      path="/cleanup"
+      type="org.lamsfoundation.lams.admin.web.action.CleanupTempFilesAction"
+      name="CleanupForm"
       scope="request"
-      input=".importv1"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path="/importv1contents.do"
+        name="cleanup"
+        path=".cleanup"
         redirect="false"
       />
       <forward
         name="sysadmin"
         path="/sysadminstart.do"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userorg"
+      type="org.lamsfoundation.lams.admin.web.UserOrgAction"
+      name="UserOrgForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="importv1"
-        path="/importv1.do"
+        name="userorg"
+        path=".userorg"
         redirect="false"
       />
     </action>
     <action
-      path="/loginmaintain"
-      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
-      name="LoginMaintainForm"
+      path="/userorgsave"
+      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
+      name="UserOrgForm"
       scope="request"
+      input=".userorg"
       unknown="false"
       validate="false"
     >
       <forward
-        name="loginmaintain"
-        path=".loginmaintain"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="userorgrole"
+        path="/userorgrole.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/userrolessave"
-      type="org.lamsfoundation.lams.admin.web.UserRolesSaveAction"
-      name="UserRolesForm"
+      path="/openIDConfig"
+      type="org.lamsfoundation.lams.admin.web.OpenIDConfigAction"
+      name="openIDForm"
       scope="request"
-      input=".userroles"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userroles"
-        path="/userroles.do"
+        name="config"
+        path="/openidConfig.jsp"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/importv1contents"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
-      name="ImportV1ContentsForm"
-      scope="session"
+      path="/usersave"
+      type="org.lamsfoundation.lams.admin.web.UserSaveAction"
+      name="UserForm"
+      scope="request"
+      input=".user"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1contents"
-        path=".importv1contents"
+        name="user"
+        path="/user.do?method=edit"
         redirect="false"
       />
       <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
+      <forward
+        name="userroles"
+        path="/userroles.do"
+        redirect="false"
+      />
+      <forward
+        name="usersearch"
+        path="/usersearch.do"
+        redirect="false"
+      />
     </action>
     <action
       path="/loginsave"
@@ -734,37 +745,24 @@
       />
     </action>
     <action
-      path="/importv1"
-      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
-      name="ImportV1Form"
+      path="/userroles"
+      type="org.lamsfoundation.lams.admin.web.UserRolesAction"
+      name="UserRolesForm"
       scope="request"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="importv1"
-        path=".importv1"
+        name="userrole"
+        path=".userrole"
         redirect="false"
       />
-    </action>
-    <action
-      path="/importgroups"
-      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
-      name="ImportGroupsForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="importGroups"
-        path=".importGroups"
+        name="userlist"
+        path="/usermanage.do"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
       path="/themeManagement"
@@ -788,34 +786,61 @@
       />
     </action>
     <action
-      path="/userorgrolesave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleSaveAction"
-      name="UserOrgRoleForm"
+      path="/loginmaintain"
+      type="org.lamsfoundation.lams.admin.web.LoginMaintainAction"
+      name="LoginMaintainForm"
+      scope="request"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="loginmaintain"
+        path=".loginmaintain"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/joblist"
+      type="org.lamsfoundation.lams.admin.web.ScheduledJobListAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="list"
+        path=".joblist"
+        redirect="false"
+      />
+    </action>
+    <action
+      path="/importv1contents"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1ContentsAction"
+      name="ImportV1ContentsForm"
       scope="session"
-      input=".userorgrole"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="importv1contents"
+        path=".importv1contents"
         redirect="false"
       />
       <forward
-        name="userorg"
-        path="/userorg.do"
+        name="sysadmin"
+        path="/sysadminstart.do"
         redirect="false"
       />
     </action>
     <action
-      path="/ldap"
-      type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
+      path="/importgroups"
+      type="org.lamsfoundation.lams.admin.web.action.ImportGroupsAction"
+      name="ImportGroupsForm"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="ldap"
-        path=".ldap"
+        name="importGroups"
+        path=".importGroups"
         redirect="false"
       />
       <forward
@@ -870,103 +895,102 @@
       />
     </action>
     <action
-      path="/usermanage"
-      type="org.lamsfoundation.lams.admin.web.UserManageAction"
+      path="/importv1"
+      type="org.lamsfoundation.lams.admin.web.action.ImportV1Action"
+      name="ImportV1Form"
+      scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path=".userlist"
+        name="importv1"
+        path=".importv1"
         redirect="false"
       />
     </action>
     <action
-      path="/userorgsave"
-      type="org.lamsfoundation.lams.admin.web.UserOrgSaveAction"
-      name="UserOrgForm"
+      path="/orgsave"
+      type="org.lamsfoundation.lams.admin.web.OrgSaveAction"
+      name="OrganisationForm"
       scope="request"
-      input=".userorg"
+      input=".organisation"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="organisation"
+        path="/organisation.do?method=edit"
         redirect="false"
       />
       <forward
-        name="userorgrole"
-        path="/userorgrole.do"
+        name="orglist"
+        path="/orgmanage.do"
         redirect="false"
       />
+      <forward
+        name="userlist"
+        path="/usermanage.do"
+        redirect="false"
+      />
     </action>
     <action
-      path="/openIDConfig"
-      type="org.lamsfoundation.lams.admin.web.OpenIDConfigAction"
-      name="openIDForm"
+      path="/orgmanage"
+      type="org.lamsfoundation.lams.admin.web.OrgManageAction"
+      name="OrgManageForm"
       scope="request"
-      parameter="method"
+      input=".orglist"
       unknown="false"
       validate="false"
     >
       <forward
-        name="config"
-        path="/openidConfig.jsp"
+        name="orglist"
+        path=".orglist"
         redirect="false"
       />
-      <forward
-        name="sysadmin"
-        path="/sysadminstart.do"
-        redirect="false"
-      />
     </action>
     <action
-      path="/userorgrole"
-      type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
-      name="UserOrgRoleForm"
-      scope="session"
+      path="/clone"
+      type="org.lamsfoundation.lams.admin.web.action.CloneLessonsAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="userorgrole"
-        path=".userorgrole"
+        name="start"
+        path=".clone-start"
         redirect="false"
       />
-    </action>
-    <action
-      path="/user"
-      type="org.lamsfoundation.lams.admin.web.UserAction"
-      name="UserForm"
-      scope="request"
-      parameter="method"
-      unknown="false"
-      validate="false"
-    >
       <forward
-        name="user"
-        path=".user"
+        name="availableLessonsPart"
+        path="/organisation/parts/availableLessons.jsp"
         redirect="false"
       />
       <forward
-        name="userlist"
-        path="/usermanage.do"
+        name="selectStaffPart"
+        path="/organisation/parts/selectStaff.jsp"
         redirect="false"
       />
       <forward
-        name="remove"
-        path=".remove"
+        name="selectLearnersPart"
+        path="/organisation/parts/selectLearners.jsp"
         redirect="false"
       />
       <forward
-        name="disabledlist"
-        path="/disabledmanage.do"
+        name="result"
+        path=".clone-result"
         redirect="false"
       />
+    </action>
+    <action
+      path="/userorgrole"
+      type="org.lamsfoundation.lams.admin.web.UserOrgRoleAction"
+      name="UserOrgRoleForm"
+      scope="session"
+      unknown="false"
+      validate="false"
+    >
       <forward
-        name="usersearch"
-        path="/usersearch.do"
+        name="userorgrole"
+        path=".userorgrole"
         redirect="false"
       />
     </action>
Index: lams_admin/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.35 -r1.36
--- lams_admin/web/WEB-INF/tiles/tiles-defs.xml	22 Jan 2010 02:59:10 -0000	1.35
+++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml	6 Mar 2010 22:39:02 -0000	1.36
@@ -108,6 +108,11 @@
 		<put name="content" value="userrole.jsp" />	
 	</definition>
 	
+	<definition name=".emailuser" path="/template.jsp">
+		<put name="title" value="admin.user.management"/>
+		<put name="content" value="emailuser.jsp" />	
+	</definition>
+	
 	<definition name=".orglist" path="/template.jsp">
 		<put name="title" value="admin.organisation.management"/>
 		<put name="content" value="organisation/list.jsp" />