From 5f90b83d8443db3c7b89da15d16e0504ebbc06e1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 24 Mar 2018 23:16:11 +0100
Subject: [PATCH] Please cherry-pick: - used on validator:emailAddressValidator
 as this allows empty values being   ignored - p:growl's autoUpdate and any
 other is deprecated, better use p:autoUpdate   instead (new PrimeFaces 6.2
 deprecation fixed) - used $() instead of `` for monitoring script
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 monitor/monitor-cron.sh               |  4 ++--
 web/WEB-INF/templates/base.tpl        |  4 +++-
 web/guest/user/user_resend_link.xhtml | 18 ++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/monitor/monitor-cron.sh b/monitor/monitor-cron.sh
index 8596595b..d8449e72 100755
--- a/monitor/monitor-cron.sh
+++ b/monitor/monitor-cron.sh
@@ -12,7 +12,7 @@ CONFIG_FILE="${HOME}/.monitor-${PROJECT_NAME}-cron.sh"
 
 . "${CONFIG_FILE}"  || exit 255
 
-MONITOR_OUTPUT=`lynx -dump -head "${PROJECT_URL}" -auth="${PROJECT_USER}:${PROJECT_PASSWORD}" | head -n 1`
+MONITOR_OUTPUT=$(lynx -dump -head "${PROJECT_URL}" -auth="${PROJECT_USER}:${PROJECT_PASSWORD}" | head -n 1)
 
 if [ "${MONITOR_OUTPUT}" != "HTTP/1.1 200 OK" ]
 then
@@ -24,7 +24,7 @@ then
 	fi
 elif [ -f "${MONITOR_TEMP_FILE}" ]
 then
-	PREVIOUS_STATUS=`cat "${MONITOR_TEMP_FILE}"`
+	PREVIOUS_STATUS=$(cat "${MONITOR_TEMP_FILE}")
 	echo "$0: ${PROJECT_NAME} is UP again, old status was: '${PREVIOUS_STATUS}'"
 	rm -f "${MONITOR_TEMP_FILE}"
 fi
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index bccd00b2..3c397ae5 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -80,7 +80,9 @@
 					</h:panelGroup>
 
 					<h:panelGroup styleClass="error-container" layout="block">
-						<p:growl autoUpdate="true" showDetail="true" sticky="true" />
+						<p:growl showDetail="true" sticky="true">
+							<p:autoUpdate />
+						</p:growl>
 
 						<p:ajaxExceptionHandler
 							type="javax.faces.application.ViewExpiredException"
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index db76dc5c..05e09b10 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl"
-				xmlns="http://www.w3.org/1999/xhtml"
-				xmlns:core="http://mxchange.org/jsf/core/widgets"
-				xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-				xmlns:h="http://xmlns.jcp.org/jsf/html"
-				xmlns:f="http://xmlns.jcp.org/jsf/core"
-				xmlns:p="http://primefaces.org/ui">
+<ui:composition
+	template="/WEB-INF/templates/guest/guest_base.tpl"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:core="http://mxchange.org/jsf/core/widgets"
+	xmlns:validator="http://mxchange.org/jsf/core/validators"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:p="http://primefaces.org/ui">
 
 	<ui:define name="document_guest_title">
 		<h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
@@ -36,7 +38,7 @@
 
 						<div class="table-right">
 							<p:inputText id="emailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
-								<f:validator validatorId="EmailAddressValidator" />
+								<validator:emailAddressValidator />
 							</p:inputText>
 						</div>
 					</h:panelGroup>
-- 
2.39.5