Changeset 1913 for trunk

Timestamp:

01/05/17 16:42:23 (7 years ago)

Author:

nanardon

Message:

Add option to not send mail to manager

This reverts commit 6751d93fb1f3b55fc57c79f98624f30ff1e4eb9d.

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm (modified) (4 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm

@@ -46 +46 @@
 If set only log are emitted but changes are not done and mail not really sent
 
+=head2 warn_manager
+
+If set, send a warning to manager of user after L<warndelay>.
+
+If not, a mail is sent only to L<summary> (if set).
+
 =head2 cc
 
@@ -151 +157 @@
 
         my $manager = $ouser->get_attributes('manager') || 'N/A';
-
-        $self->{_base}->log(
-            LA_NOTICE,
-            "%s Warning, user %s is expired (%s), manager %s",
-            $test ? 'Test: ' : '',
-            $user,
-            $ouser->get_attributes('expireText'),
-            $manager,
-        );
-            
+ 
         $expired{$manager} ||= { users => [] };
         push (@{$expired{$manager}{users}}, $ouser);
     }
 
-    my $lamail = LATMOS::Accounts::Mail->new(
-        $self->{_la},
-        'account_expired_reminder.mail',
-    );
-
-    my $sumto = $self->{syncm}->ini->val($self->{name}, 'summary');
-
-    foreach my $manager (sort keys %expired) {
-
-
-        my $mail;
-        if (my $omanager = $self->{_base}->get_object('user', $manager)) {
-            $mail = $omanager->get_attributes('mail') or next;
+    if ($self->{syncm}->ini->val('warn_manager')) {
+        my $lamail = LATMOS::Accounts::Mail->new(
+            $self->{_la},
+            'account_expired_reminder.mail',
+        );
+
+        foreach my $manager (sort keys %expired) {
+
+            foreach my $ouser (@{ $expired{$manager}{users}}) {
+                $self->{_base}->log(
+                    LA_NOTICE,
+                    "%s Warning, user %s is expired (%s), manager %s",
+                    $test ? 'Test: ' : '',
+                    $ouser->id,
+                    $ouser->get_attributes('expireText'),
+                    $manager,
+                );
+                $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG));
+            }
+            $self->{_base}->commit;
+
+            my $omanager = $self->{_base}->get_object('user', $manager) or next;
+            my $mail = $omanager->get_attributes('mail') or next;
+
             $expired{$manager}{manager} = $omanager;
-        }
-        $mail ||= $sumto;
-        $mail or next;
-
-
-        my %mail = (
-            Subject => 'LATMOS expired account',
-            'X-LATMOS-Reason' => 'Account destruction',
-        );
-
-        # to is for debuging
-        $mail{to} = $self->{syncm}->ini->val($self->{name}, 'to', $mail);
-        $mail{cc} = $self->{syncm}->ini->val($self->{name}, 'cc');
-
-
-        if ($test) {
-            $self->{_base}->log(LA_NOTICE, "Test: sending mail to %s for expired account %s",
-                $mail,
-                join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
+
+            my %mail = (
+                Subject => 'LATMOS expired account',
+                'X-LATMOS-Reason' => 'Account destruction',
             );
-        } else {
-            if ($lamail->process(\%mail, $expired{$manager})) {
-                $self->{_base}->log(LA_NOTICE,
-                    "Expired account reminder mail sent to %s (%s) (cc: %s) for %s",
-                    $mail{to},
-                    $manager,
-                    ($mail{cc} || ''),
+
+            # to is for debuging
+            $mail{to} = $self->{syncm}->ini->val($self->{name}, 'to', $mail);
+            $mail{cc} = $self->{syncm}->ini->val($self->{name}, 'cc');
+
+            if ($test) {
+                $self->{_base}->log(LA_NOTICE, "Test: sending mail to %s for expired account %s",
+                    $omanager->id,
                     join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
                 );
-
-            }
-            foreach my $ouser (@{ $expired{$manager}{users}}) {
-                $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG));
-            }
-            $self->{_base}->commit;
+            } else {
+                if ($lamail->process(\%mail, $expired{$manager})) {
+                    $self->{_base}->log(LA_NOTICE,
+                        "Expired account reminder mail sent to %s (%s) (cc: %s) for %s",
+                        $mail{to},
+                        $omanager->id,
+                        ($mail{cc} || ''),
+                        join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
+                    );
+
+                }
+            }
         }
     }
 
-    if ($sumto) {
+    if (my $sumto = $self->{syncm}->ini->val($self->{name}, 'summary')) {
         my @summary;
         foreach my $manager (sort keys %expired) {
             foreach (@{$expired{$manager}{users}}) {
+
+                if (my $val = $self->{_base}->get_global_value("expiredWarning.usersummary.$_")) {
+                    if ($val eq $_->get_attributes(_DATEFLAG)) {
+                        # Warning has been already sent
+                        next;
+                    }
+                }
+
                 push(@summary, sprintf("%s - %s (%s, %s)\n",
                         $_->id,
@@ -230 +238 @@
                     )
                 );
-            }
-        }
-
-        if (@summary && !$test) {
-            my %mail = (
-                Subject => 'LATMOS expired account (deactivation planned)',
-                'X-LATMOS-Reason' => 'Account expiration',
-                To => $sumto,
-            );
-            my $summail = LATMOS::Accounts::Mail->new(
-                $self->{_la}, \join('', @summary), {}
-            );
-            if ($summail->process(\%mail)) {
-                la_log(LA_NOTICE, "Expiration summary mail sent to %s",
-                    $sumto,
-                );
+
+                $self->{_base}->set_global_value('expiredWarning.user.' . $_->id, $_->get_attributes(_DATEFLAG));
+            }
+        }
+
+        if (@summary) {
+            if ($test) {
+                $self->{_base}->log(LA_NOTICE, "Test: no sending expired summary to $sumto for users");
+            } else {
+                my %mail = (
+                    Subject => 'LATMOS expired account (deactivation planned)',
+                    'X-LATMOS-Reason' => 'Account expiration',
+                    To => $sumto,
+                );
+                my $summail = LATMOS::Accounts::Mail->new(
+                    $self->{_la}, \join('', @summary), {}
+                );
+                if ($summail->process(\%mail)) {
+                    la_log(LA_NOTICE, "Expiration summary mail sent to %s",
+                        $sumto,
+                    );
+                }
             }
         }
@@ -288 +302 @@
             );
             $self->{_base}->del_global_value("expiredWarning.user.$user");
+            $self->{_base}->del_global_value("expiredWarning.usersummary.$user");
             $ouser->ReportChange('Update', "Automatic unexport due to expiration");
             $self->{_base}->commit;