Changeset 1926 for trunk/LATMOS-Accounts/lib
- Timestamp:
- 01/12/17 11:20:42 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm
r1925 r1926 149 149 } 150 150 151 if (my $val = $self->{_base}->get_global_value("expiredWarning.user.$user")) {152 if ($val eq $ouser->get_attributes(_DATEFLAG)) {153 # Warning has been already sent154 next;155 }156 }157 151 158 152 my $manager = $ouser->get_attributes('manager') || 'N/A'; … … 170 164 foreach my $manager (sort keys %expired) { 171 165 166 my $omanager = $self->{_base}->get_object('user', $manager) or next; 167 my $mail = $omanager->get_attributes('mail') or next; 168 169 my $data = { 170 manager => $omanager, 171 users => [], 172 }; 173 172 174 foreach my $ouser (@{ $expired{$manager}{users}}) { 175 if (my $val = $self->{_base}->get_global_value("expiredWarning.user." . $ouser->id)) { 176 if ($val eq $ouser->get_attributes(_DATEFLAG)) { 177 # Warning has been already sent 178 next; 179 } 180 } 173 181 $self->{_base}->log( 174 182 LA_NOTICE, … … 179 187 $manager, 180 188 ); 189 push(@{ $data->{users} }, $ouser); 181 190 $self->{_base}->set_global_value('expiredWarning.user.' . $ouser->id, $ouser->get_attributes(_DATEFLAG)); 182 191 } 192 if (! @{ $data->{users} }) { 193 next; 194 } 183 195 $self->{_base}->commit; 184 196 185 my $omanager = $self->{_base}->get_object('user', $manager) or next;186 my $mail = $omanager->get_attributes('mail') or next;187 188 $expired{$manager}{manager} = $omanager;189 197 190 198 my %mail = ( … … 200 208 $self->{_base}->log(LA_NOTICE, "Test: sending mail to %s for expired account %s", 201 209 $omanager->id, 202 join(', ', sort map { $_->id } @{ $ expired{$manager}{users}}),210 join(', ', sort map { $_->id } @{ $data->{users} }), 203 211 ); 204 212 } else { 205 if ($lamail->process(\%mail, $ expired{$manager})) {213 if ($lamail->process(\%mail, $data)) { 206 214 $self->{_base}->log(LA_NOTICE, 207 215 "Expired account reminder mail sent to %s (%s) (cc: %s) for %s", … … 209 217 $omanager->id, 210 218 ($mail{cc} || ''), 211 join(', ', sort map { $_->id } @{ $ expired{$manager}{users}}),219 join(', ', sort map { $_->id } @{ $data->{users}}), 212 220 ); 213 221 … … 222 230 foreach (@{$expired{$manager}{users}}) { 223 231 224 if (my $val = $self->{_base}->get_global_value("expiredWarning.usersummary. $_")) {232 if (my $val = $self->{_base}->get_global_value("expiredWarning.usersummary." . $_->id)) { 225 233 if ($val eq $_->get_attributes(_DATEFLAG)) { 226 234 # Warning has been already sent … … 241 249 $self->{_base}->set_global_value('expiredWarning.usersummary.' . $_->id, $_->get_attributes(_DATEFLAG)); 242 250 } 243 $self->{_base}->commit; 244 } 251 } 252 253 $self->{_base}->commit; 245 254 246 255 if (@summary) { 247 256 if ($test) { 248 257 $self->{_base}->log(LA_NOTICE, "Test: no sending expired summary to $sumto for users"); 258 $self->{_base}->log(LA_DEBUG, join('', @summary)); 249 259 } else { 250 260 my %mail = (
Note: See TracChangeset
for help on using the changeset viewer.