Author: mpodolin Date: 2010-03-30 08:54:34 -0400 (Tue, 30 Mar 2010) New Revision: 2399 Modified: portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/login/jsp/login.jsp portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/login/jsp/login.jsp portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/login/jsp/login.jsp Log: JBEPP-198: GTNPORTAL-725 ported to the branch Modified: portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2010-03-30 12:35:46 UTC (rev 2398) +++ portal/branches/EPP_5_0_Branch/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2010-03-30 12:54:34 UTC (rev 2399) @@ -25,6 +25,7 @@ <%@ page import="org.exoplatform.services.resources.ResourceBundleService"%> <%@ page import="java.util.ResourceBundle"%> <%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%> +<%@ page import="org.gatein.common.text.EntityEncoder"%> <%@ page language="java" %> <%@ page contentType="text/html; charset=utf-8" %> <% @@ -67,6 +68,8 @@ <%/*Begin form*/%> <% if(username.length() > 0 || password.length() > 0) { + EntityEncoder encoder = EntityEncoder.FULL; + username = encoder.encode(username); %> <font color="red">Sign in failed. Wrong username or password.</font><%}%> <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> Modified: portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2010-03-30 12:35:46 UTC (rev 2398) +++ portal/branches/EPP_5_0_Branch/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2010-03-30 12:54:34 UTC (rev 2399) @@ -25,6 +25,7 @@ <%@ page import="org.exoplatform.services.resources.ResourceBundleService"%> <%@ page import="java.util.ResourceBundle"%> <%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%> +<%@ page import="org.gatein.common.text.EntityEncoder"%> <%@ page language="java" %> <%@ page contentType="text/html; charset=utf-8" %> <% @@ -67,6 +68,8 @@ <%/*Begin form*/%> <% if(username.length() > 0 || password.length() > 0) { + EntityEncoder encoder = EntityEncoder.FULL; + username = encoder.encode(username); %> <font color="red">Sign in failed. Wrong username or password.</font><%}%> <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-30 12:35:46 UTC (rev 2398) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-30 12:54:34 UTC (rev 2399) @@ -25,6 +25,7 @@ <%@ page import="org.exoplatform.services.resources.ResourceBundleService"%> <%@ page import="java.util.ResourceBundle"%> <%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%> +<%@ page import="org.gatein.common.text.EntityEncoder"%> <%@ page language="java" %> <% String contextPath = request.getContextPath() ; @@ -69,6 +70,9 @@ <%/*Begin form*/%> <% if(username.length() > 0 || password.length() > 0) { + EntityEncoder encoder = EntityEncoder.FULL; + username = encoder.encode(username); + %> <font color="red"><%=res.getString("UILoginForm.label.SigninFail")%></font><%}%> <form name="loginForm" action="<%= contextPath + "/login"%>" method="post" style="margin: 0px;"> @@ -117,4 +121,4 @@ </div> <span style="font-size: 11px; color: #3f3f3f; text-align: center"><%=res.getString("UILoginForm.label.Copyright")%></span> </body> -</html> \ No newline at end of file +</html>