Commit info for scoop/lib/Scoop/Admin:
Modified Files:
Polls.pm
Log Message:
Hulver's "multi-choice" poll patch.
-janra
Index: Polls.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Admin/Polls.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -r1.15 -r1.16
496c496
< my $newqid = $S->{DBH}->quote($qid);
---
> my $newqid = $S->dbh->quote($qid);
515,516d514
< $question = $S->{DBH}->quote($question);
<
519a518,524
> $question = $S->dbh->quote($question);
> $current_time = $S->dbh->quote($current_time);
> $voters = $S->dbh->quote($voters);
>
> my $is_multiple_choice = $S->cgi->param('is_multiple_choice') ? 1 : 0;
> $is_multiple_choice = 0 unless ( $S->var('allow_multiple_choice') );
>
523c528
< VALUES => qq|$newqid, $question, "$voters", '$current_time', 0 |,
---
> VALUES => qq|$newqid, $question, $voters, $current_time, 0, $is_multiple_choice |,
567,569c572,574
< my $editqid = $S->{CGI}->param('editqid');
< my $newqid = $S->{CGI}->param('qid');
< my $question = $S->{CGI}->param('question');
---
> my $editqid = $S->cgi->param('editqid');
> my $newqid = $S->cgi->param('qid');
> my $question = $S->cgi->param('question');
571,573d575
< $question = $S->{DBH}->quote($question);
< $editqid = $S->{DBH}->quote($editqid);
< $newqid = $S->{DBH}->quote($newqid);
575c577,581
< my $set = qq| qid = $newqid, question = $question,post_date="$current_time"|;
---
> $question = $S->dbh->quote($question);
> $editqid = $S->dbh->quote($editqid);
> $newqid = $S->dbh->quote($newqid);
> $current_time = $S->dbh->quote($current_time);
> my $set = qq| qid = $newqid, question = $question, post_date=$current_time|;
580a587,588
> my $is_multiple_choice = $S->{CGI}->param('is_multiple_choice')?1:0;
>
593a602
> $set .= ", is_multiple_choice=$is_multiple_choice" if ($S->{UI}->{VARS}->{allow_multiple_choice});
765a775
> my $aidclause;
767a778,783
>
> if ($S->_is_poll_multiple_choice($qid)) {
> $aidclause = 'aid in ('.join (', ', map { $S->{DBH}->quote($_) } $S->{CGI}->param('aid')).')';
> } else {
> $aidclause = 'aid = '.$S->{DBH}->quote($S->{CGI}->param('aid'));
> }
770c786
< my ($rv, $sth) = $S->db_update({
---
> my ($rv, $sth) = $S->db_update({
774c790
< WHERE => "qid='$qid' and aid='$aid'",
---
> WHERE => "qid='$qid' and $aidclause",