renamed --list_expired as --expired

bin/account-manager.pl.in

@@ -33,7 +33,7 @@ GetOptions(
     'delete',
     'displayname=s',
     'email_address=s',
-    'filter_expired',
+    'expired',
     'sp_entityid=s',
     'token=s',
 ) or pod2usage(
@@ -125,7 +125,7 @@ sub list_accounts {
         push @{ $args{query} }, profile => $options{profile};
     }
 
-    if ($options{filter_expired}) {
+    if ($options{expired}) {
         push @{ $args{query} }, expiration_date => { lt => DateTime->now() };
     }
 
@@ -253,7 +253,7 @@ sub list_tokens {
     if ($options{token}) {
         push @{ $args{query} }, token => $options{token};
     }
-    if ($options{filter_expired}) {
+    if ($options{expired}) {
         push @{ $args{query} }, creation_date =>
           { lt => time - ($configuration->{_}->{tokens_validity_period} * 3600) };
     }
@@ -354,8 +354,7 @@ S<B<--sp_entityid> I<string>>
 B<account-manager.pl> B<list_accounts>
 S<[B<--profile> I<string>]>
 S<[B<--sp_entityid> I<string>]>
-[B<--filter_expired>]
-[B<--delete>]
+[B<--expired>] [B<--delete>]
 
 B<account-manager.pl> B<parse_metadata>
 S<[B<--sp_entityid> I<string>]>
@@ -371,8 +370,7 @@ B<account-manager.pl> B<list_services>
 B<account-manager.pl> B<list_tokens>
 S<B<--sp_entityid> I<string>>
 S<[B<--token> I<string>]>
-[B<--filter_expired>]
-[B<--delete>]
+[B<--expired>] [B<--delete>]
 
 B<account-manager.pl> B<get_token>
 S<B<--sp_entityid> I<string>>
@@ -402,12 +400,11 @@ Adds a new test account.
 
 List all test accounts. Criterias can be added to filter test accounts.
 
-    $> account-manager.pl list_accounts --filter_expired
+    $> account-manager.pl list_accounts --expired
 
 List all expired test accounts.
 
-    $> account-manager.pl list_accounts --filter_expired \
-    --delete
+    $> account-manager.pl list_accounts --expired --delete
 
 Remove all expired test accounts from DB.
 
@@ -422,23 +419,19 @@ C<federation_metadata_file> configuration parameter.
 
 List all authentication tokens. Criterias can be added to filter tokens.
 
-    $> account-manager.pl list_tokens \
-    --filter_expired
+    $> account-manager.pl list_tokens --expired
 
 List all expired authentication tokens.
 
-    $> account-manager.pl list_tokens \
-    --filter_expired --delete
+    $> account-manager.pl list_tokens --expired --delete
 
 Remove all expired authentication tokens from DB.
 
-    $> account-manager.pl get_token \
-    --token dhj67sjJ
+    $> account-manager.pl get_token --token dhj67sjJ
 
 Get informations on a token.
 
-    $> account-manager.pl add_token \
-    --email_address john@my.fqdn \
+    $> account-manager.pl add_token --email_address john@my.fqdn \
     --sp_entityid https://test.federation.renater.fr/test/ressource
 
 Adds a new test account.