From a12d504be4f40d08adbae4ed3a548873dd28a0e8 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 7 Oct 2015 13:21:03 +0200
Subject: [PATCH] =?utf8?q?Continued:=20-=20added=20new=20page=20resend=5Fl?=
 =?utf8?q?ink.xhtml=20for=20resending=20confirmation=20link=20-=20added=20?=
 =?utf8?q?language=20strings=20for=20above=20new=20page=20(all=20pages=20g?=
 =?utf8?q?et=20at=20least=202=20strings)=20-=20forgot=20to=20clear=20userN?=
 =?utf8?q?ame=20property=20in=20bean=20-=20better=20handle=20over=20whole?=
 =?utf8?q?=20User=20instance=20instead=20of=20"raw=20data"=20-=20updated?=
 =?utf8?q?=20jar(s)=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxchange?=
 =?utf8?q?.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/juser-core.jar                            | Bin 16582 -> 16582 bytes
 lib/juser-lib.jar                             | Bin 3749 -> 3749 bytes
 .../beans/register/UserRegisterWebBean.java   |  10 +++----
 .../addressbook/beans/user/UserWebBean.java   |   9 +++---
 .../beans/user/UserWebController.java         |  12 ++++----
 .../localization/bundle_de_DE.properties      |   4 +++
 .../localization/bundle_en_US.properties      |   4 +++
 web/WEB-INF/faces-config.xml                  |   4 +++
 web/WEB-INF/templates/guest/guest_menu.tpl    |   1 +
 web/user/resend_link.xhtml                    |  28 ++++++++++++++++++
 10 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 web/user/resend_link.xhtml

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 791ee3aad7307d2f4534d23a9c5fe4d096d8d18b..cc3731c80a7e0f7cd3fb40011743ea015d4e3d38 100644
GIT binary patch
delta 306
zcmX@s$at)gkte{LnT3mifrEj;GixG`CX+|jMDyuPK=uU%5cx?HNKTezGzL*;88s)z
zGjpTpnLLTn5+Y{@qIj8Hfz;*@rU)hwy^bY<1w?ajT7qe3-d<)9|B}FZFx@P20!;f#
zyb%J4TWjlq)n)5{0E@>OZ)F3DPZqJV1iEapzm)@sH_^%fL>&eS0;zvi&LHZZwanyr
zYa<YIvb85f#1BO2*@S|qR-1ef_06UVL>1YVfv8uunIJ0EE*C@{u`2>m7WT0qYPx*{
Mi24ZO1vr!e04c~{kpKVy

delta 306
zcmX@s$at)gkte{LnT3mifrEjeJ8~kACR11BMDyuPK=uU%5cx?HNKTezGzL*;88s)z
zGjpTpnLLTn5+Y{@qIj8Hfz;*@rU)hwy^bY<1w?ajT7qe3-d<)9|B}FZFx@P20!;f#
zyb%J4TWjlq)n)5{0E@>OZ)F3DPZqJV1iEapzm)@sH_^%fL>&eS0;zvi&LHZZwanyr
zYa<YIvb85f#1BO2*@S|qR-1ef_06UVL>1YVfv8uunIJ0EE*C@{u`2>m7WT0qYPx*{
Mi24ZO1vr!e07E8b*8l(j

diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar
index 6457e8da888500c94b9123326010e72a82b0007a..394fea9303a74e3492b8053562a8bd56e103e1dd 100644
GIT binary patch
delta 181
zcmZ1~yHu7Zz?+$ci-CcIfx$6rB9A7ML)Jv|=}bWO1qBfKNfSs;mSr>sQ9+EBAgY(q
z9z>mEbOKRAOm;wOa}d)GCJ@cT%E1hx#W?nZ_>-@5Spv<REX3^q;)QS<fT%WZut5j8
mok2V{9#0Sz$m0*97V!jusBb)eAj*w5A4F~Etprg<e8m7u!!o4+

delta 181
zcmZ1~yHu7Zz?+$ci-CcIfk7!@B9A7MV!}l8=}bWO1qBfKNfSs;mSr>sQ9+EBAgY(q
z9z>mEbOKRAOm;wOa}d)GCJ@cT%E1hx#W?nZ_>-@5Spv<REX3^q;)QS<fT%WZut5j8
mok2V{9#0Sz$m0*97V!jusBb)eAj*w5A4F~Etprg<e8m9#YA($H

diff --git a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java
index 6edf2af6..b3a75281 100644
--- a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebBean.java
@@ -82,19 +82,19 @@ public class UserRegisterWebBean implements UserRegisterWebController {
 		// Is the user already used?
 		if (!this.userController.isRequiredPersonalDataSet()) {
 			// Not all required fields are set
-			throw new FaceletException("Not all required fields are set.");
-		} else if (this.userController.isUserNameRegistered(user.getUserName())) {
+			throw new FaceletException("Not all required fields are set."); //NOI18N
+		} else if (this.userController.isUserNameRegistered(user)) {
 			// User name is already used
 			throw new FaceletException(new UserNameAlreadyRegisteredException(user));
-		} else if (this.userController.isEmailAddressRegistered(user.getUserContact().getEmailAddress())) {
+		} else if (this.userController.isEmailAddressRegistered(user)) {
 			// Email address has already been taken
 			throw new FaceletException(new EmailAddressAlreadyRegisteredException(user));
 		} else if (!this.userController.isSameEmailAddressEntered()) {
 			// Not same email address entered
-			throw new FaceletException(new DataRepeatMismatchException(MessageFormat.format("Email addresses not matching: {0} != {1}", this.userController.getEmailAddress(), this.userController.getEmailAddressRepeat())));
+			throw new FaceletException(new DataRepeatMismatchException(MessageFormat.format("Email addresses not matching: {0} != {1}", this.userController.getEmailAddress(), this.userController.getEmailAddressRepeat()))); //NOI18N
 		} else if (!this.userController.isSamePasswordEntered()) {
 			// Not same password entered
-			throw new FaceletException(new DataRepeatMismatchException("Passwords not matching."));
+			throw new FaceletException(new DataRepeatMismatchException("Passwords not matching.")); //NOI18N
 		}
 
 		// Encrypt password
diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
index ab9f5b65..fdf037db 100644
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
@@ -222,6 +222,7 @@ public class UserWebBean implements UserWebController {
 		// - other data
 		this.setBirthday(null);
 		this.setComment(null);
+		this.setUserName(null);
 		this.setUserPassword(null);
 		this.setUserPasswordRepeat(null);
 	}
@@ -491,8 +492,8 @@ public class UserWebBean implements UserWebController {
 	}
 
 	@Override
-	public boolean isEmailAddressRegistered (final String emailAddress) {
-		return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(emailAddress)));
+	public boolean isEmailAddressRegistered (final User user) {
+		return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(user.getUserContact().getEmailAddress())));
 	}
 
 	@Override
