Changeset 1958 for trunk/LATMOS-Accounts/lib
- Timestamp:
- 02/20/17 18:20:56 (7 years ago)
- Location:
- trunk/LATMOS-Accounts/lib/LATMOS/Accounts
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm
r1953 r1958 2058 2058 }; 2059 2059 2060 my $MailSubject = $self->la->val('_default_', 'mailSubject', 'LATMOS::Accounts'); 2061 2060 2062 my %mail = ( 2061 Subject => 'LATMOS: pasword reset',2062 'X-LATMOS-Reason' => ' Account destruction',2063 Subject => "$MailSubject: pasword reset", 2064 'X-LATMOS-Reason' => 'Password Reset', 2063 2065 to => $mail, 2064 2066 ); -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm
r1763 r1958 103 103 ); 104 104 105 my $MailSubject = $self->val('_default_', 'mailSubject', 'LATMOS::Accounts'); 106 105 107 my @summary; 106 108 foreach my $user ($self->find_next_expire_users($options{delay})) { … … 108 110 next; 109 111 } 112 110 113 my %mail = ( 111 114 From => $self->val('_default_', 'mailFrom', 'nomail@localhost'), 112 Subject => sprintf( 'Account %s Expire in %s days', $user->{name}, $user->{days}),115 Subject => sprintf("$MailSubject: Account %s Expire in %s days", $user->{name}, $user->{days}), 113 116 'X-LATMOS-Reason' => 'Account expiration', 114 117 ); … … 166 169 ); 167 170 if ($summail->process({ 168 Subject => 'LATMOS account expiration summary',171 Subject => "$MailSubject: account expiration summary", 169 172 To => $self->val('_default_', 'expire_summary_to'), 170 173 })) { … … 257 260 } 258 261 262 my $MailSubject = $self->val('_default_', 'mailSubject', 'LATMOS::Accounts'); 263 259 264 unless($options{test}) { 260 265 foreach (keys %managers) { … … 264 269 265 270 my %mail = ( 266 Subject => 'LATMOS expired account',271 Subject => "$MailSubject: expired account", 267 272 'X-LATMOS-Reason' => 'Account destruction', 268 273 ); … … 300 305 if ($self->val('_default_', 'expire_summary_to')) { 301 306 my %mail = ( 302 Subject => 'LATMOS expired account (to disable)',307 Subject => "$MailSubject: expired account (to disable)", 303 308 'X-LATMOS-Reason' => 'Account expiration', 304 309 To => $self->val('_default_', 'expire_summary_to'), -
trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Delexpiredusers.pm
r1926 r1958 161 161 'account_expired_reminder.mail', 162 162 ); 163 164 my $MailSubject = $self->{_base}->la->val('_default_', 'mailSubject', 'LATMOS::Accounts'); 163 165 164 166 foreach my $manager (sort keys %expired) { … … 197 199 198 200 my %mail = ( 199 Subject => 'LATMOS expired account',201 Subject => "$MailSubject: expired account", 200 202 'X-LATMOS-Reason' => 'Account destruction', 201 203 ); … … 226 228 227 229 if (my $sumto = $self->{syncm}->ini->val($self->{name}, 'summary')) { 230 my $MailSubject = $self->{_base}->la->val('_default_', 'mailSubject', 'LATMOS::Accounts'); 231 228 232 my @summary; 229 233 foreach my $manager (sort keys %expired) { … … 259 263 } else { 260 264 my %mail = ( 261 Subject => 'LATMOS expired account (deactivation planned)',265 Subject => "$MailSubject: expired account (deactivation planned)", 262 266 'X-LATMOS-Reason' => 'Account expiration', 263 267 To => $sumto,
Note: See TracChangeset
for help on using the changeset viewer.