'. t('No votes have been recorded for this poll.') .'
'; @@ -1111,6 +1128,26 @@ function _advpoll_vote_response($node, $ $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->nid); $ajax_output .= advpoll_view_results($node, NULL, NULL); // Remove linebreaks as they will break jQuery's insert-HTML methods @@ -1161,13 +1198,19 @@ function advpoll_cancel($nid) { db_query("DELETE FROM {votingapi_vote} WHERE content_id=%d and hostname = '%s' AND uid=0", $node->nid, $host); votingapi_recalculate_results('advpoll', $nid); } + + $mode = _advpoll_get_mode($node->type); + $function = 'advpoll_cancel_'. $mode; + if (function_exists($function)) { + $function($node, $user_vote); + } drupal_set_message(t('Your vote was canceled.')); } else { drupal_set_message(t("You are not allowed to cancel an invalid choice."), 'error'); } drupal_goto('node/'. $nid); - } + } else { drupal_not_found(); } @@ -1245,3 +1288,87 @@ function _advpoll_form_set_error($name = return form_set_error('choice[', $message); } } + +/** + * 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, $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 => $value) { + // 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->show_writeins || !$value['writein'])) { + _advpoll_form_set_error('writein_choice', t("A write-in vote can not be for an existing choice. Select the choice's option instead."), $ajax); + } + } + } + + // The write-in option is selected and there is nothing in the write-in textbox. + if ($writein_option && !$writein_text) { + _advpoll_form_set_error('writein_choice', t("If the 'write-in' option is selected, a choice must be written in."), $ajax); + } + + // The write-in option is not selected, but there is something in the write-in textbox. + if (!$writein_option && $writein_text) { + _advpoll_form_set_error('writein_choice', t("If a choice is written in, the 'write-in' option must be selected."), $ajax); + } + } +} + +/** + * 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: modes/binary.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/advpoll/modes/binary.inc,v retrieving revision 1.7.2.23 diff -u -p -r1.7.2.23 binary.inc --- modes/binary.inc 6 Aug 2007 08:47:19 -0000 1.7.2.23 +++ modes/binary.inc 1 Sep 2007 19:50:49 -0000 @@ -33,13 +33,24 @@ function advpoll_voting_binary_form(&$no // If previewing check the format against the current users permissions. $check = $node->in_preview; foreach ($node->choice as $i => $choice) { - // Don't show blank choices - if ($choice['label']) { + // Don't show blank choices or write-in votes if the setting is disabled. + if ($choice['label'] && ($node->show_writeins || !$choice['writein'])) { $list[$i] = _advpoll_choice_markup($choice['label'], $node->format, $check); } } + // Add write-in checkbox/radio if write-ins are enabled and user has permission. + if ($node->writeins && user_access('add write-ins')) { + $list[$i + 1] = t('(write-in)'); + $form['writein_key'] = array( + '#type' => 'value', + '#value' => $i + 1, + ); + } + $form['choice'] = array( '#options' => $list, + '#prefix' => '