Rewrites: (please cherry-pick also)

- rewrote templateType to baseTemplatePathName which allows more "complex" paths than just simple
- imprint, terms and privacy can now make usage of that new variable and don't need to be shown in new browser window

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

diff --git a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
index 8a6b8e195058df08c3fba77f3a95e22c1d1940ca..ef7f22a22044aadb293bea154ceb9a97fa06f651 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
@@ -20,6 +20,7 @@ import java.util.Objects;
 import javax.enterprise.context.SessionScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
+import javax.faces.context.FacesContext;
 import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -130,6 +131,9 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
 
                        // Try to lookup
                        this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/addressbook-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
+
+                       // Defaul template is guest
+                       this.baseTemplatePathName = GUEST_BASE_TEMPLATE_NAME;
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);
@@ -137,7 +141,25 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
        }
 
        @Override
-       public String doLogin () {
+       public String doAdminLogout () {
+               // Is a user logged-in?
+               if (this.isUserLoggedIn()) {
+                       // Call other logout
+                       return this.doUserLogout();
+               }
+
+               // Invalidate session
+               FacesContext.getCurrentInstance().getExternalContext().invalidateSession();
+
+               // Set template type to guest
+               this.setBaseTemplatePathName(GUEST_BASE_TEMPLATE_NAME); //NOI18N
+
+               // Redirect to index
+               return "index?faces-redirect=true"; //NOI18N
+       }
+
+       @Override
+       public String doUserLogin () {
                // Get user instance
                User user = this.userController.createUserLogin();
 
@@ -152,7 +174,7 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
                        this.setLoggedInUser(confirmedUser);
 
                        // Set template to "login"
-                       this.setTemplateType("login"); //NOI18N
+                       this.setBaseTemplatePathName(USER_BASE_TEMPLATE_NAME); //NOI18N
 
                        // Fire event away. Keep this last before return statement.
                        this.userLoginEvent.fire(new UserLoginEvent(confirmedUser));
@@ -168,11 +190,6 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
                }
        }
 
-       @Override
-       public String getBaseTemplatePathName () {
-               return this.baseTemplatePathName;
-       }
-
        @Override
        public void setBaseTemplatePathName (final String baseTemplatePathName) {
                this.baseTemplatePathName = baseTemplatePathName;
@@ -198,6 +215,11 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
                this.loggedInUser = loggedInUser;
        }
 
+       @Override
+       public String getBaseTemplatePathName () {
+               return this.baseTemplatePathName;
+       }
+
        @Override
        public boolean ifCurrentPasswordMatches () {
                // The current password must be set and not empty
@@ -235,15 +257,8 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
 
        @Override
        public boolean isUserLoggedIn () {
-               // Trace message
-               // NOISY: System.out.println(MessageFormat.format("AddressbookUserLoginWebSessionBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType()));
-
-               // Compare instance
                this.userLoggedIn = ((this.getLoggedInUser() instanceof User) && (Objects.equals(this.getLoggedInUser().getUserAccountStatus(), UserAccountStatus.CONFIRMED)));
 
-               // Trace message
-               // NOISY: System.out.println(MessageFormat.format("AddressbookUserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn));
-
                // Return it
                return this.userLoggedIn;
        }

diff --git a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java
index 63d2aa832520ef30755771d399016270052c3c25..f5ee4f8bf3d567c4e033f6a2810aa6a66267fae9 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java
@@ -31,14 +31,14 @@ public interface AddressbookUserLoginWebSessionController extends Serializable {
         * <p>
         * @return Template type
         */
-       String getTemplateType ();
+       String getBaseTemplatePathName ();
 
        /**
         * Setter for template type
         * <p>
-        * @param templateType Template type
+        * @param baseTemplatePathName Template type
         */
-       void setTemplateType (final String templateType);
+       void setBaseTemplatePathName (final String baseTemplatePathName);
 
        /**
         * Logout for administrator area. If a logged-in user instance exists, it is

diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
index ff917af4bb0c9540ca73ef594c49f75dc8a51882..51239492a0a25348ec5ff2638e1a3a80f3958fdc 100644 (file)
--- a/web/WEB-INF/templates.dist/guest_login_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -7,7 +7,7 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index bafe6e1bcdd62a1a5da388250ba88e3e8a9693e8..73d6d5e72cecdec96ba2a420f18a05b69068316b 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -10,17 +10,23 @@
                                <h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
                        </li>
 
-                       <li class="footer_link">
-                               <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
-                       </li>
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
+                               <li class="footer_link">
+                                       <h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
+                               </li>
+                       </ui:fragment>
 
-                       <li class="footer_link">
-                               <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
-                       </li>
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
+                               <li class="footer_link">
+                                       <h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
+                               </li>
+                       </ui:fragment>
 
-                       <li class="footer_link">
-                               <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
-                       </li>
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
+                               <li class="footer_link">
+                                       <h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
+                               </li>
+                       </ui:fragment>
 
                        <li class="footer_copyright">Copyright (c) 2016 by Roland Häder</li>
                </ul>

diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 6c98bdc751ae1eac4a729bd33afc4b510fae8f3a..618584e0c8fd653b9561ad8d82f29587ada8551d 100644 (file)
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -6,7 +6,7 @@
          xmlns:h="http://xmlns.jcp.org/jsf/html"
          xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-       <ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 059a23d9cb5279c2285d2e2e4fde6100f3d6c7ee..280d0c9c52f88906abb2ecf3a1dc822316252f0c 100644 (file)
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -13,8 +13,8 @@
                </f:viewParam>
        </f:metadata>
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}</ui:define>
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index b4961606d2f8212b3a7de40216d2828064e96ae5..f3f6ca38156f64b4b9eaea71444aaaa6ac780a5e 100644 (file)
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -7,7 +7,7 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 1f16751970540926a819cc2c95be12c581c7d819..805f59849a44d7fa5a2e03719611e0924e9d7c1f 100644 (file)
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -7,7 +7,7 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
 
                <ui:define name="content_header">

diff --git a/web/terms.xhtml b/web/terms.xhtml
index e77faed4a3c772bfff2d2340eb016a0322987d14..2b34613f1b81016980bf5ad150c065ee12db037f 100644 (file)
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -7,7 +7,7 @@
        xmlns:f="http://xmlns.jcp.org/jsf/core"
        >
 
-       <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+       <ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
                <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
 
                <ui:define name="content_header">