Changeset 325

Timestamp:

10/04/10 21:19:15 (14 years ago)

Author:

nanardon

Message:

• fix decrypt() when poll is uncrypted

Location:

trunk/lib/Epoll

Files:

• Controller/Admin.pm (modified) (1 diff)
• DB/Poll/Bdata.pm (modified) (1 diff)

trunk/lib/Epoll/Controller/Admin.pm

@@ -121 +121 @@
             my $passphrase = $c->req->param('passphrase') ||
                 $c->session->{'vpass' . $c->stash->{voteid}};
-            if ($c->model('Vote')->
-                poll($c->stash->{voteid})->
-                private_key($passphrase)) {
                 $c->model('Vote')->poll($c->stash->{voteid})->decrypted_ballots(
                     $passphrase
                 );
-            } else {
-            }
         }
         if ($c->req->param('publish')) {

trunk/lib/Epoll/DB/Poll/Bdata.pm

@@ -128 +128 @@
     my $ballot = $sth->fetchrow_hashref;
     $sth->finish;
-    $self->_load_crypted_data($ballot->{data}, $ballot->{enckey}, $privkey);
+    if ($ballot->{enckey}) {
+        $self->_load_crypted_data($ballot->{data}, $ballot->{enckey}, $privkey);
+    } else {
+        return $ballot->{data}
+    }
 }