Changeset 1896 for trunk

Timestamp:

12/28/16 15:16:35 (7 years ago)

Author:

nanardon

Message:

Allways send mail (use summary if no manager)

File:

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

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

@@ -170 +170 @@
     );
 
+    my $sumto = $self->{syncm}->ini->val($self->{name}, 'summary');
+
     foreach my $manager (sort keys %expired) {
 
-        foreach my $ouser (@{ $expired{$manager}{users}}) {
-            $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;
+
+        my $mail;
+        if (my $omanager = $self->{_base}->get_object('user', $manager)) {
+            $mail = $omanager->get_attributes('mail') or next;
+            $expired{$manager}{manager} = $omanager;
+        }
+        $mail ||= $sumto;
+        $mail or next;
+
 
         my %mail = (
@@ -194 +196 @@
         if ($test) {
             $self->{_base}->log(LA_NOTICE, "Test: sending mail to %s for expired account %s",
-                $omanager->id,
+                $mail,
                 join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
             );
@@ -202 +204 @@
                     "Expired account reminder mail sent to %s (%s) (cc: %s) for %s",
                     $mail{to},
-                    $omanager->id,
+                    $manager,
                     ($mail{cc} || ''),
                     join(', ', sort map { $_->id } @{ $expired{$manager}{users}}),
@@ -208 +210 @@
 
             }
+            foreach my $ouser (@{ $expired{$manager}{users}}) {
+                $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG));
+            }
+            $self->{_base}->commit;
         }
     }
 
-    if (my $sumto = $self->{syncm}->ini->val($self->{name}, 'summary')) {
+    if ($sumto) {
         my @summary;
         foreach my $manager (sort keys %expired) {