Index: lams_admin/conf/language/ApplicationResources.properties =================================================================== diff -u -r0892350e28ca67031ad97e624f167dccd6272871 -r29551b741b1aec1a353848c10813385d7d72c3c8 --- lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0892350e28ca67031ad97e624f167dccd6272871) +++ lams_admin/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -143,6 +143,7 @@ admin.search = Search admin.enable = Enable admin.disable = Disable +admin.register = Register #===================== Main Sysadmin Screen ======================# sysadmin.maintain = Maintain LAMS @@ -169,6 +170,7 @@ sysadmin.batch.temp.file.delete=Delete old temporary files sysadmin.job.list = Job List sysadmin.list.job = List scheduled jobs in Quartz queue +sysadmin.register.server = Register Server #===================== Cache Screen ==============================# cache.maintain = Maintain LAMS Cache @@ -181,4 +183,11 @@ #==================== Configuration Screen ========================# admin.config.key=Key -admin.config.value=Value \ No newline at end of file +admin.config.value=Value + +#=================== Register Server Screen =======================# +admin.register.sitename=Full Sitename +admin.register.directory=Directory +admin.register.directory.public=Public +admin.register.directory.private=Private +admin.register.heading.title=Register your server with the LAMS Community Index: lams_admin/conf/xdoclet/struts-forms.xml =================================================================== diff -u -r36e114e125b1ce88588f7b9c03121ea56c491015 -r29551b741b1aec1a353848c10813385d7d72c3c8 --- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 36e114e125b1ce88588f7b9c03121ea56c491015) +++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -81,4 +81,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java =================================================================== diff -u --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java (revision 0) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -0,0 +1,161 @@ +/**************************************************************** + * Copyright (C) 2006 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 + * **************************************************************** + */ +package org.lamsfoundation.lams.admin.web; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.beanutils.BeanUtils; +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.service.AdminServiceProxy; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.OrganisationState; +import org.lamsfoundation.lams.usermanagement.OrganisationType; +import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; +import org.lamsfoundation.lams.usermanagement.Role; + +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; +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; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +/** + * ConfigAction + * + * @author Mitchell Seaton + */ +/** + * struts doclets + * + * @struts.action path="/register" parameter="method" name="RegisterForm" input=".register" scope="request" validate="false" + * @struts.action-forward name="register" path=".register" + * @struts.action-forward name="sysadmin" path=".sysadmin" + * @struts.action-forward name="error" path=".error" + */ +public class RegisterAction extends LamsDispatchAction { + + + private static final Logger log = Logger.getLogger(RegisterAction.class); + private static IUserManagementService service; + private static MessageService messageService; + + public ActionForward unspecified(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws Exception{ + + // check permission + if(!request.isUserInRole(Role.SYSADMIN)){ + request.setAttribute("errorName","RegisterAction"); + request.setAttribute("errorMessage",getMessageService().getMessage("error.authorisation")); + return mapping.findForward("error"); + } + + service = AdminServiceProxy.getService(getServlet().getServletContext()); + + DynaActionForm registerForm = (DynaActionForm) form; + + /** Set Server Configuration details in dyna form */ + registerForm.set("serverurl", Configuration.get(ConfigurationKeys.SERVER_URL)); + registerForm.set("serverversion", Configuration.get(ConfigurationKeys.VERSION)); + registerForm.set("serverbuild", Configuration.get(ConfigurationKeys.SERVER_VERSION_NUMBER)); + registerForm.set("serverlocale", Configuration.get(ConfigurationKeys.SERVER_LANGUAGE)); + registerForm.set("langdate", Configuration.get(ConfigurationKeys.DICTIONARY_DATE_CREATED)); + + /** Set user details for registration */ + UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + + registerForm.set("rname", sysadmin.getFirstName() + " " + sysadmin.getLastName()); + registerForm.set("remail", sysadmin.getEmail()); + + /** Get Server statistics for registration */ + List groups = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",OrganisationType.COURSE_TYPE); + List subgroups = service.findByProperty(Organisation.class,"organisationType.organisationTypeId",OrganisationType.CLASS_TYPE); + List sysadmins = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_SYSADMIN); + List admins = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_COURSE_ADMIN); + List authors = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_AUTHOR); + List monitors = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_MONITOR); + List managers = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_COURSE_MANAGER); + List learners = service.findByProperty(UserOrganisationRole.class, "role.roleId", Role.ROLE_LEARNER); + + /** Set statistics in dyna form */ + registerForm.set("groupno", Integer.valueOf(groups.size())); + registerForm.set("subgroupno", Integer.valueOf(subgroups.size())); + registerForm.set("sysadminno", Integer.valueOf(sysadmins.size())); + registerForm.set("adminno", Integer.valueOf(admins.size())); + registerForm.set("authorno", Integer.valueOf(authors.size())); + registerForm.set("monitorno", Integer.valueOf(monitors.size())); + registerForm.set("managerno", Integer.valueOf(managers.size())); + registerForm.set("learnerno", Integer.valueOf(learners.size())); + + return mapping.findForward("register"); + } + + public ActionForward register(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws Exception{ + + if (isCancelled(request)) { + return mapping.findForward("sysadmin"); + } + + DynaActionForm registerForm = (DynaActionForm) form; + + return mapping.findForward("sysadmin"); + } + + private IUserManagementService getService(){ + if(service==null){ + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + service = (IUserManagementService) ctx.getBean("userManagementServiceTarget"); + } + return service; + } + + private MessageService getMessageService(){ + if(messageService==null){ + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); + messageService = (MessageService)ctx.getBean("adminMessageService"); + } + return messageService; + } +} Index: lams_admin/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r36e114e125b1ce88588f7b9c03121ea56c491015 -r29551b741b1aec1a353848c10813385d7d72c3c8 --- lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 36e114e125b1ce88588f7b9c03121ea56c491015) +++ lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -106,6 +106,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -146,21 +168,6 @@ /> - - - - - - + + + + + + + + + + + + + + + @@ -494,27 +563,6 @@ redirect="false" /> - - - - + + + + + \ No newline at end of file Index: lams_admin/web/WEB-INF/web.xml =================================================================== diff -u -r0892350e28ca67031ad97e624f167dccd6272871 -r29551b741b1aec1a353848c10813385d7d72c3c8 --- lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 0892350e28ca67031ad97e624f167dccd6272871) +++ lams_admin/web/WEB-INF/web.xml (.../web.xml) (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -20,11 +20,6 @@ - - xls - excel/ms-excel - - SystemSessionFilter Index: lams_admin/web/config/editconfig.jsp =================================================================== diff -u -r58849c4c0f9dc763832a48d4cb3e4d483e05fb4e -r29551b741b1aec1a353848c10813385d7d72c3c8 --- lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision 58849c4c0f9dc763832a48d4cb3e4d483e05fb4e) +++ lams_admin/web/config/editconfig.jsp (.../editconfig.jsp) (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -12,8 +12,8 @@ : -
+
Index: lams_admin/web/register.jsp =================================================================== diff -u --- lams_admin/web/register.jsp (revision 0) +++ lams_admin/web/register.jsp (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -0,0 +1,309 @@ +<%@ page contentType="text/html; charset=utf-8" language="java" %> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + +

+ : + +

+
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + + + Afghanistan + Albania + + Algeria + Andorra + Angola + Antigua and Barbuda + Argentina + Armenia + + Australia + Austria + Azerbaijan + Bahamas + Bahrain + Bangladesh + + Barbados + Belarus + Belgium + Belize + Benin + Bhutan + + Bolivia + Bosnia and Herzegovina + Botswana + Brazil + Brunei Darussalam + Bulgaria + + Burkina Faso + Burundi + Cambodia + Cameroon + Canada + Cape Verde + + Central African Republic + Chad + Chile + China + Colombia + Comoros + + Congo + Costa Rica + C'ote d'Ivoire + Croatia + Cuba + Cyprus + + Czech Republic + Democratic People's Republic of Korea + Democratic Republic of the Congo + Denmark + Djibouti + Dominica + + Dominican Republic + Ecuador + Egypt + El Salvador + Equatorial Guinea + Eritrea + + Estonia + Ethiopia + Fiji + Finland + France + Gabon + + Gambia + Georgia + Germany + Ghana + Greece + Grenada + + Guatemala + Guinea + Guinea Bissau + Guyana + Haiti + Honduras + + Hungary + Iceland + India + Indonesia + Iran + Iraq + + Ireland + Israel + Italy + Jamaica + Japan + Jordan + + Kazakhstan + Kenya + Kiribati + Kuwait + Kyrgyzstan + Lao People's Democratic Republic + + Latvia + Lebanon + Lesotho + Liberia + Libyan Arab Jamahiriya + Liechtenstein + + Lithuania + Luxembourg + Madagascar + Malawi + Malaysia + Maldives + + Mali + Malta + Marshall Islands + Mauritania + Mauritius + Mexico + + Micronesia + Moldova + Monaco + Mongolia + Morocco + Mozambique + + Myanmar + Namibia + Nauru + Nepal + Netherlands + New Zealand + + Nicaragua + Niger + Nigeria + Norway + Oman + Pakistan + + Palau + Panama + Papua New Guinea + Paraguay + Peru + Philippines + + Poland + Portugal + Qatar + Republic of Korea + Romania + Russian Federation + + Rwanda + Saint Kitts and Nevis + Saint Lucia + Saint Vincent and the Grenadines + Samoa + San Marino + + Sao Tome and Principe + Saudi Arabia + Senegal + Seychelles + Sierra Leone + Singapore + + Slovakia + Slovenia + Solomon Islands + Somalia + South Africa + Spain + + Sri Lanka + Sudan + Suriname + Swaziland + Sweden + Switzerland + + Syrian Arab Republic + Taiwan + Tajikistan + Thailand + The former Yugoslav Republic of Macedonia + Timor-Leste + + Togo + Tonga + Trinidad and Tobago + Tunisia + Turkey + Turkmenistan + + Tuvalu + Uganda + Ukraine + United Arab Emirates + United Kingdom + United Republic of Tanzania + + United States + Uruguay + Uzbekistan + Vanuatu + Venezuela + Vietnam + + Yemen + Serbia and Montenegro + Zambia + Zimbabwe + +
+ + +     +   +
+ +

+ + + +

+ \ No newline at end of file Index: lams_admin/web/sysadmin.jsp =================================================================== diff -u -r609c620db1e0d4695fdf7c6d218cf78efc5c0a93 -r29551b741b1aec1a353848c10813385d7d72c3c8 --- lams_admin/web/sysadmin.jsp (.../sysadmin.jsp) (revision 609c620db1e0d4695fdf7c6d218cf78efc5c0a93) +++ lams_admin/web/sysadmin.jsp (.../sysadmin.jsp) (revision 29551b741b1aec1a353848c10813385d7d72c3c8) @@ -15,3 +15,5 @@

+

+