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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/monitor/monitor-cron.sh b/monitor/monitor-cron.sh
index 8596595bab75e61eceb4a3300b85cc46ff3ad162..d8449e726e04aeef54ee5a746300274ca01886cc 100755 (executable)
--- 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 bccd00b26d945c7f19e478c1e4c9efde3def1fa1..3c397ae58bedb666780c1096e07f364e930c580f 100644 (file)
--- 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 db76dc5cd8f1cf1de357513f07dba411da0d5d00..05e09b101a6762c665f5c21370a2de54b3cd7ae0 100644 (file)
--- 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>