Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r72b80f6befe04cb189ab1e682082671d109a90b9 -r3bc65f0652b50074ff432112d8e47a6df3728810
--- lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 72b80f6befe04cb189ab1e682082671d109a90b9)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 3bc65f0652b50074ff432112d8e47a6df3728810)
@@ -18,10 +18,18 @@
       type="org.lamsfoundation.lams.admin.web.UserOrgRoleForm"
     />
     <form-bean
+      name="RegisterForm"
+      type="org.lamsfoundation.lams.admin.web.RegisterForm"
+    />
+    <form-bean
       name="CacheActionForm"
       type="org.lamsfoundation.lams.admin.web.CacheActionForm"
     />
     <form-bean
+      name="OrgManageForm"
+      type="org.lamsfoundation.lams.admin.web.form.OrgManageForm"
+    />
+    <form-bean
       name="ImportV1ContentsForm"
       type="org.lamsfoundation.lams.admin.web.form.ImportV1ContentsForm"
     />
@@ -61,6 +69,7 @@
 	<form-property name="login" type="java.lang.String" />
 	<form-property name="password" type="java.lang.String" />
 	<form-property name="password2" type="java.lang.String" />
+	<form-property name="authenticationMethodId" type="java.lang.Integer" />
 	<form-property name="title" type="java.lang.String" />
 	<form-property name="firstName" type="java.lang.String" />
 	<form-property name="lastName" type="java.lang.String" />
@@ -86,13 +95,9 @@
 </form-bean>
 
 <form-bean name="UserSearchForm" type="org.apache.struts.action.DynaActionForm">
-	<form-property name="sUserId" type="java.lang.String" />
-    <form-property name="sLogin" type="java.lang.String" />
-    <form-property name="sFirstName" type="java.lang.String" />
-    <form-property name="sLastName" type="java.lang.String" />
+	<form-property name="term" type="java.lang.String" />
     <form-property name="searched" type="java.lang.Boolean" initial="false" />
     <form-property name="showAll" type="java.lang.Boolean" initial="false" />
-    <form-property name="resultsSection" type="java.lang.String" />
 </form-bean>
 
 <form-bean name="LoginMaintainForm" type="org.apache.struts.action.DynaActionForm">
@@ -121,30 +126,6 @@
 	<form-property name="method" type="java.lang.String" />
 </form-bean>
 
-<form-bean name="RegisterForm" type="org.apache.struts.action.DynaActionForm">
-	<form-property name="sitename" type="java.lang.String" />
-	<form-property name="rname" type="java.lang.String" />
-	<form-property name="remail" type="java.lang.String" />
-	<form-property name="serverurl" type="java.lang.String" />
-	<form-property name="serverversion" type="java.lang.String" />
-	<form-property name="serverbuild" type="java.lang.String" />
-	<form-property name="serverlocale" type="java.lang.String" />
-	<form-property name="servercountry" type="java.lang.String" />
- 	<form-property name="countries" type="java.lang.String[]" />
-	<form-property name="langdate" type="java.lang.String" />
-	<form-property name="groupno" type="java.lang.Integer" />
-	<form-property name="subgroupno" type="java.lang.Integer" />
-	<form-property name="sysadminno" type="java.lang.Integer" />
-	<form-property name="adminno" type="java.lang.Integer" />
-	<form-property name="authorno" type="java.lang.Integer" />
-	<form-property name="monitorno" type="java.lang.Integer" />
-	<form-property name="managerno" type="java.lang.Integer" />
-	<form-property name="learnerno" type="java.lang.Integer" />
-	<form-property name="authoradminno" type="java.lang.Integer" />
-	<form-property name="userno" type="java.lang.Integer" />
-	<form-property name="public" type="java.lang.Boolean" initial="true" />
-</form-bean>
-
 <form-bean name="CleanupForm" type="org.apache.struts.action.DynaActionForm">
 	<form-property name="numDays" type="java.lang.Integer" />
 </form-bean>
@@ -215,6 +196,9 @@
     <action
       path="/orgmanage"
       type="org.lamsfoundation.lams.admin.web.OrgManageAction"
+      name="OrgManageForm"
+      scope="request"
+      input=".orglist"
       unknown="false"
       validate="false"
     >
@@ -269,6 +253,18 @@
       />
     </action>
     <action
+      path="/user/searchsingle"
+      type="org.lamsfoundation.lams.admin.web.action.UserSearchSingleTermAction"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="basiclist"
+        path="/user/basiclist.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/importexcelsave"
       type="org.lamsfoundation.lams.admin.web.ImportExcelSaveAction"
       name="ImportExcelForm"
@@ -439,6 +435,11 @@
         redirect="false"
       />
       <forward
+        name="organisationCourseAdmin"
+        path=".organisationCourseAdmin"
+        redirect="false"
+      />
+      <forward
         name="orglist"
         path="/orgmanage.do"
         redirect="false"
@@ -598,29 +599,26 @@
       />
     </action>
     <action
-      path="/disabledmanage"
-      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
+      path="/user/basiclist"
+      type="org.lamsfoundation.lams.admin.web.action.UserBasicListAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="disabledlist"
-        path=".disabledlist"
+        name="basiclist"
+        path="/user/basiclist.jsp"
         redirect="false"
       />
     </action>
     <action
-      path="/cache"
-      type="org.lamsfoundation.lams.admin.web.CacheAction"
-      name="CacheActionForm"
-      scope="request"
-      parameter="method"
+      path="/disabledmanage"
+      type="org.lamsfoundation.lams.admin.web.DisabledUserManageAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="cache"
-        path=".cache"
+        name="disabledlist"
+        path=".disabledlist"
         redirect="false"
       />
     </action>
@@ -645,6 +643,21 @@
       />
     </action>
     <action
+      path="/cache"
+      type="org.lamsfoundation.lams.admin.web.CacheAction"
+      name="CacheActionForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="cache"
+        path=".cache"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/ldap"
       type="org.lamsfoundation.lams.admin.web.action.LdapConfigAction"
       unknown="false"