From 1bcbe7e38a11d62d7ac22fc87b70aae0e9d8f3e5 Mon Sep 17 00:00:00 2001 From: Jacob O'Mara Date: Thu, 10 Apr 2025 12:31:18 +0100 Subject: [PATCH] Bug 40824: Show error for password history clash in memberpassword.tt --- .../intranet-tmpl/prog/en/modules/members/member-password.tt | 3 +++ members/member-password.pl | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt index 83b5a20fbe9..70668ee9146 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -72,6 +72,9 @@ [% IF ( ERROR_from_plugin ) %]
  • The password was rejected by a plugin.
  • [% END %] + [% IF ( ERROR_password_used_before ) %] +
  • This password has been used before. You cannot reuse any of your last [% password_history_count | html %] passwords.
  • + [% END %] [% IF ( NOPERMISSION ) %]
  • You do not have permission to edit this patron's login information.
  • [% END %] diff --git a/members/member-password.pl b/members/member-password.pl index bb319683b8e..67406b2356b 100755 --- a/members/member-password.pl +++ b/members/member-password.pl @@ -81,6 +81,10 @@ if ( $op eq 'cud-update' && defined($newpassword) and not @errors ) { push @errors, 'ERROR_password_too_weak'; } elsif ( $_->isa('Koha::Exceptions::Password::Plugin') ) { push @errors, 'ERROR_from_plugin'; + } elsif ( $_->isa('Koha::Exceptions::Password::UsedBefore') ) { + my $count = C4::Context->preference('PasswordHistoryCount') || 0; + push @errors, 'ERROR_password_used_before'; + $template->param( 'password_history_count' => $count ); } else { push( @errors, 'BADUSERID' ); } -- 2.39.5