From 41c1eba5a2acce5c0af831f7a7d3a47adcddaabb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 25 Aug 2016 16:39:14 +0200
Subject: [PATCH] Please cherry-pick: - added new page that admins can send out
 a new confirmation link to users - added navigation rule for new page - added
 missing i18n strings - using ui:fragment is now no longer required (it hid
 the <li> tag if unconfirmed) - fixed i18n usage

---
 .../localization/bundle_de_DE.properties      |   9 ++
 .../localization/bundle_en_US.properties      |  10 ++
 web/WEB-INF/faces-config.xml                  |   4 +
 .../templates/admin/user/admin_user_links.tpl |  24 ++--
 .../admin_user_resend_confirmation_link.xhtml | 108 ++++++++++++++++++
 web/admin/user/admin_user_unlock.xhtml        |   2 +-
 6 files changed, 145 insertions(+), 12 deletions(-)
 create mode 100644 web/admin/user/admin_user_resend_confirmation_link.xhtml

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 5e660eb0..1feae44c 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -726,3 +726,12 @@ BUTTON_ADMIN_DELETE_LAND_LINE_NUMBER=Festnetznummer l\u00f6schen
 ADMIN_CONTACT_LIST_EMPTY=Keine Kontaktdaten in Datenbank gefunden.
 ADMIN_USER_LIST_EMPTY=Keine Benutzerdaten in Datenbank gefunden.
 ADMIN_PERSONAL_DATA_COMMENT=Kommentar: (optional)
+ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK=Neuen Best\u00e4tigungslink zusenden
+ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE=Sendet einen neuen Best\u00e4tigungslink an die im Account hinterlegte Email-Adresse.
+ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED=Fehler: Kann keinen neuen Best\u00e4tigungslink aussenden, Benutzeraccount ist bereits best\u00e4tigt.
+ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED=Fehler: Kann keinen neuen Best\u00e4tigungslink aussenden, Benutzeraccount ist gesperrt.
+BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT=Neuen Best\u00e4tigungslink aussenden
+ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE=M\u00f6chten Sie dem Benutzer {0} (Id-Nummer {1}) einen neuen Best\u00e4tigungslink zusenden?
+ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE=Durch das Zuschicken eines neuen Best\u00e4tigungslinkes wird der alte ung\u00fcltig und nur noch der neue Link kann verwendet werden.
+PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Neuen Best\u00e4tigungslink versenden
+CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Neuen Best\u00e4tigungslink versenden:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 940e7168..18851803 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -726,3 +726,13 @@ BUTTON_ADMIN_DELETE_LAND_LINE_NUMBER=Delete land-line number
 ADMIN_CONTACT_LIST_EMPTY=No contact data found in database.
 ADMIN_USER_LIST_EMPTY=No user data found in database.
 ADMIN_PERSONAL_DATA_COMMENT=Comment: (optional)
+ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK=Send new confirmation key
+ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE=Sends out a new confirmation link to the user's assigned email address.
+ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED=Error: Cannot send new confirmation link to user, account is already confirmed.
+ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED=Error: Cannot send new confirmation link to user, account is locked.
+BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT=Send new confirmation link
+ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE=Do you want to send a new confirmation link to user {0} (id numer {1})?
+#Durch das Zuschicken eines neuen Best\u00e4tigungslinkes wird der alte ung\u00fcltig und nur noch der neue Link kann verwendet werden.
+ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE=By sending a new confirmation link to the user, the old link becomes invalid and only the new link can be used.
+PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Send new confirmation link
+CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK=Send new confirmation link:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 6b921d25..ed5b92c8 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -368,6 +368,10 @@
 			<from-outcome>admin_delete_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_resend_user_confirm_link</from-outcome>
+			<to-view-id>/admin/user/admin_user_resend_confirmation_link.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_lock_user</from-outcome>
 			<to-view-id>/admin/user/admin_user_lock.xhtml</to-view-id>
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index a00b77df..d42ad00e 100644
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -31,17 +31,19 @@
 					</h:link>
 				</li>
 
-				<ui:fragment rendered="#{beanHelper.user.userAccountStatus != 'UNCONFIRMED'}">
-					<li>
-						<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
-							<f:param name="userId" value="#{beanHelper.user.userId}" />
-						</h:link>
-
-						<h:link outcome="admin_lock_user" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-							<f:param name="userId" value="#{beanHelper.user.userId}" />
-						</h:link>
-					</li>
-				</ui:fragment>
+				<li>
+					<h:link outcome="admin_resend_user_confirm_link" value="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK}" title="#{msg.ADMIN_LINK_RESEND_USER_CONFIRMATION_LINK_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+						<f:param name="userId" value="#{beanHelper.user.userId}" />
+					</h:link>
+
+					<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+						<f:param name="userId" value="#{beanHelper.user.userId}" />
+					</h:link>
+
+					<h:link outcome="admin_lock_user" value="#{msg.ADMIN_LINK_LOCK_USER}" title="#{msg.ADMIN_LINK_LOCK_USER_TITLE}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+						<f:param name="userId" value="#{beanHelper.user.userId}" />
+					</h:link>
+				</li>
 
 				<li>
 					<h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
new file mode 100644
index 00000000..e27b8546
--- /dev/null
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<ui:define name="metadata">
+		<f:metadata>
+			<f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+			<f:viewAction onPostback="true" action="#{beanHelper.copyUserToController()}" />
+		</f:metadata>
+	</ui:define>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
+		</ui:define>
+
+		<ui:define name="content_header">
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_RESEND_USER_CONFIRMATION_LINK}" />
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{empty beanHelper.user}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+
+			<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+				<h:panelGroup styleClass="table_medium" layout="block">
+					<div class="table_header">
+						<h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
+							<f:param value="#{beanHelper.user.userName}" />
+							<f:param value="#{beanHelper.user.userId}" />
+						</h:outputFormat>
+					</div>
+
+					<div class="para">
+						<div class="table_data_label">
+							<h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
+						</div>
+
+						<div class="table_data_field">
+							<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
+								<f:param name="userId" value="#{beanHelper.user.userId}" />
+							</h:link>
+						</div>
+					</div>
+
+					<div class="para">
+						<div class="table_data_label">
+							<h:outputLabel for="contactGender" value="#{msg.PERSONAL_DATA_GENDER}" />
+						</div>
+
+						<div class="table_data_field">
+							<h:outputText id="contactGender" value="#{msg[beanHelper.user.userContact.contactGender.messageKey]}" />
+						</div>
+					</div>
+
+					<div class="para">
+						<div class="table_data_label">
+							<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+						</div>
+
+						<div class="table_data_field">
+							<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
+						</div>
+					</div>
+
+					<div class="para">
+						<div class="table_data_label">
+							<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+						</div>
+
+						<div class="table_data_field">
+							<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
+						</div>
+					</div>
+
+					<div class="para">
+						<h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
+					</div>
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+
+						<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink(beanHelper.user)}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
+					</div>
+				</h:panelGroup>
+			</h:form>
+
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+				<f:param value="#{beanHelper.user.userName}" />
+				<f:param value="#{beanHelper.user.userId}" />
+			</h:outputFormat>
+
+			<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+				<f:param value="#{beanHelper.user.userName}" />
+				<f:param value="#{beanHelper.user.userId}" />
+			</h:outputFormat>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 95e4cca6..d714d885 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -42,7 +42,7 @@
 
 					<div class="para">
 						<div class="table_data_label">
-							<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
+							<h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
 						</div>
 
 						<div class="table_data_field">
-- 
2.39.5