Bug 27342: Remove dbh from C4::Auth

[srvgit] / opac / opac-password-recovery.pl

diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl
index b6c5592..a5c2058 100755 (executable)
--- a/opac/opac-password-recovery.pl
+++ b/opac/opac-password-recovery.pl
@@ -3,17 +3,21 @@
 use Modern::Perl;
 use CGI;
 
-use C4::Auth;
-use C4::Koha;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
-use Koha::Patron::Password::Recovery
-  qw(SendPasswordRecoveryEmail ValidateBorrowernumber GetValidLinkInfo CompletePasswordRecovery DeleteExpiredPasswordRecovery);
+use Koha::Patron::Password::Recovery qw(
+    CompletePasswordRecovery
+    DeleteExpiredPasswordRecovery
+    GetValidLinkInfo
+    SendPasswordRecoveryEmail
+    ValidateBorrowernumber
+);
 use Koha::Patrons;
 my $query = CGI->new;
 use HTML::Entities;
-use Try::Tiny;
-use List::Util qw/any/;
+use Try::Tiny qw( catch try );
+use List::Util qw( any );
 
 my ( $template, $dummy, $cookie ) = get_template_and_user(
     {
@@ -207,8 +211,8 @@ elsif ($uniqueKey) {    #reset password form
         username        => $username,
         errLinkNotValid => $errLinkNotValid,
         hasError        => ( $errLinkNotValid ? 1 : 0 ),
-        minPasswordLength => $borrower->category->effective_min_password_length,
-        RequireStrongPassword => $borrower->category->effective_require_strong_password
+        minPasswordLength => $borrower ? $borrower->category->effective_min_password_length : undef,
+        RequireStrongPassword => $borrower ? $borrower->category->effective_require_strong_password : undef,
     );
 }
 else {    #password recovery form (to send email)