Changeset 304 for branches

Timestamp:

05/19/10 23:38:22 (14 years ago)

Author:

nanardon

Message:

• add a new config option making poll creation limit by admin password instead mail confirmation

Location:

branches/1

Files:

• lib/Vote/Controller/Newpoll.pm (modified) (1 diff)
• lib/Vote/Model/Vote.pm (modified) (2 diffs)
• root/templates/newpoll/index.tt (modified) (1 diff)

branches/1/lib/Vote/Controller/Newpoll.pm

@@ -32 +32 @@
     $c->stash->{page}{title} = 'Créer un nouveau vote';
     if ($c->req->param('mail')) {
-        $c->model('Vote')->create_poll_request(
-            mail => $c->req->param('mail'),
-            url => $c->uri_for('/newpoll'),
-            label => $c->req->param('label'),
-        );
-        $c->stash->{template} = 'newpoll/request.tt';
+        if ($c->config->{newpollpasswd}) {
+            if (($c->req->param('passwd') || '') eq $c->config->{newpollpasswd})
+                {
+                    if (my $pid = $c->model('Vote')->create_poll(
+                            $c->req->param('label'),
+                            $c->req->param('mail'),
+                            $c->req->param('vpasswd'),
+                        )
+                    ) {
+                        $c->res->redirect($c->uri_for('/admin', $pid));
+                    }
+                } else {
+                    $c->stash->{passwderror} = 1;
+                }
+        } else {
+            $c->model('Vote')->create_poll_request(
+                mail => $c->req->param('mail'),
+                url => $c->uri_for('/newpoll'),
+                label => $c->req->param('label'),
+            );
+            $c->stash->{template} = 'newpoll/request.tt';
+        }
     }
 

branches/1/lib/Vote/Model/Vote.pm

@@ -893 +893 @@
 }
 
-sub poll_from_request {
-    my ($self, $rid, $passwd) = @_;
-    my $rinfo = $self->poll_request_info($rid) or return;
-
+sub create_poll {
+    my ($self, $label, $mail, $passwd) = @_;
+
+    my $newpollid = $self->_create_poll($label, $mail, $passwd) or return;
+    $self->db->commit;
+
+    $newpollid;
+}
+
+sub _create_poll {
+    my ($self, $label, $mail, $passwd) = @_;
+    
     my $encpasswd = $self->gen_enc_passwd($passwd);
 
@@ -909 +917 @@
     );
 
-    $newpoll->execute($newpollid, $rinfo->{label}, $rinfo->{mail}, $encpasswd);
+    $newpoll->execute($newpollid, $label, $mail, $encpasswd);
     # set some default
     $self->vote_param($newpollid,
         free_choice => 0,
         choice_count => 1,
-    );     
+    );
+
+    $newpollid;
+}
+
+sub poll_from_request {
+    my ($self, $rid, $passwd) = @_;
+    my $rinfo = $self->poll_request_info($rid) or return;
+
+    my $newpollid = $self->_create_poll(
+        $rinfo->{label}, $rinfo->{mail}, $passwd
+    ) or return;
 
     my $delreq = $self->db->prepare_cached(

branches/1/root/templates/newpoll/index.tt

@@ -8 +8 @@
 <tr><th>votre mail:</th><td><input type="text" name="mail" tabindex="1" size="45" maxlength="150"></td></tr>
 <tr><th>nom du vote:</th><td><input type="text" name="label" tabindex="2" size="45" maxlength="150"></td></tr>
+[% IF c.config.newpollpasswd %]
+<tr><th>mot de passe pour ce vote:</th><td><input type="password" name="vpasswd" tabindex="3"></td></tr>
+[% IF passwderror %]
+<tr><td colspan="2" class="alert">
+    Mot de passe site invalide
+</td></tr>
+[% END %]
+<tr><th>mot de passe site:</th><td><input type="password" name="passwd" tabindex="4"></td></tr>
+[% END %]
 <!-- Cf http://forge.ipsl.jussieu.fr/epoll/ticket/1
 <tr><th>mot de passe:</th><td><input type="password" name="vpasswd"></td></tr>