Changeset 786

Timestamp:

02/02/10 20:42:21 (14 years ago)

Author:

nanardon

Message:

• update expiration mail format according demand
• add english version in mail and the real date

Location:

LATMOS-Accounts

Files:

• lib/LATMOS/Accounts/Maintenance.pm (modified) (3 diffs)
• templates/mail/account_expire.mail (modified) (2 diffs)

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

@@ -34 +34 @@
     my @users;
     while (my $res = $sth->fetchrow_hashref) {
-        $res->{delay} =~ s/(day.?) .*/$1/;
+        $res->{delay} =~ s/day.? .*//;
         $res->{obj} = $base->get_object('user', $res->{name});
         push(@users, $res);
@@ -84 +84 @@
         my %mail = (
             From => $self->val('_default_', 'mailFrom', 'nomail@localhost'),
-            Subject => 'LATMOS Expire in ' . $user->{delay},
+            Subject => 'LATMOS Expire in ' . $user->{delay} . 'days',
             smtp => $self->val('_default_', 'smtp'),
             'Content-Type' => 'text/plain; charset=utf-8',
@@ -113 +113 @@
         };
         my $mailcc = join(', ', @cc) || '';
-        push(@summary, sprintf("%-15s %-10s %s\n  CC: %s\n",
-                $user->{obj}->id,
-                $user->{delay},
+        push(@summary, sprintf("%s : %s : %s\n",
+                $user->{obj}->queryformat('%{displayName} : %{name} : %{department} : %{managerContact} : %{expireText}'),
                 $to || 'Not sent, no destination',
-                ($mailcc ? "  $mailcc\n" : ''),
+                ($mailcc ? $mailcc : ''),
             )
         );

LATMOS-Accounts/templates/mail/account_expire.mail

@@ +1 @@
+(English version follows)
+
 Bonjour [% obj.get_c_field('displayName') %],
 
 sauf erreur ou ommission de notre part votre compte [% obj.id %] expire
-dans [% delay %].
+dans [% delay %] jours ([% obj.get_c_field('expire') %]).
 En aucun cas vos fichiers ne seront détruit 
 
@@ -10 +12 @@
 Cordialement.
 L'équipe d'administration.
+
+===
+
+Hello [% obj.get_c_field('displayName') %],
+
+unless error or omission on our part, your account login expires
+in [% delay %] days ([% obj.get_c_field('expire') %]).
+In no case files will be destroyed.
+
+If it had to be extended, please ask your manager to contact
+svp@latmos.ipsl.fr to give us with the new date of expiry.
+
+Best regards.
+The administration team.