From f54da6124a3f278f65b9b89698d12d308be6f607 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 5 Mar 2016 14:27:54 +0100
Subject: [PATCH] use user controller + use current password template

---
 web/login/login_change_email_address.xhtml |  2 +-
 web/login/login_change_password.xhtml      | 16 +++-------------
 web/login/login_change_personal_data.xhtml |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
index 2c9a84b3..1dbb0f27 100644
--- a/web/login/login_change_email_address.xhtml
+++ b/web/login/login_change_email_address.xhtml
@@ -59,7 +59,7 @@
 
 						<div class="table_footer">
 							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{loginController.changeEmailAddress()}" />
+							<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userController.changeEmailAddress()}" />
 						</div>
 					</h:form>
 				</div>
diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml
index 97269006..5b7ff4a7 100644
--- a/web/login/login_change_password.xhtml
+++ b/web/login/login_change_password.xhtml
@@ -29,18 +29,6 @@
 							<fieldset id="change_password">
 								<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
 
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="password" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputSecret class="input" id="password" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
 								<div class="table_row">
 									<div class="table_left">
 										<h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
@@ -67,9 +55,11 @@
 							</fieldset>
 						</div>
 
+						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
 						<div class="table_footer">
 							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{loginController.changePassword()}" />
+							<h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
 						</div>
 					</h:form>
 				</div>
diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml
index 784772c9..e1711f0d 100644
--- a/web/login/login_change_personal_data.xhtml
+++ b/web/login/login_change_personal_data.xhtml
@@ -29,7 +29,7 @@
 
 						<div class="table_footer">
 							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{loginController.changePersonalData()}" />
+							<h:commandButton class="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.changePersonalData()}" />
 						</div>
 					</h:form>
 				</div>
-- 
2.39.5