Changeset 87

Timestamp:

03/19/09 16:54:46 (15 years ago)

Author:

nanardon

Message:

• fix mail encoding
• don't hardcode smtp server
• warn (in log then) is mail cannot be sent

Location:

trunk

Files:

• lib/Vote/Model/Vote.pm (modified) (6 diffs)
• vote.yml.example (modified) (1 diff)

trunk/lib/Vote/Model/Vote.pm

@@ -38 +38 @@
 
 sub db { $_[0]->{db} }
+
+sub mail_header {
+    return(
+        'Content-Type' => 'text/plain; charset=UTF-8; format=flowed',
+        'Content-Transfer-Encoding' => '8bit',
+        'X-Epoll-version' => $Vote::VERSION,
+    );
+}
 
 sub random_string {
@@ -769 +777 @@
 
     # TODO complete this properly:
-    my $mailer = new Mail::Mailer 'smtp', Server => 'mailhost';
+    my $mailer = new Mail::Mailer 'smtp', Server => (Vote->config->{smtp} || 'localhost');
     $mailer->open({
         From => $voteinfo->{owner},
@@ -775 +783 @@
         Subject => 'Invitation a voter: ' . $voteinfo->{label},
         'X-Epoll-poll' => $id,
-        'X-Epoll-version' => $Vote::VERSION,
+        mail_header(),
     });
     print $mailer <<EOF;
-Vous etes convie à participer a ce vote:
+Vous êtes convié à participer a ce vote:
+
+--------
 $voteinfo->{label}
-
-a l'adresse:
+--------
+
+Ã  l'adresse:
 
 $mailinfo->{voteurl}
@@ -788 +799 @@
 Votre mot de passe est: $passwd
 
-Conserver precieusement ces identifiants, il ne vous seront pas redonner.
+Conserver précieusement ces identifiants, il ne vous seront pas retransmit.
 
 Cordialement.
 EOF
-    $mailer->close;
+    $mailer->close or warn "couldn't send whole message: $!\n";
 
     $self->db->commit;
@@ -854 +865 @@
 
     $addreq->execute($reqid, $info{label}, $info{mail});
-    my $mailer = new Mail::Mailer 'smtp', Server => 'mailhost';
+    my $mailer = new Mail::Mailer 'smtp', Server => (Vote->config->{smtp} || 'localhost');
     $mailer->open({
         From => 'Voting system <nomail@nomail.com>', # TODO allow to configure this
         To => $info{mail},
         Subject => 'Votre nouveau vote',
+        mail_header(),
     });
     print $mailer <<EOF;
@@ -868 +880 @@
 $info{url}/$reqid
 
-A bientot
+A bientÃŽt
 EOF
-    $mailer->close;
+    $mailer->close
+        or warn "couldn't send whole message: $!\n";
     $self->db->commit;
     1;

trunk/vote.yml.example

@@ -2 +2 @@
 name: Vote
 db: dbname=vote
+-- The smtp serveur to use
+smtp: