Changeset 77

Timestamp:

03/18/09 21:42:49 (15 years ago)

Author:

nanardon

Message:

• use a correct from in mail

File:

• trunk/lib/Vote/Model/Vote.pm (modified) (3 diffs)

trunk/lib/Vote/Model/Vote.pm

@@ -763 +763 @@
     $upd_voting->execute($encpasswd, $id);
 
+    my $date = $voteinfo->{dstart} && $voteinfo->{dend}
+        ? sprintf("\n" . 'Vous pourrez voter entre le %s %s et le %s %s' . "\n",
+            $voteinfo->{dstart}, $voteinfo->{hstart}, $voteinfo->{dend}, $voteinfo->{hend})
+        : '';
+
     # TODO complete this properly:
     my $mailer = new Mail::Mailer 'smtp', Server => 'mailhost';
     $mailer->open({
-        From => 'Voting system <nomail@nomail.com>',
+        From => $voteinfo->{owner},
         To => $vinfo->{mail},
-        Subject => 'Vote passwd',
+        Subject => 'Invitation a voter: ' . $voteinfo->{label},
+        'X-Epoll-poll' => $id,
+        'X-Epoll-version' => $Vote::VERSION,
     });
     print $mailer <<EOF;
@@ -777 +784 @@
 
 $mailinfo->{voteurl}
-
+$date
 Votre identifiant est: $vinfo->{mail}
 Votre mot de passe est: $passwd
+
+Conserver precieusement ces identifiants, il ne vous seront pas redonner.
 
 Cordialement.
@@ -847 +856 @@
     my $mailer = new Mail::Mailer 'smtp', Server => 'mailhost';
     $mailer->open({
-        From => 'Voting system <nomail@nomail.com>',
+        From => 'Voting system <nomail@nomail.com>', # TODO allow to configure this
         To => $info{mail},
         Subject => 'Votre nouveau vote',