org.springframework.web.context.ContextLoaderListener
@@ -164,6 +244,14 @@
/WEB-INF/fckeditor/tlds/FCKeditor.tld
+
+
+
+
+ tags-lams
+ /WEB-INF/lams.tld
+
+
+
+
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.2 -r1.3
--- lams_admin/web/WEB-INF/tiles/tiles-defs.xml 8 Sep 2005 02:45:20 -0000 1.2
+++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml 21 Feb 2006 08:24:35 -0000 1.3
@@ -1,9 +1,26 @@
-
+
+
@@ -54,5 +71,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: lams_admin/web/sysadmin/cache.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin/Attic/cache.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/sysadmin/cache.jsp 21 Feb 2006 08:24:35 -0000 1.1
@@ -0,0 +1,23 @@
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+- ">
+Children:
+
+
+
+
+
+
Index: lams_admin/web/sysadmin/previewdeleted.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin/Attic/previewdeleted.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/sysadmin/previewdeleted.jsp 21 Feb 2006 08:24:35 -0000 1.1
@@ -0,0 +1,7 @@
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+
+
+
+
+
+
Index: lams_admin/web/sysadmin/sysadminContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/sysadmin/Attic/sysadminContent.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_admin/web/sysadmin/sysadminContent.jsp 21 Feb 2006 08:24:35 -0000 1.1
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
+
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+
+System Administration
+
+
+
+
+
+
.
+
+
+
+
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.2 -r1.3
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 6 Sep 2005 05:21:49 -0000 1.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 21 Feb 2006 08:25:50 -0000 1.3
@@ -33,7 +33,8 @@
* @struts:action path="/home"
* validate="false"
* parameter="method"
- * @struts:action-forward name="admin" path=".admin"
+ * @struts:action-forward name="sysadmin" path="/sysadmin.jsp"
+ * @struts:action-forward name="admin" path="/admin.jsp"
* @struts:action-forward name="learner" path="/learner.jsp"
* @struts:action-forward name="author" path="/author.jsp"
* @struts:action-forward name="staff" path="/staff.jsp"
@@ -56,7 +57,7 @@
}
/**
- * request for sysadmin environment
+ * request for admin environment
*/
public ActionForward admin(ActionMapping mapping, ActionForm form,
HttpServletRequest req, HttpServletResponse res)
@@ -89,6 +90,37 @@
}
/**
+ * request for sysadmin environment
+ */
+ public ActionForward sysadmin(ActionMapping mapping, ActionForm form,
+ HttpServletRequest req, HttpServletResponse res)
+ throws IOException, ServletException {
+
+ try {
+ log.debug("request sysadmin");
+
+ String login = req.getRemoteUser();
+
+ int orgId = new Integer(req.getParameter("orgId")).intValue();
+
+ if ( isUserInRole(login,orgId,Role.SYSADMIN))
+ {
+ log.debug("user is sysadmin");
+ return mapping.findForward("sysadmin");
+ }
+ else
+ {
+ log.error("User "+login+" tried to get sysadmin screen but isn't sysadmin in organisation: "+orgId);
+ return mapping.findForward("error");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return mapping.findForward("error");
+ }
+ }
+
+ /**
* request for learner environment
*/
public ActionForward learner(ActionMapping mapping, ActionForm form,
Index: lams_central/web/admin.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/admin.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_central/web/admin.jsp 21 Feb 2006 08:25:50 -0000 1.1
@@ -0,0 +1,14 @@
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+
+
+
+Admin:: LAMS
+
+
+
+Loading Administration Environment.
+
+
+
Index: lams_central/web/indexContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/indexContent.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/indexContent.jsp 5 Sep 2005 05:15:10 -0000 1.2
+++ lams_central/web/indexContent.jsp 21 Feb 2006 08:25:50 -0000 1.3
@@ -50,11 +50,11 @@
- <%List list = service.getOrganisationsForUserByRole(user,Role.ADMIN);
+ <%List list = service.getOrganisationsForUserByRole(user,Role.SYSADMIN);
if(list.size()>0){%>
|
-
+
|
|
<%}%>
+ <%list = service.getOrganisationsForUserByRole(user,Role.ADMIN);
+ if(list.size()>0){%>
+
+ |
+
+ |
+
+
+ |
+
+ <%}%>
<%list = service.getOrganisationsForUserByRole(user,Role.STAFF);
if(list.size()>0){%>
Index: lams_central/web/sysadmin.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/sysadmin.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_central/web/sysadmin.jsp 21 Feb 2006 08:25:50 -0000 1.1
@@ -0,0 +1,14 @@
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+
+
+
+System Admin:: LAMS
+
+
+
+Loading System Administration Environment.
+
+
+
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.6 -r1.7
--- lams_central/web/WEB-INF/struts/struts-config.xml 17 Nov 2005 23:04:50 -0000 1.6
+++ lams_central/web/WEB-INF/struts/struts-config.xml 21 Feb 2006 08:26:19 -0000 1.7
@@ -70,8 +70,13 @@
validate="false"
>
+
| 
-