From: Roland Häder Date: Mon, 1 Aug 2016 15:57:56 +0000 (+0200) Subject: Continued a bit: (please cherry-pick) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a99af06587fc77ff19135dcf480a3484ba93f1a2;p=jjobs-war.git Continued a bit: (please cherry-pick) - basicly added (unfinished) setting flag "user must change password" Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index 13841f66..31a76019 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java @@ -189,8 +189,8 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J } @Override - public boolean isGuest () { - return (!this.isUserLoggedIn()); + public boolean ifUserMustChangePassword () { + return (this.isUserLoggedIn() && this.getLoggedInUser().getUserMustChangePassword()); } @Override @@ -215,7 +215,6 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J // Trace message // NOISY-DEBUG System.out.println(MessageFormat.format("JobsUserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); - // Return it return this.userLoggedIn; } diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java index a1734909..5c21a223 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java @@ -69,11 +69,11 @@ public interface JobsUserLoginWebSessionController extends Serializable { boolean isUserLoggedIn (); /** - * Is this truly a guest? + * Checks whether the user needs to change password *

- * @return Whether the user is truly a guest + * @return Whether the user needs to change password */ - boolean isGuest (); + boolean ifUserMustChangePassword (); /** * Whether the currently logged-in user is invisible @@ -97,8 +97,8 @@ public interface JobsUserLoginWebSessionController extends Serializable { String getCurrentPassword (); /** - * Checks whether the (previously entered) current password matches with from - * the user instance. + * Checks whether the (previously entered) current password matches with + * from the user instance. *

* @return If current password matches */ diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index ae6f6ca4..0917b12e 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -101,6 +101,11 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J @Inject private JobsUserWebSessionController userController; + /** + * Flag whether user must change password after login + */ + private Boolean userMustChangePassword; + /** * User name */ @@ -366,6 +371,16 @@ public class JobsAdminUserWebRequestBean extends BaseJobsController implements J this.userName = userName; } + @Override + public Boolean getUserMustChangePassword () { + return this.userMustChangePassword; + } + + @Override + public void setUserMustChangePassword (final Boolean userMustChangePassword) { + this.userMustChangePassword = userMustChangePassword; + } + @Override public String getUserPassword () { return this.userPassword; diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java index a968ae85..3b3195d9 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestController.java @@ -91,4 +91,18 @@ public interface JobsAdminUserWebRequestController extends Serializable { */ void setUserPasswordRepeat (final String userPasswordRepeat); + /** + * Getter for flag if user needs to change password + *

+ * @return Flag if user needs to change password + */ + Boolean getUserMustChangePassword (); + + /** + * Setter for flag if user needs to change password + *

+ * @param userMustChangePassword Flag if user needs to change password + */ + void setUserMustChangePassword (final Boolean userMustChangePassword); + } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index f6067e39..98c0f14f 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -561,3 +561,24 @@ GUEST_USER_RESEND_LINK_COMPLETED=Es ist ein neuer Best\u00e4tigungslink an Ihre GUEST_USER_NO_ACCOUNT_YET_QUESTION=Noch kein Benutzerkonto? LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Als Benutzer anmelden LINK_GUEST_USER_NO_ACCOUNT_YET=Einfach hier anmelden. +ERROR_GUEST_REGISTRATION_DISABLED=Fehler: Die Anmeldung ist administrativ deaktiviert worden. +ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Fehler: Editieren von Benutzerdaten wurde administrativ deaktiviert. +LINK_USER_LOGOUT=Ausloggen +LINK_USER_LOGOUT_TITLE=Aus dem Mitgliedsbereich ausloggen. +ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Fehler: Erneutes Aussenden des Best\u00e4tigungslink wurde administrativ deaktiviert. +PAGE_TITLE_LOGIN_USER_LOGOUT=Ausloggen aus dem Benutzerbereich +CONTENT_TITLE_LOGIN_USER_LOGOUT=Aus dem Benutzerbereich ausloggen: +LOGIN_USER_LOGOUT_TITLE=Aus Benutzerbereich ausloggen? +LOGIN_USER_LOGOUT_NOTICE=M\u00f6chten Sie sich aus dem Benutzerbereich ausloggen? Dies sollten Sie immer an einem Rechner tun, den auch andere nutzen (z.B. Internetcafe). +BUTTON_USER_LOGOUT=Ausloggen +ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung: +ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung: +PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Anhang: +ERROR_PARAMETER_FILE_TYPE_NOT_SET=Fehler: Parameter 'fileType' nicht gesetzt. +ADMIN_COUNTRY_PHONE_CODE_REQUIRED=Bitte geben Sie die Vorwahl dieses Landes ein (z.B. 49 f\u00fcr Deutschland). +ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Gespr\u00e4che ausserhalb des Ortes ein (meistens 0). +ADMIN_COUNTRY_I18N_KEY_REQUIRED=Bitte geben Sie den Schl\u00fcssel f\u00fcr das Sprachpaket ein (z.B. COUNTRY_GERMANY f\u00fcr Deutschland). +ADMIN_COUNTRY_CODE_REQUIRED=Bitte geben Sie den L\u00e4ndercode ein (z.B. DE f\u00fcr Deutschland). +ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Auslandsgespr\u00e4che ein (z.B. + oder 00). +ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl ohne f\u00fchrende Null f\u00fcr den Mobilfunkanbieter ein (z.B. 177 f\u00fcr E+). +USER_LOGIN_MUST_CHANGE_PASSWORD=Sie m\u00fcssen Ihr Passwort \u00e4ndern. Dies darf nicht mit dem aktuellen \u00fcbereinstimmen. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index b0088281..131c6310 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -513,7 +513,6 @@ ADMIN_CONTACT_FAX_NUMBER=Fax number: PAGE_TITLE_ADMIN_EXPORT_CONTACT=Export contact data CONTENT_TITLE_ADMIN_EXPORT_CONTACT=Export contact data: ADMIN_EXPORT_CONTACTS_TITLE=Start data export -#Bei sehr gro\u00dfen Datenmengen kann es eventuell zu Zeit\u00fcberschreitungen kommen. Daher sollten Sie besser seitenweise exportieren. ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING=Big data amount may lead to timeouts. You should then try to export each page separately. BUTTON_ADMIN_EXPORT_CONTACTS_CSV=Export all data as CSV file BUTTON_ADMIN_EXPORT_CONTACTS_XLS=Export all data as Excel file @@ -562,3 +561,24 @@ GUEST_USER_RESEND_LINK_COMPLETED=A new confirmation link has been sent out to yo GUEST_USER_NO_ACCOUNT_YET_QUESTION=Not yet registered as user? LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Register as a user LINK_GUEST_USER_NO_ACCOUNT_YET=Signup here quickly. +ERROR_GUEST_REGISTRATION_DISABLED=Error: Registration has been administratively deactivated. +ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Error: Editing of user data has been disabled by administrators. +LINK_USER_LOGOUT=Logout +LINK_USER_LOGOUT_TITLE=Logout from user area. +ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Error: Sending out confirmation link has been deactivated. +PAGE_TITLE_LOGIN_USER_LOGOUT=Logout from user area +CONTENT_TITLE_LOGIN_USER_LOGOUT=Logout from user area: +LOGIN_USER_LOGOUT_TITLE=Logout from user area? +LOGIN_USER_LOGOUT_NOTICE=Do you want to logout from user area? You should always do this when you share the same computer with others (e.g. Internet cafe). +BUTTON_USER_LOGOUT=Logout +ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=House number extension: +ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=House number extension: +PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Extension: +ERROR_PARAMETER_FILE_TYPE_NOT_SET=Error: Parameter 'fileType' is not set. +ADMIN_COUNTRY_PHONE_CODE_REQUIRED=Please enter dial prefix for this country (e.g. 1 for U.S.A.). +ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Please enter dial prefix for calls outside the current city. +ADMIN_COUNTRY_I18N_KEY_REQUIRED=Please enter the key for the language package (e.g. COUNTRY_USA for U.S.A.). +ADMIN_COUNTRY_CODE_REQUIRED=Please enter country code (e.g. US for U.S.A.). +ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Please enter dial prefix for abroad calls (e.g. + or 00). +ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Please enter dial prefix for mobile provider. +USER_LOGIN_MUST_CHANGE_PASSWORD=Please change your password. It must not match with your current one. diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl index 511af3b0..e8b209de 100644 --- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl +++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl @@ -52,6 +52,18 @@

+
+
+ +
+ +
+ +
+ +
+
+
  • diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml index c8d47e9d..3fb7ca98 100644 --- a/web/user/login_change_email_address.xhtml +++ b/web/user/login_change_email_address.xhtml @@ -15,7 +15,7 @@ - +
    @@ -54,6 +54,12 @@
    + + + + + + diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml index b184daae..fb3781ac 100644 --- a/web/user/login_change_personal_data.xhtml +++ b/web/user/login_change_personal_data.xhtml @@ -2,10 +2,10 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > #{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA} @@ -15,10 +15,10 @@ - +
    - #{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE} +
    @@ -34,6 +34,15 @@
    + <<<<<<< HEAD + ======= +     + + + + + + >>>>>>> be1ec6b... Continued a bit: (please cherry-pick) diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml index 262f86ef..bc8b42e9 100644 --- a/web/user/login_contact_data_saved.xhtml +++ b/web/user/login_contact_data_saved.xhtml @@ -2,10 +2,10 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > #{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED} @@ -15,12 +15,16 @@     - + + + + + diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml index 0d6c0fc1..1270ebf0 100644 --- a/web/user/login_edit_user_data.xhtml +++ b/web/user/login_edit_user_data.xhtml @@ -2,10 +2,10 @@ + xmlns:ui="http://xmlns.jcp.org/jsf/facelets" + xmlns:h="http://xmlns.jcp.org/jsf/html" + xmlns:f="http://xmlns.jcp.org/jsf/core" + > #{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA} @@ -15,7 +15,7 @@ - +
    @@ -27,15 +27,23 @@
      -
    • - -
      • -
    • - -
      • -
    • - -
      • + +
    • + +
      • +       + + +
    • + +
      • +       + + +
    • + +
      • +
    diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml index 8954954a..c9f81237 100644 --- a/web/user/login_index.xhtml +++ b/web/user/login_index.xhtml @@ -15,10 +15,14 @@ - + Here goes your content. + + + + diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml index 91fcd108..b6e46385 100644 --- a/web/user/login_user_data_saved.xhtml +++ b/web/user/login_user_data_saved.xhtml @@ -15,12 +15,16 @@ - + + + + +