Changeset 34

Timestamp:

03/15/09 16:28:12 (15 years ago)

Author:

nanardon

Message:

• voting identifier is now the email

Location:

trunk

Files:

• lib/Vote/Controller/Ballot.pm (modified) (3 diffs)
• lib/Vote/Model/Vote.pm (modified) (10 diffs)
• root/templates/admin/default.tt (modified) (1 diff)
• root/templates/ballot/login.tt (modified) (1 diff)
• root/templates/vote/default.tt (modified) (1 diff)
• sql/postgres.dump (modified) (previous)

trunk/lib/Vote/Controller/Ballot.pm

@@ -36 +36 @@
     }
 
-    my $uid = $c->session->{uid} || $c->req->param('uid');
+    my $mail = $c->session->{mail} || $c->req->param('mail');
     my $password = $c->session->{password} || $c->req->param('password');
 
-    if (!$c->model('Vote')->auth_voting($id, $uid, $password)) {
+    if (!$c->model('Vote')->auth_voting($id, $mail, $password)) {
         $c->delete_session('invalid user/pass');
         $c->stash->{template} = 'ballot/login.tt';
@@ -45 +45 @@
     }
 
-    $c->session->{uid} = $uid;
+    $c->session->{mail} = $mail;
     $c->session->{password} = $password;
 
     # login succeed, but those this user has already voted
-    if (my $date = $c->model('Vote')->voting_has_sign($id, $uid)) {
+    if (my $date = $c->model('Vote')->voting_has_sign($id, $mail)) {
         $c->stash->{uid} = $c->session->{uid};
         $c->stash->{template} = 'ballot/signed.tt';
@@ -92 +92 @@
     if ($c->req->param('confirm')) {
         $vote->register_ballot(
-            $uid,
+            $mail,
             $id,
             [ @sbalval ],

trunk/lib/Vote/Model/Vote.pm

@@ -207 +207 @@
         select *, voting.key as vkey from voting left join signing
         on signing.key = voting.key
-        where poll = ? order by voting.id
+        where poll = ? order by voting.mail
         }
     );
@@ -219 +219 @@
 
 sub vote_voting {
-    my ($self, $id) = @_;
+    my ($self, $voteid) = @_;
 
     my $sth = $self->db->prepare_cached(
         q{
         select key from voting
-        where poll = ? order by voting.id
-        }
-    );
-    $sth->execute($id);
+        where poll = ? order by voting.mail
+        }
+    );
+    $sth->execute($voteid);
     my @people;
     while (my $res = $sth->fetchrow_hashref) {
@@ -246 +246 @@
     );
     $sth->execute($id);
-    
+
     my $res = $sth->fetchrow_hashref;
     $sth->finish;
@@ -330 +330 @@
 
 sub voting_info_id {
-    my ($self, $id, $voteid) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{
-        select * from voting where id = ? and poll = ?
-        }
-    );
-    $sth->execute($id, $voteid);
+    my ($self, $mail, $voteid) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        select * from voting where mail = ? and poll = ?
+        }
+    );
+    $sth->execute($mail, $voteid);
     my $res = $sth->fetchrow_hashref();
     $sth->finish;
@@ -344 +344 @@
 
 sub _register_signing {
-    my ($self, $vid, $voteid, $referal) = @_;
-
-    my $vinfo = $self->voting_info_id($vid, $voteid) or return;
+    my ($self, $mail, $voteid, $referal) = @_;
+
+    my $vinfo = $self->voting_info_id($mail, $voteid) or return;
 
     my $sth = $self->db->prepare_cached(
@@ -464 +464 @@
 
 sub auth_voting {
-    my ($self, $poll, $user, $password) = @_;
-    my $userinfo = $self->voting_info_id($user, $poll) or return;
+    my ($self, $poll, $mail, $password) = @_;
+    my $userinfo = $self->voting_info_id($mail, $poll) or return;
 
     $userinfo->{passwd} or return;
@@ -496 +496 @@
         select date from signing join voting
         on voting.key = signing.key
-        where poll = ? and id = ?
+        where poll = ? and mail = ?
         }
     );
@@ -618 +618 @@
 
 sub addupd_voting {
-    my ($self, $voteid, $id, $mail) = @_;
+    my ($self, $voteid, $mail, $id) = @_;
 
     my $upd = $self->db->prepare_cached(
         q{
-        update voting set mail = ? where poll = ? and id = ?
+        update voting set label = ? where mail = ? and poll = ?
         }
     );
@@ -628 +628 @@
     if ($upd->execute($mail, $voteid, $id) == 0) {
         my $add = $self->db->prepare_cached(q{
-            insert into voting (poll, id, mail) values (?,?,?)
+            insert into voting (poll, label, mail) values (?,?,?)
         });
 
@@ -705 +705 @@
 $voteinfo->{label}
 
-Votre identifiant est: $vinfo->{id}
+Votre identifiant est: $vinfo->{mail}
 Votre mot de passe est: $passwd
 

trunk/root/templates/admin/default.tt

@@ -57 +57 @@
 <form action="[% c.uri_for(voteid) %]">
 <input type="hidden" name="delvoting" value="[% voting.vkey %]">
-[% voting.id | html %] [% voting.mail | html %]
+[% voting.label | html %] [% voting.mail | html %]
 [% IF voting.passwd %]<i>(pass envoyé)</i>[% END %]
 <input type="submit" name="delete" value="delete"><br>

trunk/root/templates/ballot/login.tt

@@ -1 +1 @@
 <form action="[% c.uri_for(voteid) %]">
-<input type="text" name="uid" value="[% c.req.param('uid') %]">
+<input type="text" name="mail" value="[% c.req.param('mail') %]">
 <input type="password" name="password" value="">
 <input type="submit">

trunk/root/templates/vote/default.tt

@@ -48 +48 @@
 [% signing = [ vote.vote_signing(voteid) ] %]
 [% FOREACH voting = signing %]
-[% voting.id | html %] [% voting.date %]<br>
+[% voting.label | html %] [% voting.date %]<br>
 [% END %]