From 1b1cbea9bb008e77ab34295d949c685a8fda1a18 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 17:47:37 +0200
Subject: [PATCH] Maybe cherry-pick: - text should be wrapped in h:outputText
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 web/guest/user/user_show_addressbook.xhtml    | 15 ++++++++---
 .../user/user_show_addressbook_entries.xhtml  |  6 +++--
 web/user/login_add_addressbook.xhtml          |  8 +++---
 .../login_list_sharing_addressbooks.xhtml     |  6 +++--
 web/user/login_other_addressbooks.xhtml       |  6 +++--
 web/user/login_own_addressbooks.xhtml         | 20 +++++++++-----
 web/user/login_shared_addressbooks.xhtml      | 22 ++++++++++-----
 .../login_start_sharing_addressbook.xhtml     | 27 +++++++++++++------
 8 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/web/guest/user/user_show_addressbook.xhtml b/web/guest/user/user_show_addressbook.xhtml
index 6a1aa0b9..0ebf6524 100644
--- a/web/guest/user/user_show_addressbook.xhtml
+++ b/web/guest/user/user_show_addressbook.xhtml
@@ -15,16 +15,23 @@
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}" />
+		</ui:define>
+
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}" />
 		</ui:define>
 
 		<ui:define name="content">
 			<h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
-				<f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
+				<f:facet name="header">
+					<h:outputText value="#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}" />
+				</f:facet>
 
 				<h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
 				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
diff --git a/web/guest/user/user_show_addressbook_entries.xhtml b/web/guest/user/user_show_addressbook_entries.xhtml
index 88472995..c93ee942 100644
--- a/web/guest/user/user_show_addressbook_entries.xhtml
+++ b/web/guest/user/user_show_addressbook_entries.xhtml
@@ -9,10 +9,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
index ffb94fcb..eadc7656 100644
--- a/web/user/login_add_addressbook.xhtml
+++ b/web/user/login_add_addressbook.xhtml
@@ -9,10 +9,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}" />
 		</ui:define>
 
 		<ui:define name="content">
@@ -20,7 +22,7 @@
 				<h:form id="add_addressbook" acceptcharset="utf-8">
 					<div class="table">
 						<div class="table_header">
-							#{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}
+							<h:outputText value="#{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}" />
 						</div>
 
 						<div class="table_row">
diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml
index 5e3c94ea..d4c14399 100644
--- a/web/user/login_list_sharing_addressbooks.xhtml
+++ b/web/user/login_list_sharing_addressbooks.xhtml
@@ -16,10 +16,12 @@
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml
index 84602842..1c8bf5c0 100644
--- a/web/user/login_other_addressbooks.xhtml
+++ b/web/user/login_other_addressbooks.xhtml
@@ -9,10 +9,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
index 126fa9f8..7b2e5261 100644
--- a/web/user/login_own_addressbooks.xhtml
+++ b/web/user/login_own_addressbooks.xhtml
@@ -9,23 +9,27 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}" />
 		</ui:define>
 
 		<ui:define name="content">
 			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
 				<div class="table">
 					<div class="table_header">
-						#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}
+						<h:outputText value="#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}" />
 					</div>
 
 					<div class="para">
 						<h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
 							<h:column>
-								<f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.ADDRESSBOOK_NAME}" />
+								</f:facet>
 
 								<h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
 									<f:param name="addressbookId" value="#{addressbook.addressbookId}" />
@@ -34,7 +38,9 @@
 							</h:column>
 
 							<h:column>
-								<f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.ADDRESSBOOK_TOTAL_ENTRIES}" />
+								</f:facet>
 
 								<h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
 									<f:param name="addressbookId" value="#{addressbook.addressbookId}" />
@@ -43,7 +49,9 @@
 							</h:column>
 
 							<h:column>
-								<f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.ADDRESSBOOK_CREATED}" />
+								</f:facet>
 
 								<h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
 									<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
diff --git a/web/user/login_shared_addressbooks.xhtml b/web/user/login_shared_addressbooks.xhtml
index 94b3db87..455c3a9d 100644
--- a/web/user/login_shared_addressbooks.xhtml
+++ b/web/user/login_shared_addressbooks.xhtml
@@ -8,23 +8,27 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core">
 
 	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS}" />
 		</ui:define>
 
 		<ui:define name="content">
 			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
 				<div class="table">
 					<div class="table_header">
