(bug #3667) fix borrowers cleanup

[koha.git] / tools / cleanborrowers.pl

diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index ad6f2a8..1a6c9bc 100755 (executable)
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -59,25 +59,25 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { tools => 1, catalogue => 1 },
+        flagsrequired   => { tools => 'delete_anonymize_patrons', catalogue => 1 },
     }
 );
 
 if ( $params->{'step2'} ) {
     $filterdate1 = format_date_in_iso($params->{'filterdate1'});
     $filterdate2 = format_date_in_iso($params->{'filterdate2'});
-    my $checkbox = $params->{'checkbox'};
+    my %checkboxes = map { $_ => 1 } split /\0/, $params->{'checkbox'};
 
     my $totalDel;
     my $membersToDelete;
-    if ($checkbox eq "borrower") {
-        $membersToDelete = GetBorrowersWhoHaveNotBorrowedSince($filterdate1);
+    if ($checkboxes{borrower}) {
+        $membersToDelete = GetBorrowersWhoHaveNotBorrowedSince($filterdate1, 1);
         $totalDel = scalar @$membersToDelete;
             
     }
     my $totalAno;
     my $membersToAnonymize;
-    if ($checkbox eq "issue") {
+    if ($checkboxes{issue}) {
         $membersToAnonymize =
           GetBorrowersWithIssuesHistoryOlderThan($filterdate2);
         $totalAno = scalar @$membersToAnonymize;
@@ -109,7 +109,7 @@ if ( $params->{'step3'} ) {
     
     # delete members
     if ($do_delete) {
-        my $membersToDelete = GetBorrowersWhoHaveNotBorrowedSince($filterdate1);
+        my $membersToDelete = GetBorrowersWhoHaveNotBorrowedSince($filterdate1, 1);
         $totalDel = scalar(@$membersToDelete);
         $radio    = $params->{'radio'};
         if ( $radio eq 'trash' ) {