Changeset 182

Timestamp:

04/11/09 03:55:22 (15 years ago)

Author:

nanardon

Message:

• use template for mail everywhere (#5)

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/DB.pm (modified) (1 diff)
• lib/Vote/DB/Poll.pm (modified) (2 diffs)
• lib/Vote/DB/Voting.pm (modified) (3 diffs)
• root/mail/voting_passwd.tt (added)

trunk/MANIFEST

@@ -58 +58 @@
 root/mail/poll_request.tt
 root/mail/ballot_confirm.tt
+root/mail/voting_passwd.tt
 root/templates/admin/default.tt
 root/templates/admin/denied.tt

trunk/lib/Vote/Controller/Admin.pm

@@ -87 +87 @@
                 and $vote->db->commit;
         } elsif($c->req->param('mailpasswd')) {
-            $vote->mail_passwd_ifnul($id, {
-                voteurl => $c->uri_for('/ballot', $id),
-            });
+            # TODO
+            foreach my $vkey ($poll->list_voting_no_passwd) {
+                my $voting = $poll->voting($vkey);
+                my $pass = $voting->gen_passwd;
+                $c->forward(
+                    q'Vote::View::Mail', 'render',
+                    [ 'voting_passwd.tt', {
+                        From => $poll->info->{owner},
+                        To => $voting->info->{mail},
+                        Subject => "Invitation à voter",
+                        mail => {
+                            voteid => $id,
+                            mail => $voting->info->{mail},
+                            passwd => $pass,
+                        }
+                    } ]
+                );
+            }
         }
     };

trunk/lib/Vote/DB.pm

@@ -286 +286 @@
 }
 
-sub mail_passwd_ifnul {
-    my ($self, $voteid, $mailinfo) = @_;
-    $self->poll($voteid)->mail_passwd_ifnul($mailinfo);
-}
-
 sub clean_old_poll_request {
     my ($self) = @_;

trunk/lib/Vote/DB/Poll.pm

@@ -811 +811 @@
 }
 
-sub mail_passwd_ifnul {
-    my ($self, $mailinfo) = @_;
+sub list_voting_no_passwd {
+    my ($self) = @_;
 
     my $list_voting = $self->db->prepare_cached(
@@ -819 +819 @@
 
     $list_voting->execute($self->voteid);
+    my @ids;
     while (my $res = $list_voting->fetchrow_hashref) {
-        $self->mail_voting_passwd($res->{key}, $mailinfo);
-    }
+        push(@ids, $res->{key});
+    }
+    @ids
 }
 

trunk/lib/Vote/DB/Voting.pm

@@ -5 +5 @@
 use strict;
 use warnings;
-use Mail::Mailer;
 use base 'Vote::DB::common';
 use Vote::DB::Poll;
@@ -82 +81 @@
 }
 
-sub mail_voting_passwd {
-    my ($self, $mailinfo) = @_;
-    
-    my $vinfo = $self->info or return;
-    my $voteinfo = $self->poll->info;
-    $voteinfo->{description} ||= "";
-
+sub gen_passwd {
+    my ($self) = @_;
     my $passwd = Vote::DB::common::random_string(8);
     my $encpasswd = $self->gen_enc_passwd($passwd);
-
     my $upd_voting = $self->db->prepare_cached(
         q{update voting set passwd = ? where key = ?}
@@ -97 +90 @@
 
     $upd_voting->execute($encpasswd, $self->votingkey);
-
-    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 => (Vote->config->{smtp} || 'localhost');
-    $ENV{MAILADDRESS} = $voteinfo->{owner};
-    $mailer->open({
-        From => $voteinfo->{owner},
-        To => $vinfo->{mail},
-        Subject => 'Invitation a voter: ' . $voteinfo->{label},
-        'X-Epoll-poll' => $self->poll->voteid,
-        Vote::DB::common::mail_header(),
-    });
-    print $mailer <<EOF;
-Vous êtes convié à participer a ce vote:
-
---------
-$voteinfo->{label}
---------
-$voteinfo->{description}
---------
-
-Ã  l'adresse:
-
-$mailinfo->{voteurl}
-$date
-
--- 
-Votre identifiant est: $vinfo->{mail}
-Votre mot de passe est: $passwd
-
-Conservez précieusement ces identifiants, il ne vous seront pas retransmits.
-
-Cordialement.
-EOF
-    $mailer->close or warn "couldn't send whole message: $!\n";
-
     $self->db->commit;
+    $passwd
 }