Bug 23816: (follow-up) Fix many things

[srvgit] / misc / admin / set_password.pl

diff --git a/misc/admin/set_password.pl b/misc/admin/set_password.pl
index feec8f3..0915143 100755 (executable)
--- a/misc/admin/set_password.pl
+++ b/misc/admin/set_password.pl
@@ -44,6 +44,11 @@ unless ( $userid or $patron_id or $cardnumber ) {
     pod2usage("cardnumber is mandatory")   unless $cardnumber;
 }
 
+unless ($password) {
+    my $generator  = String::Random->new( rand_gen => \&alt_rand );
+    $password      = $generator->randregex('[A-Za-z][A-Za-z0-9_]{6}.[A-Za-z][A-Za-z0-9_]{6}\d');
+}
+
 my $filter;
 
 if ( $userid ) {
@@ -65,14 +70,6 @@ unless ( $patrons->count > 0 ) {
 }
 
 my $patron = $patrons->next;
-
-unless ($password) {
-    my $generator  = String::Random->new( rand_gen => \&alt_rand );
-    my $n = $patron->category->effective_min_password_length;
-    $n = $n<6?6:$n;
-    $password      = $generator->randregex('[A-Za-z][A-Za-z0-9_]{6}.[A-Za-z][A-Za-z0-9_]{'.$n.'}\d');
-}
-
 $patron->set_password({ password => $password, skip_validation => 1 });
 
 print $patron->userid . " " . $password . "\n";