From 4a3159a01730ad5424b686cad58b5b4be461d01c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 16 Oct 2017 11:37:39 -0300
Subject: [PATCH] Bug 13572: Rename option with "--not-expired"

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../maintenance/borrowers-force-messaging-defaults | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/misc/maintenance/borrowers-force-messaging-defaults b/misc/maintenance/borrowers-force-messaging-defaults
index 4c5ef9a2d5..d00597bfa2 100755
--- a/misc/maintenance/borrowers-force-messaging-defaults
+++ b/misc/maintenance/borrowers-force-messaging-defaults
@@ -39,7 +39,7 @@ sub usage {
 
 
 sub force_borrower_messaging_defaults {
-    my ($doit, $truncate, $since, $actives) = @_;
+    my ($doit, $truncate, $since, $not_expired) = @_;
 
     $since = '0000-00-00' if (!$since);
     print "Since: $since\n";
@@ -55,7 +55,7 @@ sub force_borrower_messaging_defaults {
     }
 
     my $sql = "SELECT borrowernumber, categorycode FROM borrowers WHERE dateenrolled >= ?";
-    if ($actives) {
+    if ($not_expired) {
         $sql .= " AND dateexpiry > NOW()"
     }
     my $sth = $dbh->prepare($sql);
@@ -72,18 +72,18 @@ sub force_borrower_messaging_defaults {
 }
 
 
-my ($doit, $truncate, $since, $help, $actives);
+my ($doit, $truncate, $since, $help, $not_expired);
 my $result = GetOptions(
     'doit'        => \$doit,
     'truncate'    => \$truncate,
     'since:s'     => \$since,
-    'actives'     => \$actives,
+    'not-expired' => \$not_expired,
     'help|h'      => \$help,
 );
 
 usage() if $help;
 
-force_borrower_messaging_defaults( $doit, $truncate, $since, $actives );
+force_borrower_messaging_defaults( $doit, $truncate, $since, $not_expired );
 
 =head1 NAME
 
@@ -95,7 +95,7 @@ force-borrower-messaging-defaults
   force-borrower-messaging-defaults --help
   force-borrower-messaging-defaults --doit
   force-borrower-messaging-defaults --doit --truncate
-  force-borrower-messaging-defaults --doit --actives
+  force-borrower-messaging-defaults --doit --not-expired
 
 =head1 DESCRIPTION
 
@@ -123,7 +123,7 @@ Actually update the borrowers.
 Truncate all borrowers transport preferences before (re-)creating them. It
 affects borrower_message_preferences table.
 
-=item B<--actives>
+=item B<--not-expired>
 
 Will only update active borrowers (borrowers who didn't pass their expiration date).
 
-- 
2.20.1