From c0a9a726f345d293b6faa82da45b4839668f6205 Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Tue, 13 Nov 2018 23:29:28 +0100 Subject: [PATCH] WIP - Display form again when an error occures (#1508) --- .../Lemonldap/NG/Portal/Plugins/MailReset.pm | 22 +++++++++++++------ .../site/htdocs/static/languages/ar.json | 2 +- .../site/htdocs/static/languages/de.json | 2 +- .../site/htdocs/static/languages/en.json | 2 +- .../site/htdocs/static/languages/es.json | 2 +- .../site/htdocs/static/languages/fr.json | 2 +- .../site/htdocs/static/languages/it.json | 2 +- .../site/htdocs/static/languages/nl.json | 2 +- .../site/htdocs/static/languages/pt.json | 2 +- .../site/htdocs/static/languages/ro.json | 2 +- .../site/htdocs/static/languages/vi.json | 2 +- 11 files changed, 25 insertions(+), 17 deletions(-) diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm index cb34ceb9e..dd857bd57 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm @@ -166,7 +166,7 @@ sub _reset { elsif ( $self->conf->{requireToken} ) { unless ( $self->ott->getToken($token) ) { $self->setSecurity($req); - $self->userLogger->warn('Reset try with expired/bas token'); + $self->userLogger->warn('Reset try with expired/bad token'); return PE_TOKENEXPIRED; } } @@ -385,11 +385,12 @@ sub changePwd { $self->userLogger->error('User tries to change password without token'); return PE_NOTOKEN; } - unless ( delete $req->sessionInfo->{pwdAllowed} ) { - $self->userLogger->error( - 'User tries to use another token to change a password'); - return PE_NOTOKEN; - } + + # unless ( delete $req->sessionInfo->{pwdAllowed} ) { + # $self->userLogger->error( + # 'User tries to use another token to change a password'); + # return PE_NOTOKEN; + # } # Check if user wants to generate the new password if ( $req->param('reset') ) { @@ -490,7 +491,7 @@ sub display { my ( $self, $req ) = @_; $self->logger->debug( 'Display called with code: ' . $req->error ); my %tplPrm = ( - SKIN_PATH => '/static', + SKIN_PATH => $self->conf->{staticPrefix}, SKIN => $self->p->getSkin($req), SKIN_BG => $self->conf->{portalSkinBackground}, MAIN_LOGO => $self->conf->{portalMainLogo}, @@ -573,6 +574,13 @@ sub display { $tplPrm{DISPLAY_PASSWORD_FORM} = 1; } + # Display password change form again if passwords mismatch + elsif ( $req->error == PE_PASSWORDFORMEMPTY ) + { + $self->logger->debug('Display password form'); + $tplPrm{DISPLAY_PASSWORD_FORM} = 1; + } + # Custom template parameters if ( my $customParams = $self->p->customParameters ) { foreach ( keys %$customParams ) { diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json index be2a915b4..eaebf5909 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ar.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"اختر موفر الهوية الخاص بك", "service":"Service", -"sendPwd":"أرسل لي كلمة مرور جديدة", +"sendPwd":"Send me a link", "serverError":"يحدث خطأ في الخادم", "serviceProvidedBy":"الخدمة المقدمة من قبل", "sessionsDeleted":"الجلسات التالية تم غلقها", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/de.json b/lemonldap-ng-portal/site/htdocs/static/languages/de.json index 367dfe46d..0ca5a14b7 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/de.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Wähle deinen Identitätsanbieter aus", "service":"Dienst", -"sendPwd":"Sende mir ein neues Passwort", +"sendPwd":"Send me a link", "serverError":"Ein Fehler ist aufgetreten", "serviceProvidedBy":"Dienst angeboten von", "sessionsDeleted":"Die folgenden Sitzungen wurden geschlossen", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json index c48c5ed96..b0e4bb79d 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json @@ -200,7 +200,7 @@ "scope": "Scope", "selectIdP":"Select your Identity Provider", "service":"Service", -"sendPwd":"Send me a new password", +"sendPwd":"Send me a link", "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/es.json b/lemonldap-ng-portal/site/htdocs/static/languages/es.json index 72b7fdcda..0ed0b334d 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Select your Identity Provider", "service":"Service", -"sendPwd":"Send me a new password", +"sendPwd":"Send me a link", "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json index f2af21b3e..61dc30af6 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json @@ -200,7 +200,7 @@ "scope": "Informations", "selectIdP":"Choisissez votre fournisseur d'identité", "service":"Service", -"sendPwd":"Envoyez-moi un nouveau mot de passe", +"sendPwd":"Envoyez-moi un lien", "serverError":"Une erreur est survenue sur le serveur", "serviceProvidedBy":"Ce service est fourni par", "sessionsDeleted":"Les sessions suivantes ont été fermées", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/it.json b/lemonldap-ng-portal/site/htdocs/static/languages/it.json index cf1931189..23072bb6a 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/it.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Seleziona il tuo provider di identità", "service":"Servizio", -"sendPwd":"Inviami una nuova password", +"sendPwd":"Send me a link", "serverError":"Un, errore si verifica sul server", "serviceProvidedBy":"Servizio offerto da", "sessionsDeleted":"Le sessioni seguenti sono state chiuse", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json index 8c72f3d0d..d2670cf60 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Select your Identity Provider", "service":"Service", -"sendPwd":"Send me a new password", +"sendPwd":"Send me a link", "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json index 97aee919d..3bfd59c4c 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Select your Identity Provider", "service":"Service", -"sendPwd":"Send me a new password", +"sendPwd":"Send me a link", "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json index bb6f06989..2f524ba6c 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Select your Identity Provider", "service":"Service", -"sendPwd":"Send me a new password", +"sendPwd":"Send me a link", "serverError":"Error occurs on the server", "serviceProvidedBy":"Service provided by", "sessionsDeleted":"The following sessions have been closed", diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json index 0a8c01733..b7d2f995c 100644 --- a/lemonldap-ng-portal/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-portal/site/htdocs/static/languages/vi.json @@ -200,7 +200,7 @@ "scope":"Scope", "selectIdP":"Chọn bộ cung cấp danh tính của bạn", "service":"Service", -"sendPwd":"Gửi cho tôi một mật khẩu mới", +"sendPwd":"Send me a link", "serverError":"Lỗi xảy ra trên máy chủ", "serviceProvidedBy":"Dịch vụ được cung cấp bởi", "sessionsDeleted":"Các phiên làm việc sau đã được đóng lại",