-						#{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS}
+						<h:outputText value="#{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS}" />
 					</div>
 
 					<div class="para">
 						<h:dataTable id="sharedAddressbooks" var="share" value="#{shareController.allShares()}" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks()}">
 							<h:column>
-								<f:facet name="header">#{msg.SHARED_ADDRESSBOOK}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.SHARED_ADDRESSBOOK}" />
+								</f:facet>
 
 								<h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
 									<f:param name="addressbookId" value="#{share.shareAddressbook.addressbookId}" />
@@ -33,14 +37,20 @@
 							</h:column>
 
 							<h:column>
-								<f:facet name="header">#{msg.SHAREE_USER_NAME}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.SHAREE_USER_NAME}" />
+								</f:facet>
+
 								<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
 									<ui:param name="user" value="#{share.setShareUserSharee(shareUserSharer)}" />
 								</ui:include>
 							</h:column>
 
 							<h:column>
-								<f:facet name="header">#{msg.SHARE_CREATED}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.SHARE_CREATED}" />
+								</f:facet>
+
 								<h:outputText id="shareCreated" value="#{share.shareCreated.time}" title="#{msg.SHARE_CREATED_TITLE}">
 									<f:convertDateTime for="shareCreated" type="both" timeStyle="short" dateStyle="medium" />
 								</h:outputText>
diff --git a/web/user/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml
index aebbdd02..0409b513 100644
--- a/web/user/login_start_sharing_addressbook.xhtml
+++ b/web/user/login_start_sharing_addressbook.xhtml
@@ -9,10 +9,12 @@
 	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
 
 	<ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}" />
 		</ui:define>
 
 		<ui:define name="content">
@@ -20,7 +22,7 @@
 				<div class="table_big">
 
 					<div class="table_header">
-						#{msg.TABLE_HEADER_CHOOSE_USER_FOR_SHARING}
+						<h:outputText value="#{msg.TABLE_HEADER_CHOOSE_USER_FOR_SHARING}" />
 					</div>
 
 					<div class="para">
@@ -29,19 +31,28 @@
 						<h:dataTable id="userList" headerClass="table_header_column" var="user" value="#{addressbookController.allUsersNotSharing()}" rendered="#{loginController.isUserLoggedIn() and not empty addressbookController.addressbook and not loginController.isInvisible()}">
 
 							<h:column>
-								<f:facet name="header">#{msg.USER_ID}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.USER_ID}" />
+								</f:facet>
+
 								<h:outputText value="#{user.userId}" />
 							</h:column>
 
 							<h:column>
-								<f:facet name="header">#{msg.USER_NAME}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.USER_NAME}" />
+								</f:facet>
+
 								<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
 									<ui:param name="user" value="#{user}" />
 								</ui:include>
 							</h:column>
 
 							<h:column>
-								<f:facet name="header">#{msg.LOGIN_START_SHARING_TITLE}</f:facet>
+								<f:facet name="header">
+									<h:outputText value="#{msg.LOGIN_START_SHARING_TITLE}" />
+								</f:facet>
+
 								<h:form acceptcharset="utf-8" id="startSharing" rendered="#{profileController.isProfileLinkVisibleByUser(user)}">
 									<h:commandButton class="submit" id="submit" value="#{msg.LOGIN_START_SHARING_BUTTON}" action="#{shareController.startSharing(user, addressbookController.addressbook)}" title="#{msg.LOGIN_START_SHARING_BUTTON_TITLE}" />
 								</h:form>
@@ -55,8 +66,8 @@
 
 					<div class="table_footer">
 						<ul>
-							<li>#{msg.LOGIN_START_SHARING_NOTICE1}</li>
-							<li>#{msg.LOGIN_START_SHARING_NOTICE2}</li>
+							<li><h:outputText value="#{msg.LOGIN_START_SHARING_NOTICE1}" /></li>
+							<li><h:outputText value="#{msg.LOGIN_START_SHARING_NOTICE2}" /></li>
 						</ul>
 					</div>
 				</div>
-- 
2.39.5