',
@@ -309,7 +325,7 @@
$form['settings']['runtime'] = array(
'#type' => 'select',
'#title' => t('Duration'),
- '#default_value' => ($node->runtime? $node->runtime : 0),
+ '#default_value' => isset($node->runtime)? $node->runtime : 0,
'#options' => $_duration,
'#description' => t('After this period, the poll will be closed automatically. This is relative to the start date if it is specified, otherwise the date the poll was created.')
);
@@ -358,7 +374,7 @@
function advpoll_load($node) {
global $user;
$poll = db_fetch_object(db_query("SELECT * FROM {advpoll} WHERE nid = %d", $node->nid));
- $result = db_query("SELECT vote_offset, label FROM {advpoll_choices} WHERE nid = %d ORDER BY vote_offset", $node->nid);
+ $result = db_query("SELECT vote_offset, label, writein FROM {advpoll_choices} WHERE nid = %d ORDER BY vote_offset", $node->nid);
while ($choice = db_fetch_array($result)) {
$poll->choice[$choice['vote_offset']] = $choice;
}
@@ -785,7 +801,7 @@
* Implementation of hook_perm().
*/
function advpoll_perm() {
- return array('create polls', 'delete polls', 'view polls', 'vote on polls', 'cancel own vote', 'administer polls', 'inspect all votes');
+ return array('create polls', 'delete polls', 'view polls', 'vote on polls', 'cancel own vote', 'administer polls', 'inspect all votes', 'add write-ins');
}
/**
@@ -838,11 +854,12 @@
$node->settings['active'] = _advpoll_calculate_active($node);
}
- db_query("UPDATE {advpoll} SET active=%d, runtime=%d, maxchoices=%d, algorithm='%s', uselist=%d, showvotes=%d, startdate=%s WHERE nid = %d",
+ db_query("UPDATE {advpoll} SET active=%d, runtime=%d, maxchoices=%d, algorithm='%s', uselist=%d, showvotes=%d, startdate='%s', writeins=%d, displaywriteins=%d WHERE nid = %d",
$node->settings['active'], $node->settings['runtime'],
$node->settings['maxchoices'], $node->settings['algorithm'],
$node->settings['uselist'], $node->settings['showvotes'],
$node->settings['usestart']? _advpoll_create_startdate($node): 'NULL',
+ $node->settings['writeins'], $node->settings['displaywriteins'],
$node->nid);
_advpoll_insert_choices($node);
@@ -886,7 +903,7 @@
$i = 1;
foreach ($_POST['choice'] as $choice) {
if ($choice['label'] != '') {
- db_query("INSERT INTO {advpoll_choices} (nid, label, vote_offset) VALUES (%d, '%s', %d)", $node->nid, $choice['label'], $i++);
+ db_query("INSERT INTO {advpoll_choices} (nid, label, vote_offset, writein) VALUES (%d, '%s', %d, 0)", $node->nid, $choice['label'], $i++);
}
}
}
@@ -913,11 +930,12 @@
$node->settings['active'] = _advpoll_calculate_active($node);
}
- db_query("INSERT INTO {advpoll} (nid, mode, uselist, active, runtime, maxchoices, algorithm, showvotes, startdate) VALUES (%d, '%s', %d, %d, %d, %d, '%s', %d, %s)",
+ db_query("INSERT INTO {advpoll} (nid, mode, uselist, active, runtime, maxchoices, algorithm, showvotes, startdate, writeins, displaywriteins) VALUES (%d, '%s', %d, %d, %d, %d, '%s', %d, '%s', %d, %d)",
$node->nid, $mode, $node->settings['uselist'], $node->settings['active'],
$node->settings['runtime'], $node->settings['maxchoices'],
$node->settings['algorithm'], $node->settings['showvotes'],
- $node->settings['usestart']? _advpoll_create_startdate($node): 'NULL');
+ $node->settings['usestart']? _advpoll_create_startdate($node): 'NULL',
+ $node->settings['writeins'], $node->settings['displaywriteins']);
// Insert the choices
_advpoll_insert_choices($node);
@@ -982,17 +1000,23 @@
$realchoices++;
}
}
+
+ // Add one to choices counter if write-ins are enabled for this node.
+ if ($node->writeins) {
+ $realchoices++;
+ }
if ($realchoices < 2) {
form_set_error("choice][$realchoices][label", t('You must fill in at least two choices.'));
}
- /* Validate maxchoices since it has #DANGEROUS_SKIP_CHECK set to true */
+ // Validate maxchoices since it has #DANGEROUS_SKIP_CHECK set to true.
if ($node->settings['maxchoices'] < 0) {
form_set_error('settings][maxchoices]', t('Maximum choices must be a non-negative integer.'));
}
- if ($node->settings['maxchoices'] > count($node->choice)) {
+ if ((!$node->writeins && $node->settings['maxchoices'] > count($node->choice)) ||
+ (( $node->writeins && $node->settings['maxchoices'] > count($node->choice) + 1))) {
form_set_error('settings][maxchoices]', t('Maximum choices cannot be larger than the number of choices submitted.'));
}
}
@@ -1059,7 +1083,7 @@
function theme_advpoll_results($title, $results, $votes, $links, $nid, $voted, $cancel_vote) {
$output .= '
';
$output .= $results;
- $output .= '
'. t('Total votes: %votes', array('%votes' => $votes)) .'
';
+ $output .= '
'. t('Total voters: %votes', array('%votes' => $votes)) .'
';
$output .= '
';
return $output;
}
@@ -1097,9 +1121,28 @@
$msg = t('Your vote was registered.');
// Ajax response
if ($form_values['ajax']) {
+ // Unset the array of choices so duplicates aren't shown.
+ unset($node->choice);
+ // Get all choices from database. This is necessary to get information about
+ // newly submitted write-in choices.
+ $result = db_query("SELECT vote_offset, label, writein FROM {advpoll_choices} WHERE nid = %d ORDER BY vote_offset", $node->nid);
+ while ($choice = db_fetch_array($result)) {
+ $node->choice[$choice['vote_offset']] = $choice;
+ }
+ // Update the number of choices.
+ $node->choices = count($poll->choice);
+ // Get updated total number of votes from database.
+ $result = db_query("SELECT value FROM {votingapi_cache} where content_type='advpoll' AND content_id=%d AND tag='_advpoll' AND function='total_votes'", $node->nid);
+ if (db_num_rows($result) > 0) {
+ $cache = db_fetch_object($result);
+ $node->votes = $cache->value;
+ }
+ else {
+ $node->votes = 0;
+ }
list($node->voted, $node->cancel_vote) = _advpoll_user_voted($node);
$ajax_output .= advpoll_view_results($node, NULL, NULL);
- // Remove linebreaks as they will break jQuery's insert-HTML methods
+ // Remove linebreaks as they will break jQuery's insert-HTML methods.
$ajax_output = str_replace("\n", '', $ajax_output);
drupal_set_header('Content-Type: text/plain; charset=utf-8');
print drupal_to_js(array('statusMsgs' => '
'. $msg .'
', 'response' => $ajax_output));
@@ -1217,3 +1260,108 @@
return $text;
}
+
+/**
+ * Voting form validation logic specific to writeins. This has been abstracted
+ * away from includes in the modes directory.
+ */
+function _advpoll_writeins_voting_form_validate($node, $writein_option, $writein_text, &$errors, &$ok, $ajax) {
+ // Do write-in specific checks if write-ins are enabled and user has permission.
+ if ($node->writeins && user_access('add write-ins')) {
+ // Something is in the write-in textbox.
+ if ($writein_text) {
+ $writein_choice_lower = strtolower($writein_text);
+ foreach ($node->choice as $i => $val) {
+ // Check that user isn't writing in an existing visible choice. (User is
+ // writing in an existing choice and either write-ins are all being
+ // displayed or the existing choice is not a write-in).
+ if ((strtolower($val['label']) == $writein_choice_lower) && ($node->displaywriteins || !$val['writein'])) {
+ $msg = t("A write-in vote can not be for an existing choice. Select the choice's option instead.");
+ if ($ajax) {
+ $errors[] = $msg;
+ }
+ else {
+ form_set_error('writein_choice', $msg);
+ }
+ $ok = false;
+ }
+ }
+ }
+
+ // The write-in option is selected and there is nothing in the write-in textbox.
+ if ($writein_option && !$writein_text) {
+ $msg = t("If the 'write-in' option is selected, a choice must be written in.");
+ if ($ajax) {
+ $errors[] = $msg;
+ }
+ else {
+ form_set_error('writein_choice', $msg);
+ }
+ $ok = false;
+ }
+
+ // The write-in option is not selected, but there is something in the write-in textbox.
+ if (!$writein_option && $writein_text) {
+ $msg = t("If a choice is written in, the 'write-in' option must be selected.");
+ if ($ajax) {
+ $errors[] = $msg;
+ }
+ else {
+ form_set_error('writein_choice', $msg);
+ }
+ $ok = false;
+ }
+ }
+}
+
+/**
+ * Voting form submission logic specific to writeins. This has been abstracted
+ * away from includes in the modes directory.
+ */
+function _advpoll_writeins_voting_form_submit($node, $form_values, &$vote, $vote_value) {
+ // A write-in vote is being made.
+ if ($form_values['writein_choice']) {
+ // Check if someone has previously voted for this choice.
+ $result = db_query("SELECT vote_offset FROM {advpoll_choices} WHERE nid = %d AND LOWER(label) = LOWER('%s')", $node->nid, $form_values['writein_choice']);
+ // If there's more than one match, redo the query, being more exact.
+ if (db_num_rows($result) > 1) {
+ $result = db_query("SELECT vote_offset FROM {advpoll_choices} WHERE nid = %d AND label = '%s'", $node->nid, $form_values['writein_choice']);
+ }
+ // If there is at least one match, add a vote for the first one returned. It
+ // should be rare to find more than one choice for any one node with a given
+ // label.
+ if (db_num_rows($result)) {
+ $obj = db_fetch_object($result);
+ $existing_vote_offset = $obj->vote_offset;
+ // Set a vote
+ unset($temp);
+ $temp->value = $vote_value;
+ $temp->tag = $existing_vote_offset;
+ $temp->value_type = 'option';
+ $vote[] = $temp;
+ }
+ // This write-in choice has not been previously voted for.
+ else {
+ // Get last vote offset for this node.
+ $result = db_query("SELECT MAX(vote_offset) as last_vote_offset FROM {advpoll_choices} WHERE nid = %d", $node->nid);
+ $obj = db_fetch_object($result);
+ // Set the last tag value
+ $last_vote_offset = $obj->last_vote_offset;
+ // Default value
+ if (!$last_vote_offset) {
+ // Start at one rather than 0 due to Drupal FormAPI.
+ $last_vote_offset = 1;
+ }
+
+ // Insert new choice into node.
+ db_query("INSERT INTO {advpoll_choices} (nid, label, vote_offset, writein) VALUES (%d, '%s', %d, 1)", $node->nid, check_plain($form_values['writein_choice']), $last_vote_offset+1);
+
+ // Add vote
+ unset($temp);
+ $temp->value = $vote_value;
+ $temp->tag = $last_vote_offset+1;
+ $temp->value_type = 'option';
+ $vote[] = $temp;
+ }
+ }
+}
Index: advpoll-form.js
===================================================================
RCS file: /cvs/drupal/contributions/modules/advpoll/advpoll-form.js,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 advpoll-form.js
--- advpoll-form.js 29 Nov 2006 06:02:48 -0000 1.1.2.2
+++ advpoll-form.js 10 Jun 2007 23:17:45 -0000
@@ -4,7 +4,7 @@
Drupal.advpoll = {};
}
-// Update maxchoices, called when adding and removing choices
+// Update maxchoices, called when adding and removing choices.
Drupal.advpoll.maxChoices = function(newChoiceN) {
var selected = $("#edit-settings-maxchoices").val();
var label = $("#edit-settings-maxchoices").prev();
@@ -27,7 +27,7 @@
$(newMaxChoices).insertAfter(label);
}
-// Click event for Remove link, called on pageload and when Add choice is clicked
+// Click event for Remove link, called on pageload and when Add choice is clicked.
Drupal.advpoll.removeChoiceClick = function() {
$('a.remove-choice').unclick().click(function() {
var nextRemoveLink = $(this).parent().next().find(".remove-choice");
@@ -45,7 +45,11 @@
// Give each label it's correct number
$(this).html($(this).html().replace(/\d+(?=<)/g, i++));
});
-
+ // Add an extra maxChoice if write-ins are enabled
+ if ($("#edit-settings-writeins").attr("checked")) {
+ i++;
+ }
+
Drupal.advpoll.maxChoices(i-1);
return false;
@@ -67,6 +71,21 @@
}
}
+// Update maxChoices and show/hide "display write-ins" option when user checks/
+// unchecks the write-ins box.
+Drupal.advpoll.updateWriteins = function() {
+ if ($("#edit-settings-writeins").attr("checked")) {
+ Drupal.advpoll.maxChoices($("#edit-settings-maxchoices").children().length);
+ $(".edit-settings-displaywriteins").show();
+ $("#edit-settings-displaywriteins").removeAttr("disabled");
+ }
+ else {
+ Drupal.advpoll.maxChoices($("#edit-settings-maxchoices").children().length - 2);
+ $(".edit-settings-displaywriteins").hide();
+ $("#edit-settings-displaywriteins").attr("disabled", "disabled");
+ }
+}
+
Drupal.advpoll.nodeFormAutoAttach = function() {
// Hide "need more choices" checkbox
$("#morechoices").hide();
@@ -75,6 +94,15 @@
Drupal.advpoll.updateStartDate();
$("#edit-settings-usestart").click(Drupal.advpoll.updateStartDate);
+ // Remove extra maxChoices entry from write-ins
+ if (!$("#edit-settings-writeins").attr("checked")) {
+ Drupal.advpoll.maxChoices($("#edit-settings-maxchoices").children().length-2);
+ }
+
+ // Add behavior when write-in box is (un)checked.
+ Drupal.advpoll.updateWriteins();
+ $("#edit-settings-writeins").click(Drupal.advpoll.updateWriteins);
+
// Insert Remove links
$('
' + Drupal.settings.advPoll.remove + '').insertAfter("input.choices");
Drupal.advpoll.removeChoiceClick();
@@ -86,16 +114,21 @@
var newChoiceN = $("input.choices").length + 1;
// If all choices are removed, use a "backup" of the first choice, else clone the first.
newChoice = ($("input.choices:first").parent().html() ? $("input.choices:first").parent().clone() : newChoice);
- // Replace choice numbers in label, name and id with the new choice number
+ // Replace choice numbers in label, name and id with the new choice number.
newChoice.html(newChoice.html().replace(/\d+(?=<)|\d+(?=-)|\d+(?=\])/g, newChoiceN));
// Clear the value, insert and fade in.
newChoice.find("input").val("").end().insertBefore("#morechoices").fadeIn();
- // Update hidden form values
+ // Update hidden form values.
$("#edit-choices").val(newChoiceN);
$("#edit-changed").val($("#edit-changed").val() + 1);
Drupal.advpoll.removeChoiceClick();
+ // Add an extra maxChoice if write-ins are enabled.
+ if ($("#edit-settings-writeins").attr("checked")) {
+ newChoiceN++;
+ }
+
Drupal.advpoll.maxChoices(newChoiceN);
return false;
Index: advpoll.install
===================================================================
RCS file: /cvs/drupal/contributions/modules/advpoll/advpoll.install,v
retrieving revision 1.5.2.9
diff -u -r1.5.2.9 advpoll.install
--- advpoll.install 10 May 2007 23:38:02 -0000 1.5.2.9
+++ advpoll.install 10 Jun 2007 23:17:45 -0000
@@ -20,6 +20,8 @@
`algorithm` VARCHAR(100),
`showvotes` tinyint,
`startdate` int unsigned,
+ `writeins` tinyint NOT NULL default '0',
+ `displaywriteins` tinyint NOT NULL default '0',
PRIMARY KEY (`nid`)
) /*!40100 DEFAULT CHARACTER SET utf8 */");
@@ -33,6 +35,7 @@
`nid` int(10) NOT NULL,
`label` text NOT NULL,
`vote_offset` int(2) unsigned default NULL,
+ `writein` tinyint NOT NULL default '0',
PRIMARY KEY (`nid`, `vote_offset`),
KEY `vote_offset` (`vote_offset`)
) /*!40100 DEFAULT CHARACTER SET utf8 */");
@@ -50,6 +53,8 @@
algorithm varchar(100),
showvotes smallint,
startdate integer,
+ writeins smallint NOT NULL DEFAULT '0',
+ displaywriteins smallint NOT NULL DEFAULT '0',
PRIMARY KEY (nid)
)");
@@ -63,6 +68,7 @@
nid integer NOT NULL,
label text NOT NULL,
vote_offset smallint DEFAULT NULL,
+ writein smallint NOT NULL DEFAULT '0',
PRIMARY KEY (nid, vote_offset)
)");
db_query("CREATE INDEX {advpoll_choices}_vote_offset_idx ON {advpoll_choices} (vote_offset)");
@@ -121,3 +127,24 @@
}
return $ret;
}
+
+/**
+ * Add columns for write-in support.
+ */
+function advpoll_update_2() {
+ $ret = array();
+ switch ($GLOBALS['db_type']) {
+ case 'mysql':
+ case 'mysqli':
+ $ret[] = update_sql("ALTER TABLE {advpoll} ADD `writeins` TINYINT NOT NULL DEFAULT '0'");
+ $ret[] = update_sql("ALTER TABLE {advpoll} ADD `displaywriteins` TINYINT NOT NULL DEFAULT '0'");
+ $ret[] = update_sql("ALTER TABLE {advpoll_choices} ADD `writein` TINYINT NOT NULL DEFAULT '0'");
+ break;
+ case 'pgsql':
+ db_add_column($ret, 'advpoll', 'writeins', 'smallint', array('default' => 0, 'not null' => TRUE));
+ db_add_column($ret, 'advpoll', 'displaywriteins', 'smallint', array('default' => 0, 'not null' => TRUE));
+ db_add_column($ret, 'advpoll_choices', 'writein', 'smallint', array('default' => 0, 'not null' => TRUE));
+ break;
+ }
+ return $ret;
+}