Changeset 161

Timestamp:

04/05/09 23:49:43 (15 years ago)

Author:

nanardon

Message:

• fix due to oo change

Location:

trunk/lib/Vote

Files:

• DB.pm (modified) (5 diffs)
• DB/Poll.pm (modified) (5 diffs)
• DB/Voting.pm (modified) (2 diffs)

trunk/lib/Vote/DB.pm

@@ -10 +10 @@
 use Vote::DB::Poll;
 use Vote::DB::Ballot; # see ballot()
+use Vote::DB::Voting; # see delete_voting()
 
 =head1 NAME
@@ -127 +128 @@
 sub vote_voting {
     my ($self, $voteid) = @_;
-    $self->poll($voteid)->voting;
+    $self->poll($voteid)->voting_keys;
 }
 
@@ -230 +231 @@
 sub voting_has_sign {
     my ($self, $poll, $user) = @_;
+    warn $user;
     $self->poll($poll)->voting_has_sign($user);
 }
@@ -252 +254 @@
 sub list_vote_ballot_needvalid {
     my ($self, $voteid) = @_;
-    $self->poll->list_ballot_needvalid;
+    $self->poll($voteid)->list_ballot_needvalid;
 }
 
@@ -292 +294 @@
 sub delete_voting {
     my ($self, $key) = @_;
-
-    $self->voting_has_sign($key) and return;
+    # must die, voting are attached to a poll
+    Vote::DB::Voting->new($self->{dbstring}, $key)->has_sign and return;
     my $sth = $self->db->prepare_cached(
         q{delete from voting where key = ?}

trunk/lib/Vote/DB/Poll.pm

@@ -160 +160 @@
     my $res = $sth->fetchrow_hashref;
     $sth->finish;
-    return $res ? Vote::DB::Voting($self->{dbstring}, $votingkey) : undef;
+    return $res ? Vote::DB::Voting->new($self->{dbstring}, $votingkey) : undef;
 }
 
@@ -175 +175 @@
     my $res = $sth->fetchrow_hashref;
     $sth->finish;
-    return $res ? Vote::DB::Voting($self->{dbstring}, $res->{key}) : undef;
+    return $res ? Vote::DB::Voting->new($self->{dbstring}, $res->{key}) : undef;
 }
 
@@ -270 +270 @@
         }
     );
-    my $uid = gen_uid();
+    my $uid = Vote::DB::common::gen_uid();
     $addb->execute($uid, $self->voteid, scalar(@{$fchoice || []}) ? undef : 'f') or do {
         self->db->rollback;
@@ -456 +456 @@
 sub voting_has_sign {
     my ($self, $user) = @_;
+    warn $user;
     $self->voting_from_mail($user)->has_sign;
 }
@@ -663 +664 @@
 sub mail_voting_passwd {
     my ($self, $id, $mailinfo) = @_;
-    
-    my $vinfo = $self->voting_info($id) or return;
-    my $voteinfo = $self->info;
-    $voteinfo->{description} ||= "";
-
-    my $passwd = random_string(8);
-    my $encpasswd = $self->gen_enc_passwd($passwd);
-
-    my $upd_voting = $self->db->prepare_cached(
-        q{update voting set passwd = ? where key = ?}
-    );
-
-    $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 => (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' => $id,
-        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;
+    $self->voting($id)->mail_voting_passwd($mailinfo); 
 }
 

trunk/lib/Vote/DB/Voting.pm

@@ -89 +89 @@
     $voteinfo->{description} ||= "";
 
-    my $passwd = random_string(8);
+    my $passwd = Vote::DB::common::random_string(8);
     my $encpasswd = $self->gen_enc_passwd($passwd);
 
@@ -110 +110 @@
         To => $vinfo->{mail},
         Subject => 'Invitation a voter: ' . $voteinfo->{label},
-        'X-Epoll-poll' => $voteinfo->pollid,
+        'X-Epoll-poll' => $self->poll->voteid,
         Vote::DB::common::mail_header(),
     });