@@ -522,7 +523,7 @@ public class UserWebBean implements UserWebController {
 	}
 
 	@Override
-	public boolean isUserNameRegistered (final String userName) {
-		return ((this.userNameList instanceof List) && (this.userNameList.contains(userName)));
+	public boolean isUserNameRegistered (final User user) {
+		return ((this.userNameList instanceof List) && (this.userNameList.contains(user.getUserName())));
 	}
 }
diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
index b93bf115..a661d10e 100644
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java
@@ -321,12 +321,12 @@ public interface UserWebController extends Serializable {
 	public void setZipCode (final Integer zipCode);
 
 	/**
-	 * Checks whether given email address is used
+	 * Checks whether user instance's email address is used
 	 * <p>
-	 * @param emailAddress Email address to check
+	 * @param user User instance's email address to check
 	 * @return Whether it is already used
 	 */
-	public boolean isEmailAddressRegistered (final String emailAddress);
+	public boolean isEmailAddressRegistered (final User user);
 
 	/**
 	 * Checks whether all required personal data is set
@@ -350,10 +350,10 @@ public interface UserWebController extends Serializable {
 	public boolean isSamePasswordEntered ();
 
 	/**
-	 * Checks whether given user name is used
+	 * Checks whether given user instance's name is used
 	 * <p>
-	 * @param userName User name to check
+	 * @param user User instance's name to check
 	 * @return Whether it is already used
 	 */
-	public boolean isUserNameRegistered (final String userName);
+	public boolean isUserNameRegistered (final User user);
 }
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 01d4628b..3fff23d5 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -113,3 +113,7 @@ GUEST_USER_REGISTRATION_COMPLETED=Die Anmeldung ist abgeschlossen und Ihr Accoun
 PERSONAL_DATA_COUNTRY_CODE=L\u00e4ndercode:
 PAGE_TITLE_USER_REGISTER_DONE=Anmeldung abgeschlossen
 SUB_TITLE_USER_REGISTER_DONE=Die Anmeldung ist abgeschlossen:
+PAGE_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink erneut aussenden
+SUB_TITLE_INDEX_RESEND_LINK=Best\u00e4tigungslink anfordern:
+LINK_GUEST_RESEND_LINK=Best\u00e4tigungslink
+LINK_GUEST_RESEND_LINK_TITLE=Best\u00e4tigungslink erneut aussenden
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 761a8817..bbb49465 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -113,3 +113,7 @@ GUEST_USER_REGISTRATION_COMPLETED=The registration is completed and your account
 PERSONAL_DATA_COUNTRY_CODE=Country code:
 PAGE_TITLE_USER_REGISTER_DONE=Registration completed
 SUB_TITLE_USER_REGISTER_DONE=Registration is completed:
+PAGE_TITLE_INDEX_RESEND_LINK=Resend confirmation link
+SUB_TITLE_INDEX_RESEND_LINK=Request confirmation link:
+LINK_GUEST_RESEND_LINK=Confirmation link
+LINK_GUEST_RESEND_LINK_TITLE=Resend confirmation link
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 2078bf98..ab8b7f84 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -53,6 +53,10 @@
 	        <from-outcome>login_index</from-outcome>
 	        <to-view-id>/login/index.xhtml</to-view-id>
 	    </navigation-case>
+	    <navigation-case>
+	        <from-outcome>resend_link</from-outcome>
+	        <to-view-id>/user/resend_link.xhtml</to-view-id>
+	    </navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/admin_logout.xhtml</from-view-id>
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index e9369cca..c7c2389a 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -24,6 +24,7 @@
 				<li><h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" /></li>
 				<li><h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="user_register" value="#{msg.LINK_GUEST_REGISTER}" /></li>
 				<li><h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" /></li>
+				<li><h:link title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" outcome="user_lost_passwd" value="#{msg.LINK_GUEST_RESEND_LINK}" /></li>
 			</ul>
 		</div>
 	</div>
diff --git a/web/user/resend_link.xhtml b/web/user/resend_link.xhtml
new file mode 100644
index 00000000..ebb62a4a
--- /dev/null
+++ b/web/user/resend_link.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
+
+		<ui:define name="menu">
+			<ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.SUB_TITLE_INDEX_RESEND_LINK}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+
+		<ui:define name="footer">
+			<ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+		</ui:define>
+	</ui:composition>
+</html>
-- 
2.39.5