Changeset 785

Timestamp:

02/02/10 18:29:52 (14 years ago)

Author:

nanardon

Message:

• new feature: if expire_summary_to default config value is set, a summary of account expiration is sent to this address

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm (modified) (3 diffs)

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

@@ -112 +112 @@
             next;
         };
+        my $mailcc = join(', ', @cc) || '';
+        push(@summary, sprintf("%-15s %-10s %s\n  CC: %s\n",
+                $user->{obj}->id,
+                $user->{delay},
+                $to || 'Not sent, no destination',
+                ($mailcc ? "  $mailcc\n" : ''),
+            )
+        );
         my $message;
         $template->process('account_expire.mail', $user, \$message)
@@ -120 +128 @@
             };
 
-        if ($options{test}) {
-            la_log(LA_NOTICE,
-                "Expiration mail normally for %s (%s) would be sent to %s; cc %s",
-                $user->{obj}->id,
-                $user->{delay},
-                $to, (join(', ', @cc) || ''),
-            );
-            if ($options{to}) {
-                la_log(LA_NOTICE,"\tbut sent to %s", $mail{to});
-            }
-        } else {
+        if (!$options{test}) {
             if (Mail::Sendmail::sendmail(
                     %mail,
@@ -148 +146 @@
     }
 
+    if (@summary) {
+        if ($options{test}) {
+            print join('', @summary);
+        } else {
+            if ($self->val('_default_', 'expire_summary_to')) {
+                my %mail = (
+                    From => $self->val('_default_', 'mailFrom', 'nomail@localhost'),
+                    Subject => 'LATMOS account expiration summary',
+                    smtp => $self->val('_default_', 'smtp'),
+                    'Content-Type' => 'text/plain; charset=utf-8',
+                    'X-LATMOS-Accounts' => '$Rev$',
+                    'X-LATMOS-Reason' => 'Account expiration',
+                    To => $self->val('_default_', 'expire_summary_to'),
+                );
+                if (Mail::Sendmail::sendmail(
+                        %mail,
+                        Message => join('', @summary),
+                    )) {
+                    la_log(LA_NOTICE, "Expiration summary mail sent to %s",
+                        $self->val('_default_', 'expire_summary_to'),
+                    );
+                } else {
+                    la_log(LA_ERR, "Cannot send mail: %s", $Mail::Sendmail::error);
+                }
+            }
+        }
+    }
+
     1;
 }