Index: lams_central/web/login.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/login.jsp,v diff -u -r1.51.2.1 -r1.51.2.2 --- lams_central/web/login.jsp 8 Oct 2014 05:53:18 -0000 1.51.2.1 +++ lams_central/web/login.jsp 21 Oct 2014 18:50:46 -0000 1.51.2.2 @@ -1,156 +1,178 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-core" prefix="c" %> -<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy" %> -<%@ page import="org.lamsfoundation.lams.util.Configuration" %> -<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page language="java" pageEncoding="UTF-8" + contentType="text/html;charset=utf-8"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration"%> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> <%-- If you change this file, remember to update the copy made for CNG-21 --%> -<% - if (JspRedirectStrategy.loginPageRedirected(request,response)) - { +<% + if (JspRedirectStrategy.loginPageRedirected(request, response)) { return; - } - - /*String webAuthUser = (String) session.getAttribute("WEBAUTH_USER"); - if (webAuthUser != null) - { - response.sendRedirect("j_security_check?j_username=" + webAuthUser + "&j_password=Dummy"); - }*/ - - // for sysadmin to be able to login as someone else - String login = (String)session.getAttribute("login"); - if (login!=null) { - session.removeAttribute("login"); - response.sendRedirect("j_security_check?j_username="+login+"&j_password=dummy"); - } + } %> + + <%= Configuration.getAsBoolean(ConfigurationKeys.LDAP_ENCRYPT_PASSWORD_FROM_BROWSER) %> - <fmt:message key="title.login.window"/> - + <fmt:message key="title.login.window" /> + - - - + + - -
- + +
+

 

- -
- -
- - - -
- -
-

LAMS - Learning Activity Management System

- - - <%try{%> - - <%}catch(Exception e){e.printStackTrace();}%> -
- + +
+ + +
+
+

+ LAMS - Learning Activity Management System +

-
-

<%= Configuration.get(ConfigurationKeys.VERSION) %>

-

-
+ + + <% + try { + %> + + <% + } catch (Exception e) { + e.printStackTrace(); + } + %> +
+ + +
+

+ + <%=Configuration.get(ConfigurationKeys.VERSION)%>

+

+ +

+ - -

: - -

-

: - -

+ + + + +

+ + : +

+ +

+ + : +

+ - + + + +

+ -
- -
- -
+ +
+ + +

+
+ - - -
+
+ +
+ + + +
+ + + - - - + \ No newline at end of file