more re-arranging prior to release

[koha.git] / tools / cleanborrowers.pl

diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index c67f756..365767a 100755 (executable)
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -17,7 +17,6 @@
 #
 #   Written by Antoine Farnault antoine@koha-fr.org on Nov. 2006.
 
-# $Id$
 
 =head1 cleanborrowers.pl
 
@@ -37,9 +36,8 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-
-
-use C4::Members;               # GetBorrowersWhoHavexxxBorrowed.
+use C4::Dates qw/format_date format_date_in_iso/;
+use C4::Members;        # GetBorrowersWhoHavexxxBorrowed.
 use C4::Circulation;    # AnonymiseIssueHistory.
 use Date::Calc qw/Date_to_Days Today/;
 
@@ -66,20 +64,18 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 if ( $params->{'step2'} ) {
-    $filterdate1 = $params->{'filterdate1'};
-    $filterdate2 = $params->{'filterdate2'};
+    $filterdate1 = format_date_in_iso($params->{'filterdate1'});
+    $filterdate2 = format_date_in_iso($params->{'filterdate2'});
     my $checkbox = $params->{'checkbox'};
 
     my $totalDel;
     if ($checkbox eq "borrower") {
-        $filterdate1 = $params->{'filterdate1'};
         my $membersToDelete = GetBorrowersWhoHaveNotBorrowedSince($filterdate1);
         $totalDel = scalar @$membersToDelete;
     }
 
     my $totalAno;
     if ($checkbox eq "issue") {
-        $filterdate2 = $params->{'filterdate2'};
         my $membersToAnonymize =
           GetBorrowersWithIssuesHistoryOlderThan($filterdate2);
         $totalAno = scalar @$membersToAnonymize;
@@ -89,8 +85,8 @@ if ( $params->{'step2'} ) {
         step2            => 1,
         totalToDelete    => $totalDel,
         totalToAnonymize => $totalAno,
-        filterdate1      => $filterdate1,
-        filterdate2      => $filterdate2
+        filterdate1      => format_date($filterdate1),
+        filterdate2      => format_date($filterdate2),
     );
 
     #writing the template
@@ -99,8 +95,8 @@ if ( $params->{'step2'} ) {
 }
 
 if ( $params->{'step3'} ) {
-    $filterdate1 = $params->{'filterdate1'};
-    $filterdate2 = $params->{'filterdate2'};
+    $filterdate1 = format_date_in_iso($params->{'filterdate1'});
+    $filterdate2 = format_date_in_iso($params->{'filterdate2'});
     my $do_delete = $params->{'do_delete'};
     my $do_anonym = $params->{'do_anonym'};
 
@@ -153,13 +149,14 @@ if ( $params->{'step3'} ) {
 my ( $year, $month, $day ) = &Today();
 my $tmpyear  = $year - 1;
 my $tmpmonth = $month - 3;
-$filterdate1 = $tmpyear . "-" . $month . "-" . $day;
-$filterdate2 = $year . "-" . $tmpmonth . "-" . $day;
+$filterdate1 = format_date($tmpyear . "-" . $month . "-" . $day);
+$filterdate2 = format_date($year . "-" . $tmpmonth . "-" . $day);
 
 $template->param(
     step1       => '1',
     filterdate1 => $filterdate1,
-    filterdate2 => $filterdate2
+    filterdate2 => $filterdate2,
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
 
 #writing the template