Changeset 181

Timestamp:

04/11/09 02:39:36 (15 years ago)

Author:

nanardon

Message:

• ballot confirm now use template

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Vote/Controller/Ballot.pm (modified) (1 diff)
• lib/Vote/Controller/Newpoll.pm (modified) (1 diff)
• lib/Vote/DB.pm (modified) (2 diffs)
• lib/Vote/DB/Poll.pm (modified) (2 diffs)
• root/mail/ballot_confirm.tt (added)

trunk/MANIFEST

@@ -57 +57 @@
 root/static/vote.css
 root/mail/poll_request.tt
+root/mail/ballot_confirm.tt
 root/templates/admin/default.tt
 root/templates/admin/denied.tt

trunk/lib/Vote/Controller/Ballot.pm

@@ -117 +117 @@
             $c->req->address,
         ); # TODO trap error
-        $vote->mail_ballot_confirm($mail, $id, {
-                ballotid => $c->stash->{ballotid},
-                url => $c->uri_for('/vote', $id),
-        });
+        $c->forward(
+            q'Vote::View::Mail', 'render',
+            [ 'ballot_confirm.tt', {
+                From => $mail,
+                To => $mail,
+                Subject => 'Confirmation de vote: ' . $vote->vote_info($id)->{label},
+                mail => {
+                    ballotid => $c->stash->{ballotid},
+                    voteid => $id,
+                }
+            } ]
+        );
+
         $c->stash->{template} = 'ballot/done.tt';
         $c->delete_session('Vote terminé');

trunk/lib/Vote/Controller/Newpoll.pm

@@ -46 +46 @@
                     reqid => $reqid,
                 }
-            } ]);
+            } ]
+        );
 
         $c->stash->{template} = 'newpoll/request.tt';

trunk/lib/Vote/DB.pm

@@ -6 +6 @@
 use warnings;
 use Vote;
-use Mail::Mailer;
 use base 'Vote::DB::common';
 use Vote::DB::Poll;
@@ -172 +171 @@
 }
 
-sub mail_ballot_confirm {
-    my ($self, $vid, $voteid, $info) = @_;
-    $self->poll($voteid)->mail_ballot_confirm($vid, $info);
-}
-
 sub vote_voting_count {
     my ($self, $id) = @_;

trunk/lib/Vote/DB/Poll.pm

@@ -6 +6 @@
 use warnings;
 use Vote;
-use Mail::Mailer;
 use Crypt::RSA;
 use Crypt::RSA::Key::Public::SSH;
@@ -446 +445 @@
 }
 
-sub mail_ballot_confirm {
-    my ($self, $vid, $info) = @_;
-    my $voteinfo = $self->info or return;
-    $info->{ballotid} or return;
-    my $mailer = new Mail::Mailer 'smtp', Server => (Vote->config->{smtp} || 'localhost');
-    $ENV{MAILADDRESS} = $vid;
-    $mailer->open({
-        From => $vid, # TODO allow to configure this
-        To => $vid,
-        Subject => 'Confirmation de vote: ' . $voteinfo->{label},
-        Vote::DB::common::mail_header(),
-    });
-    print $mailer <<EOF;
-
-Vous venez de participer au vote:
-
---------
-$voteinfo->{label}
---------
-
-Votre bulletin est idéntifié sous le numéro:
-$info->{ballotid}
-
-Les résultats seront disponibles à cet url:
-$info->{url}
-
-Cordialement.
-EOF
-    $mailer->close
-        or warn "couldn't send whole message: $!\n";
-
-}
-
 sub voting_count {
     my ($self) = @_;