From: Roland Haeder <roland@mxchange.org>
Date: Thu, 8 Sep 2016 20:52:05 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10fd71b6226bbeeb00642f418e10d69106f73db9;p=addressbook-war.git

Please cherry-pick:
- fixed tzpo ...

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

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 536cec40..1cec71b5 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -92,6 +92,30 @@
         <param-name>max_user_password_history</param-name>
         <param-value>5</param-value>
     </context-param>
+    <context-param>
+        <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether debugging of registration form is enabled.</description>
+        <param-name>is_debug_register_enabled</param-name>
+        <param-value>false</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether users can change their email address.</description>
+        <param-name>is_feature_user_must_change_email_address_enabled</param-name>
+        <param-value>true</param-value>
+    </context-param>
+    <context-param>
+        <description>Minimum password score (default 50 may be to low)</description>
+        <param-name>min_user_password_score</param-name>
+        <param-value>50</param-value>
+    </context-param>
+    <context-param>
+        <description>Whether user registration page is in index or own page.</description>
+        <param-name>is_feature_user_registration_in_index_enabled</param-name>
+        <param-value>false</param-value>
+    </context-param>
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 17c6ad47..1cd54666 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -53,5 +53,12 @@
 				</ui:include>
 			</ui:fragment>
 		</ui:define>
+
+		<ui:define name="content" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+		</ui:define>
 	</ui:composition>
 </html>