Author: wassek
Date: Fri Nov 16 10:47:03 2007
New Revision: 19172
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19172&repname=
=3Djahia
Log:
added goToHome parameter
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
login/LogAreaTag.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs=
/html/login/LogAreaTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/login/LogAreaTag.java&rev=
=3D19172&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
login/LogAreaTag.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/html/=
login/LogAreaTag.java Fri Nov 16 10:47:03 2007
@@ -18,6 +18,7 @@
package org.jahia.taglibs.html.login;
=
import java.io.IOException;
+import java.util.StringTokenizer;
=
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
@@ -40,8 +41,7 @@
* <p>
* <b>Example :</b>
* <p>
- * <content:logArea labelBundle=3D\"jahiatemplates.JahiaLa=
bels\"
- * <br>
+ * <content:logArea labelBundle=3D\"jahiatemplates.JahiaLa=
bels\" <br>
* labelRememberMe=3D\"rememberMe\" <br>
* rememberMe=3D\"true\" <br>
* errorBundle=3D\"jahiatemplates.JahiaErrors\" <br>
@@ -61,12 +61,25 @@
=
private String labelBundle =3D "JahiaEnginesResources";
private String labelRememberMe =3D
"org.jahia.engines.login.Login_Engine.=
rememberMe.label";
- private String remember =3D "true";
+ private String rememberMe =3D "true";
private String errorBundle =3D "JahiaEnginesResources";
private String notLoginText =3D
"org.jahia.engines.login.Login_Engine.inv=
alidUsernamePassword.label";
private String notAllowedLogin =3D
"org.jahia.engines.login.Login_Engine.=
notAllowedToLog.label";
private String loginLabel =3D "";
private String errorTextStyleClass =3D "";
+ private String goToHomepage =3D "false";
+ private String
goToHomepageOptions=3D"org.jahia.engines.login.Login_Engin=
e.stayAtCurrentPage.label,org.jahia.engines.login.Login_Engine.jumpToHomePa=
ge.label";
+ private String maxAttempts =3D null;
+
+ public String getGoToHomeOptions()
+ {
+ return goToHomepageOptions;
+ }
+
+ public void setGoToHomeOptions(String goToHomepageOptions)
+ {
+ this.goToHomepageOptions =3D goToHomepageOptions;
+ }
=
public int doStartTag()
{
@@ -84,6 +97,35 @@
||
request.getSession().getAttribute("wrongLogin") !=3D null
&&
request.getSession().getAttribute("wrongLogin").equals("1"))
{
+ =
+ if(maxAttempts !=3D null &&
getNumMaxAttempts() !=3D 0)
+ {
+
if(request.getSession().getAttribute("maxLoginAttempts") !=3D null)
+ {
+ try{
+ =
+ int att =3D
((Integer)request.getSession().getAttribute("maxLoginA=
ttempts")).intValue();
+ if((att++) <
getNumMaxAttempts())
+ {
+
request.setAttribute("maxLoginAttempts", new Integer(att));
+ }
+ else
+ {
+ //error to much
attemps!!
+
out.println("<div style=3D\"" + getErrorTextStyleClass() + "\">");
+
out.println("text");
+
out.println("</div>"); =
+ return
SKIP_BODY;
+ =
+ }
+ }catch(Exception ex)
+ {}
+ =
+ }
+ else
+
request.getSession().setAttribute("maxLoginAttempts", new Integer(1=
));
+ }
+ =
String wrongLogin =3D
JahiaResourceBundle.getResource(getErrorBundle(=
),
getNotLoginText(),
jData.getProcessingContext().getLocale(),
jData.getProcessingContext());
@@ -208,6 +250,25 @@
out.println(remember);
out.println("</label>");
}
+ =
+ if(isGoToHomepage())
+ {
+ =
+ out.println("<br/><select
name=3D\"loginChoice\" tabindex=3D\"3\">");
+ StringTokenizer token =3D new StringTokenizer(getGoToHomeOption=
s(), ",");
+ int i =3D 1;
+ while(token.hasMoreElements())
+ {
+ String el =3D token.nextToken();
+ String text =3D JahiaResourceBundle.getResource(getLabelBundle=
(),
+ el,
jData.getProcessingContext().getLocale(),
+
jData.getProcessingContext());
+ out.println("<option value=3D\"" + i + "\">" + text + "</opti=
on>");
+ }
+ out.println("</select>");
+ =
+ }
+ =
out.println("</form>");
=
} catch (IOException ioe)
@@ -242,19 +303,23 @@
this.labelRememberMe =3D labelRememberMe;
}
=
- public String getRemember()
+ public String getRememberMe()
{
- return remember;
+ return rememberMe;
}
=
- public void setRemember(String remember)
- {
- this.remember =3D remember;
+ public void setRememberMe(String remember)
+ { =
+ this.rememberMe =3D remember;
}
=
public boolean isRemember()
{
- return ((new Boolean(remember)).booleanValue());
+ return ((new Boolean(rememberMe)).booleanValue());
+ }
+ public boolean isGoToHomepage()
+ {
+ return ((new Boolean(goToHomepage)).booleanValue());
}
=
public String getErrorBundle()
@@ -307,4 +372,37 @@
this.errorTextStyleClass =3D errorTextStyleClass;
}
=
+ public String getGoToHome()
+ {
+ return goToHomepage;
+ }
+
+ public void setGoToHome(String goToHomepage)
+ {
+ this.goToHomepage =3D goToHomepage;
+ }
+
+ public String getMaxAttempts()
+ {
+ return maxAttempts;
+ }
+
+ public void setMaxAttempts(String maxAttempts)
+ {
+ this.maxAttempts =3D maxAttempts;
+ }
+ private int getNumMaxAttempts()
+ {
+ if(getMaxAttempts() !=3D null)
+ {
+ try{
+ return Integer.parseInt(getMaxAttempts());
+ =
+ }catch(NumberFormatException ex)
+ { }
+ }
+ return 0;
+ =
+ }
+
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
