Changeset 417

Timestamp:

09/03/09 17:31:29 (15 years ago)

Author:

nanardon

Message:

• add testing options to la-warn-expire

Location:

LATMOS-Accounts

Files:

• bin/la-warn-expire (modified) (3 diffs)
• lib/LATMOS/Accounts/Maintenance.pm (modified) (3 diffs)

LATMOS-Accounts/bin/la-warn-expire

@@ -22 +22 @@
     'm|mail'     => \my $mail,
     'help'       => sub { pod2usage(0) },
+    'users|u=s'    => \my @users,
+    'to=s'       => \my $to,
 ) or pod2usage();
 
@@ -32 +34 @@
 Use this cofngiuration file instead the default one
 
-=item -b|--base basename
+=item -m|mail
 
-Query this specific base instead default.
+Send a mail to user concerned by the futur expiration of their account
 
-=item -o|object object_type
+=item u|user USER
 
-Query should be performed on this objects. Default is to user 'User' object.
+Send email only to this user(s) if their account will expire. Usefull for
+testing and not sending hundred of mail.
 
-=item -e|--empty
+Multiple users can be specified by using -u several times
 
-Include also unset attributes
+=item --to MAIL
 
-=item --ro
-
-Include also read-only attributes as comment 
+Instead sending email to user and eventually their manager, send the mail to
+only this email address.
 
 =back
+
+=head1 CONFIGURATION
+
+Some variables are take from configuration file:
+
+=over 4
+
+=item mailFrom
+
+Specify the From address to use in mail
+
+=item smtp
+
+The smtp server to use to send mail
+
+=item alwayscc
+
+In normal mode (without --to), the mail is also sent this email address.
+
+=back
+
+=head1 USERS EMAIL ADDRESSES
+
+The mail use to send warning to users and manager is taken from 'mail'
+attributes. If the attributes is unset, the user will not receive the mail.
 
 =cut
@@ -55 +82 @@
 
 if ($mail) {
-    $LA->warn_next_expire_users;
+    $LA->warn_next_expire_users(to => $to, users => (@users ? \@users : undef));
 } else {
     foreach ($LA->find_next_expire_users()) {

LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm

@@ -40 +40 @@
 }
 
+=head2 warn_next_expire_users(%options)
+
+Send a mail to user having account expiring soon
+
+C<%options are>
+
+=over 4
+
+=item users => []
+
+Warn only this users (if need)
+
+=item to
+
+Send the only to this person.
+
+=back
+
+=cut
+
 sub warn_next_expire_users {
-    my ($self) = @_;
+    my ($self, %options) = @_;
 
     require Mail::Sendmail;
@@ -52 +72 @@
     );
     foreach my $user ($self->find_next_expire_users) {
+        if ($options{users} && ! grep { $_ eq $user->{name} } @{$options{users}}) {
+            next;
+        }
         my %mail = (
             From => ($self->val('_default_', 'mailFrom') ||
@@ -69 +92 @@
         my ($to, @cc) = grep { $_ } ($mail, $managermail, $self->val('_default_',
             'allwayscc'));
-        $mail{to} = 'nanardon@nanardon.zarb.org';
-
+        if ($options{to}) {
+            $mail{to} = $options{to};
+        } else {
+            $mail{to} = $to;
+            $mail{cc} = join(', ', @cc);
+        }
+        $mail{to} or next;
         my $message;
         $template->process('account_expire.mail', $user, \$message)
             or die $template->error();
+
         if (Mail::Sendmail::sendmail(
             %mail,
             Message => $message,
         )) {
-            warn "mail sent to " . ($to || '') . " cc " . (join(', ', @cc) || '') . "\n";
+            printf("Mail normally set to %s; cc to %s\n",
+                $to, (join(', ', @cc) || ''));
         } else {
             warn $Mail::Sendmail::error