Changeset 1958

Timestamp:

02/20/17 18:20:56 (7 years ago)

Author:

nanardon

Message:

Allow to change mail's subjects from parameter config

Location:

trunk/LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Maintenance.pm (modified) (6 diffs)
• lib/LATMOS/Accounts/Task/Delexpiredusers.pm (modified) (4 diffs)
• man/man5/latmos-accounts.ini.pod (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -2058 +2058 @@
     };
 
+    my $MailSubject = $self->la->val('_default_', 'mailSubject', 'LATMOS::Accounts');
+
     my %mail = (
-        Subject => 'LATMOS: pasword reset',
-        'X-LATMOS-Reason' => 'Account destruction',
+        Subject => "$MailSubject: pasword reset",
+        'X-LATMOS-Reason' => 'Password Reset',
         to => $mail,
     );

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

@@ -103 +103 @@
     );
 
+    my $MailSubject = $self->val('_default_', 'mailSubject', 'LATMOS::Accounts');
+
     my @summary;
     foreach my $user ($self->find_next_expire_users($options{delay})) {
@@ -108 +110 @@
             next;
         }
+
         my %mail = (
             From => $self->val('_default_', 'mailFrom', 'nomail@localhost'),
-            Subject => sprintf('Account %s Expire in %s days', $user->{name}, $user->{days}),
+            Subject => sprintf("$MailSubject: Account %s Expire in %s days", $user->{name}, $user->{days}),
             'X-LATMOS-Reason' => 'Account expiration',
         );
@@ -166 +169 @@
                 );
                 if ($summail->process({
-                    Subject => 'LATMOS account expiration summary',
+                    Subject => "$MailSubject: account expiration summary",
                     To => $self->val('_default_', 'expire_summary_to'),
                 })) {
@@ -257 +260 @@
     }
 
+    my $MailSubject = $self->val('_default_', 'mailSubject', 'LATMOS::Accounts');
+
     unless($options{test}) {
         foreach (keys %managers) {
@@ -264 +269 @@
 
             my %mail = (
-                Subject => 'LATMOS expired account',
+                Subject => "$MailSubject: expired account",
                 'X-LATMOS-Reason' => 'Account destruction',
             );
@@ -300 +305 @@
             if ($self->val('_default_', 'expire_summary_to')) {
                 my %mail = (
-                    Subject => 'LATMOS expired account (to disable)',
+                    Subject => "$MailSubject: expired account (to disable)",
                     'X-LATMOS-Reason' => 'Account expiration',
                     To => $self->val('_default_', 'expire_summary_to'),

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

@@ -161 +161 @@
             'account_expired_reminder.mail',
         );
+
+        my $MailSubject = $self->{_base}->la->val('_default_', 'mailSubject', 'LATMOS::Accounts');
 
         foreach my $manager (sort keys %expired) {
@@ -197 +199 @@
 
             my %mail = (
-                Subject => 'LATMOS expired account',
+                Subject => "$MailSubject: expired account",
                 'X-LATMOS-Reason' => 'Account destruction',
             );
@@ -226 +228 @@
 
     if (my $sumto = $self->{syncm}->ini->val($self->{name}, 'summary')) {
+        my $MailSubject = $self->{_base}->la->val('_default_', 'mailSubject', 'LATMOS::Accounts');
+
         my @summary;
         foreach my $manager (sort keys %expired) {
@@ -259 +263 @@
             } else {
                 my %mail = (
-                    Subject => 'LATMOS expired account (deactivation planned)',
+                    Subject => "$MailSubject: expired account (deactivation planned)",
                     'X-LATMOS-Reason' => 'Account expiration',
                     To => $sumto,

trunk/LATMOS-Accounts/man/man5/latmos-accounts.ini.pod

@@ -45 +45 @@
 
 When set, this email address will receive a summary about account expiring soon
+
+=head3 mailSubject
+
+This parameter is dedicate to set the company or institute name. It is used to
+build the subject of mail send by application.
 
 =head2 [_defattr_] SECTION