Index: lams_common/web/login.jsp =================================================================== diff -u -rae1790ef7e6ea6c158c56bca3b09ef33a5c311ee -r4290878496251ea618c56389b67adda2fe4f2e28 --- lams_common/web/login.jsp (.../login.jsp) (revision ae1790ef7e6ea6c158c56bca3b09ef33a5c311ee) +++ lams_common/web/login.jsp (.../login.jsp) (revision 4290878496251ea618c56389b67adda2fe4f2e28) @@ -1,171 +1,30 @@ - -<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> -<%@ page session="true" %> -<%@ page import="com.lamsinternational.lams.util.JspRedirectStrategy" %> -<%@ page import="com.lamsinternational.lams.security.Global" %> +<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> +<%@ page import="com.lamsinternational.lams.security.JspRedirectStrategy" %> <% - - //FIXME: temporary solution - if (Global.getServletContext() == null) - Global.setServletContext( request.getSession().getServletContext() ); - - String failed = request.getParameter("failed"); - if (failed == null) + if (JspRedirectStrategy.loginPageRedirected(request,response)) { - if (JspRedirectStrategy.loginPageRedirected(request,response)) - return; - } - else - { - if (JspRedirectStrategy.errorPageRedirected(request,response)) - return; - } - + return; + } + String webAuthUser = (String) session.getAttribute("WEBAUTH_USER"); if (webAuthUser != null) - { + { response.sendRedirect("j_security_check?j_username=" + webAuthUser + "&j_password=Dummy"); - } - + } %> - - Login - LAMS :: Learning Activity Management System - - - - + + + + + + + - - - - - - - - - - - - -
- - - - - - - - - - -
- -
- -
- Welcome - -
-
- - - - - - - - - - - - - - - - -
- -
-

- 		-   - -
" method="post" name="loginForm" id="loginForm"> - <%if ( failed != null ){%> - - Sorry, that username or password is not known. Please try again. - - <%}%> - - - - - - - - - - - - - - - - - - - - - - -
- Username - - -
- Password - - -
- -
-


-
- WebAuth Users: click here -
-
- -
- © 2002-2005 LAMS Foundation. - - - This copy of LAMS™ is authorised for use by the registered users only. - - Version 1.1 -
-
- - - - -
-
- -