Changeset 206 for trunk/lib/Vote/Controller/Admin.pm

Timestamp:

04/16/09 00:16:56 (15 years ago)

Author:

nanardon

Message:

• kill some old function usage

File:

• trunk/lib/Vote/Controller/Admin.pm (modified) (13 diffs)

trunk/lib/Vote/Controller/Admin.pm

@@ -37 +37 @@
     my $id = $c->stash->{voteid};
 
-    my $vote = $c->model('Vote');
     my $poll = $c->model('Vote')->poll($id);
     for ($poll->status || '') {
     /^BEFORE$/ and do {
         if ($c->req->param('addch')) {
-            $vote->vote_add_choice($id, $c->req->param('addch'))
-                and $vote->commit;
+            $poll->add_choice($c->req->param('addch'))
+                and $poll->commit;
         } elsif ($c->req->param('delch')) {
-            $vote->delete_choice($c->req->param('delch'))
-                and $vote->commit;
+            $poll->delete_choice($c->req->param('delch'))
+                and $poll->commit;
         } elsif ($c->req->param('pollparam')) {
             if ($c->req->param('dstart')) {
@@ -59 +58 @@
             }
             if ($c->req->param('end') && $c->req->param('start')) {
-                if ($vote->check_date_max($c->req->param('start'))) {
-                    if (! $vote->check_date_max($c->req->param('end'), $c->req->param('start'))) {
+                if ($poll->check_date_max($c->req->param('start'))) {
+                    if (! $poll->check_date_max($c->req->param('end'), $c->req->param('start'))) {
                         $c->stash->{dateerror} = "Le vote se termine avant de commencer";
                         next;
@@ -76 +75 @@
                 grep { exists($c->req->params->{$_}) }
                 qw(label description start end choice_count free_choice)
-            ) and $vote->commit;
+            ) and $poll->commit;
         } elsif ($c->req->param('encrypted')) {
             my $passphrase = $c->req->param('passphrase') ||
                 $c->session->{'vpass' . $c->stash->{voteid}};
             $poll->gen_poll_keys($passphrase)
-                and $vote->commit;
+                and $poll->commit;
         } elsif ($c->req->param('notcrypted')) {
             $poll->param(public_key => undef, private_key => undef)
-                and $vote->commit;
+                and $poll->commit;
         }
     };
@@ -90 +89 @@
     /^(BEFORE|RUNNING)$/ and do {
         if (my ($upload) = $c->req->upload('votinglist')) {
-            $vote->voting_from_file(
-                $id,
+            $poll->voting_from_file(
                 $upload->fh,
                 $c->req->param('delete'),
-            ) and $vote->commit;
+            ) and $poll->commit;
         } elsif($c->req->param('delvoting')) {
-            $vote->delete_voting($c->req->param('delvoting'))
-                and $vote->commit;
+            $poll->delete_voting($c->req->param('delvoting'))
+                and $poll->commit;
         } elsif ($c->req->param('mail')) {
-            $vote->addupd_voting($id, $c->req->param('mail'), $c->req->param('id'))
-                and $vote->commit;
+            $poll->addupd_voting($c->req->param('mail'), $c->req->param('id'))
+                and $poll->commit;
         } elsif($c->req->param('mailpasswd')) {
             # TODO
@@ -125 +123 @@
     /^AFTER$/ and do {
         if ($c->req->param('mapfrom') && $c->req->param('mapto')) {
-            $vote->vote_map_value(
+            $poll->map_value(
                 $id,
                 $c->req->param('mapfrom'),
@@ -131 +129 @@
             );
         }
-        foreach my $bid ($vote->list_vote_ballot_needvalid($id)) {
+        foreach my $bid ($poll->list_ballot_needvalid) {
             if (!$c->req->param($bid)) {
                 next;
             } elsif($c->req->param($bid) eq 'invalid') {
-                $vote->mark_ballot_invalid($bid, 1);
-                $vote->commit;
+                $poll->ballot($bid)->mark_invalid(1);
+                $poll->commit;
             } elsif($c->req->param($bid) eq 'valid') {
-                $vote->mark_ballot_invalid($bid, 0);
-                $vote->commit;
+                $poll->ballot($bid)->mark_invalid(0);
+                $poll->commit;
             }
         }
@@ -160 +158 @@
 sub auth : Private {
     my ($self, $c) = @_;
-    my $vote = $c->model('Vote');
+    my $poll = $c->model('Vote')->poll($c->stash->{voteid});
     my $password = $c->session->{'vpass' . $c->stash->{voteid}} ||
         $c->req->param('vpass' . $c->stash->{voteid});
 
-    if (!$c->model('Vote')->auth_poll($c->stash->{voteid}, $password)) {
-        $c->stash->{page}{title} = $vote->vote_info(
-            $c->stash->{voteid}
-        )->{label} . ': Login d\'administration';
+    if (!$poll->auth_poll($password)) {
+        $c->stash->{page}{title} = $poll->info('label') .
+            ': Login d\'administration';
         $c->session->{'vpass' . $c->stash->{voteid}} = undef;
         $c->stash->{template} = 'admin/login.tt';
@@ -179 +176 @@
     my ( $self, $c, undef, $id ) = @_;
     $c->stash->{voteid} = $id;
-    my $vote = $c->model('Vote');
-
-    $vote->vote_info($id) or do {
+    my $poll = $c->model('Vote')->poll($id);
+
+    $poll->info or do {
         $c->res->redirect($c->uri_for('/'));
         return;
@@ -188 +185 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $c->model('Vote')->vote_info($id)->{label} . ': Administration';
+    $c->stash->{page}{title} = $poll->info('label') . ': Administration';
 }
 
@@ -194 +191 @@
     my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };
-    my $vote = $c->model('Vote');
-
-    $vote->vote_info($c->stash->{voteid}) or do {
+    my $poll = $c->model('Vote')->poll($c->stash->{voteid});
+
+    $poll->info or do {
         $c->res->redirect($c->uri_for('/'));
         return;
@@ -203 +200 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $c->model('Vote')->vote_info(
-        $c->stash->{voteid}
-    )->{label} . ': Administration, liste des electeurs';
+    $c->stash->{page}{title} = $poll->info('label') . ': Administration, liste des electeurs';
 }
 
@@ -211 +206 @@
     my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };
-    my $vote = $c->model('Vote');
-
-    $vote->vote_info($c->stash->{voteid}) or do {
+    my $poll = $c->model('Vote')->poll($c->stash->{voteid});
+
+    $poll->info or do {
         $c->res->redirect($c->uri_for('/'));
         return;
@@ -220 +215 @@
     $c->forward('auth') or return;
     $c->forward('modify_poll');
-    $c->stash->{page}{title} = $c->model('Vote')->vote_info(
-        $c->stash->{voteid}
-    )->{label} . ': Administration, bulletin';
+    $c->stash->{page}{title} = $poll->info('label') . ': Administration, bulletin';
 }
 
 sub privatekey : LocalRegex('^(\d+)/privatekey$') {
-    my ($self, $c, $id, @sub) = @_;
+    my ($self, $c) = @_;
     ($c->stash->{voteid}) = @{ $c->req->snippets || [] };
-    my $vote = $c->model('Vote');
-
-    $vote->vote_info($id) or do {
-        $c->res->redirect($c->uri_for('/'));
-        return;
-    };
-    $c->response->body($vote->vote_info($c->stash->{voteid})->{private_key} || '');
+    my $poll = $c->model('Vote')->poll($c->stash->{voteid});
+
+    $poll->info or do {
+        $c->res->redirect($c->uri_for('/'));
+        return;
+    };
+    $c->response->body($poll->info('private_key') || '');
 }