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 536cec40729df8b4a7ed46d1b33f9543ad83c724..1cec71b5cc88609300947723a023a60767c4c96c 100644 (file)
--- 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 17c6ad479d36ca6cda9e01e326af687162fc3ef9..1cd546662b2e1fc6a10e5bc85aa7ddca996ea20a 100644 (file)
--- 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>