Changeset 20 for trunk/lib/Vote/Controller

Timestamp:

03/08/09 15:36:06 (15 years ago)

Author:

nanardon

Message:

• mark untrusted ballot

File:

• trunk/lib/Vote/Controller/Ballot.pm (modified) (4 diffs)

trunk/lib/Vote/Controller/Ballot.pm

@@ -64 +64 @@
     $c->stash->{choices} = { %choices };
     $c->stash->{sbal} = { map { $_ => 1 } $c->req->param('sbal') };
-    $c->stash->{fsbal} = [ map {
+    $c->stash->{fsbal} = [ grep { $_ } map {
         s/^\s+//;
         s/\s+$//;
@@ -71 +71 @@
     } ($c->req->param('fsbal')) ];
 
-    my @torecord = grep { $_ } (
-        (map { $choices{$_} } $c->req->param('sbal')),
-        @{ $c->stash->{fsbal} }
-    );
-    
-    if (scalar(@torecord) > $vote->vote_info($id)->{choice_count}) {
+    my @sbalval = grep { $_ } map { $choices{$_} } $c->req->param('sbal');
+
+    if (scalar(@sbalval) + scalar(@{$c->stash->{fsbal} || []})
+        > $vote->vote_info($id)->{choice_count}) {
         $c->req->param('ballot', '');
         $c->stash->{vote_error} = 'Seulement ' .
@@ -84 +82 @@
     {
         my %uniq;
-        $uniq{lc($_)} foreach(@torecord);
-        if (scalar(keys %uniq) != scalar(@torecord)) {
+        $uniq{lc($_)} = 1 foreach(@sbalval, @{$c->stash->{fsbal} || []});
+        if (scalar(keys %uniq) != scalar(@sbalval) + scalar(@{$c->stash->{fsbal} || []})) {
             $c->req->param('ballot', '');
             $c->stash->{vote_error} = 'Une valeur est en double';
@@ -96 +94 @@
             $uid,
             $id,
-            [ @torecord ],
+            [ @sbalval ],
+            [ @{ $c->stash->{fsbal} } ],
             $c->req->address,
         ); # TODO trap error