'. t('Note: adding or removing choices after voting has begun is not recommended.') .'
',
);
-
- $form['choice']['morechoices'] = array(
+ $form['choice']['more_choices'] = array(
'#type' => 'checkbox',
'#title' => t('Need more choices'),
'#value' => 0,
- '#parents' => array('morechoices'), // Don't pollute $form['choice']
- '#prefix' => '',
+ '#parents' => array('more_choices'), // Don't pollute $form['choice']
+ '#prefix' => '
',
'#suffix' => '
',
- '#description' => t("If the amount of boxes above isn't enough, check this box and click the Preview button below to add some more."),
- '#weight' => 1
+ '#description' => t("If the number of choices above isn't enough, check this box and click the Preview button below to double the number of choices."),
+ '#weight' => 1,
);
// First, loop through any currently existing choices.
$current_choices = 0;
if (isset($node->choice)) {
foreach ($node->choice as $index => $choice) {
- $form['choice'][$index]['label'] = array(
+ $form['choice'][$index]['label'] = array(
'#type' => 'textfield',
'#title' => t('Choice %n', array('%n' => $current_choices + 1)) . ($choice['writein'] ? ' '. t('(write-in)') : ''),
'#default_value' => $choice['label'],
@@ -240,9 +239,9 @@ function advpoll_form($node, $form_value
$form['settings']['maxchoices'] = array(
'#type' => 'select',
'#title' => t('Maximum choices'),
- '#default_value' => ($node->maxchoices? $node->maxchoices : variable_get('advpoll_maxchoices_'. $type->type, ADVPOLL_MAXCHOICES)),
+ '#default_value' => ($node->maxchoices ? $node->maxchoices : variable_get('advpoll_maxchoices_'. $type->type, ADVPOLL_MAXCHOICES)),
'#options' => $max_choice_list,
- '#DANGEROUS_SKIP_CHECK' => true, // Allow jQuery to add new options
+ '#DANGEROUS_SKIP_CHECK' => TRUE, // Allow jQuery to add new options
'#description' => t('Limits the total number of choices voters may select.')
);
@@ -295,13 +294,12 @@ function advpoll_form($node, $form_value
// Settings available for users with 'administer polls' permission.
$default_uselist = isset($node->uselist) ? $node->uselist : variable_get('advpoll_electoral_list_'. $type->type, ADVPOLL_ELECTORAL_LIST);
$default_showvotes = isset($node->showvotes) ? $node->showvotes : variable_get('advpoll_showvotes_'. $type->type, ADVPOLL_SHOWVOTES);
- $default_writeins = isset($node->writeins)? $node->writeins : variable_get('advpoll_writeins_'. $type->type, ADVPOLL_WRITEINS);
- $default_show_writeins = isset($node->show_writeins)? $node->show_writeins : variable_get('advpoll_show_writeins_'. $type->type, ADVPOLL_SHOW_WRITEINS);
+ $default_writeins = isset($node->writeins) ? $node->writeins : variable_get('advpoll_writeins_'. $type->type, ADVPOLL_WRITEINS);
+ $default_show_writeins = isset($node->show_writeins) ? $node->show_writeins : variable_get('advpoll_show_writeins_'. $type->type, ADVPOLL_SHOW_WRITEINS);
if (user_access('administer polls')) {
$form['settings']['admin_note'] = array(
'#value' => '
'. t('The settings below are only available for users with the administer polls permission.') .'
',
);
-
$form['settings']['writeins'] = array(
'#type' => 'checkbox',
'#title' => t('Allow users to cast a write-in vote'),
@@ -309,7 +307,6 @@ function advpoll_form($node, $form_value
'#description' => t('Allow voters with the "add write-ins" permission to write-in up to one choice each.'),
'#attributes' => array('class' => 'settings-writeins'),
);
-
$form['settings']['show_writeins'] = array(
'#type' => 'checkbox',
'#title' => t('Display write-in votes as choices for future voters'),
@@ -318,14 +315,12 @@ function advpoll_form($node, $form_value
'#prefix' => '
',
'#suffix' => '
',
);
-
$form['settings']['uselist'] = array(
'#type' => 'checkbox',
'#title' => t('Restrict voting to electoral list'),
'#description' => t('If enabled, a list of eligible voters will be created and only that group will be able to vote in the poll.'),
'#default_value' => $default_uselist,
);
-
$form['settings']['showvotes'] = array(
'#type' => 'checkbox',
'#title' => t('Show individual votes'),
@@ -342,7 +337,7 @@ function advpoll_form($node, $form_value
}
}
else {
- // Just pass the values for users without the 'administer polls' permission.
+ // Just pass the values for users without the "administer polls" permission.
$defaults = array('uselist' => $default_uselist, 'showvotes' => $default_showvotes, 'writeins' => $default_writeins, 'show_writeins' => $default_show_writeins);
foreach ($defaults as $name => $value) {
$form['settings'][$name] = array(
@@ -373,7 +368,6 @@ function advpoll_form_alter($form_id, &$
'#title' => t('Poll settings'),
'#collapsible' => TRUE,
);
-
$form['advpoll']['advpoll_maxchoices'] = array(
'#type' => 'select',
'#title' => t('Default maximum choices'),
@@ -402,15 +396,13 @@ function advpoll_form_alter($form_id, &$
'#options' => array(0 => t('Unlimited')) + drupal_map_assoc(array(86400, 172800, 345600, 604800, 1209600, 1814400, 2419200, 4838400, 9676800, 31536000), 'format_interval'),
'#description' => t('The date the poll was created is used as start date for the default duration. This setting can be overridden on the poll edit page.'),
);
-
$form['advpoll']['advpoll_writeins'] = array(
'#type' => 'checkbox',
'#title' => t('Allow users to cast a write-in vote by default'),
'#default_value' => variable_get('advpoll_writeins_'. $node_type, ADVPOLL_WRITEINS),
- '#description' => t("Allow voters with the 'add write-ins' permission to write-in up to one choice each. Users with the
administer polls permission will be able to override this setting."),
+ '#description' => t('Allow voters with the "add write-ins" permission to write-in up to one choice each. Users with the
administer polls permission will be able to override this setting.'),
'#attributes' => array('class' => 'settings-writeins'),
);
-
$form['advpoll']['advpoll_show_writeins'] = array(
'#type' => 'checkbox',
'#title' => t('Display write-in votes as choices for future voters by default'),
@@ -419,14 +411,12 @@ function advpoll_form_alter($form_id, &$
'#prefix' => '
',
'#suffix' => '
',
);
-
$form['advpoll']['advpoll_electoral_list'] = array(
'#type' => 'checkbox',
'#title' => t('Use electoral list by default'),
'#description' => t('Use an electoral list by default for new polls. Users with the
administer polls permission will be able to override this setting.'),
'#default_value' => variable_get('advpoll_electoral_list_'. $node_type, ADVPOLL_ELECTORAL_LIST),
);
-
$form['advpoll']['advpoll_showvotes'] = array(
'#type' => 'checkbox',
'#title' => t('Show individual votes by default'),
@@ -439,7 +429,7 @@ function advpoll_form_alter($form_id, &$
'aftervote' => t('After user has voted'),
'afterclose' => t('After voting has closed'),
);
-
+
$form['advpoll']['advpoll_view_results'] = array(
'#type' => 'radios',
'#title' => t('Display results'),
@@ -458,7 +448,7 @@ function advpoll_help($section) {
switch ($section) {
case 'admin/modules#description':
return t('A sophisticated polling module for voting, elections, and group decision-making.');
- default:
+ break;
}
}
@@ -469,14 +459,14 @@ function advpoll_help($section) {
*/
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, writein FROM {advpoll_choices} WHERE nid = %d ORDER BY vote_offset", $node->nid);
+ $poll = db_fetch_object(db_query('SELECT * FROM {advpoll} WHERE nid = %d', $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;
}
$poll->choices = count($poll->choice);
- $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);
+ $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);
$poll->votes = $cache->value;
@@ -513,7 +503,7 @@ function _advpoll_user_voted($nid) {
// Check if there is already an anonymous vote for this IP.
$host = $_SERVER['REMOTE_ADDR'] . ($_SERVER['HTTP_X_FORWARDED_FOR'] ? '-'. $_SERVER['HTTP_X_FORWARDED_FOR'] : '');
- $result = db_query("SELECT value FROM {votingapi_vote} WHERE content_id=%d AND content_type='advpoll' AND hostname='%s' AND uid=0", $nid, $host);
+ $result = db_query("SELECT value FROM {votingapi_vote} WHERE content_id = %d AND content_type = 'advpoll' AND hostname = '%s' AND uid = 0", $nid, $host);
if (db_num_rows($result) > 0) {
$voted = TRUE;
$cancel_vote = TRUE;
@@ -528,10 +518,7 @@ function _advpoll_user_voted($nid) {
function advpoll_menu($may_cache) {
global $user;
- // Load the modes in here instead of _init() toprofit from caching,
- // as recommended by http://api.drupal.org/api/head/function/hook_init.
$modes = _advpoll_list_modes();
-
$items = array();
if ($may_cache) {
@@ -540,9 +527,8 @@ function advpoll_menu($may_cache) {
'title' => t('Cancel'),
'callback' => 'advpoll_cancel',
'access' => user_access('cancel own vote'),
- 'type' => MENU_CALLBACK
+ 'type' => MENU_CALLBACK,
);
-
$items[] = array(
'path' => 'polls',
'title' => t('Advanced Polls'),
@@ -663,7 +649,7 @@ function advpoll_tab_electoral_list() {
$header[] = array('data' => t('Voter'), 'field' => 'u.name');
- $result = pager_query("SELECT u.uid, u.name FROM {advpoll_electoral_list} el LEFT JOIN {users} u ON el.uid = u.uid WHERE el.nid = %d" . tablesort_sql($header), 20, 0, NULL, $node->nid);
+ $result = pager_query("SELECT u.uid, u.name FROM {advpoll_electoral_list} el LEFT JOIN {users} u ON el.uid = u.uid WHERE el.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid);
$eligible_voters = array();
while ($voter = db_fetch_object($result)) {
$temp = array(
@@ -693,7 +679,6 @@ function advpoll_electoral_list_form($ni
'#collapsible' => TRUE,
'#weight' => 2,
);
-
$form['electoral_list']['add_user'] = array(
'#type' => 'textfield',
'#title' => t('Add user'),
@@ -707,7 +692,7 @@ function advpoll_electoral_list_form($ni
}
// List all roles with "vote on polls" permission, but don't include anonymous users.
- $result = db_query("SELECT r.name, r.rid FROM {role} r LEFT JOIN {permission} p ON p.rid=r.rid WHERE p.perm LIKE '%vote on polls%' AND r.rid != 1 ORDER BY r.name");
+ $result = db_query("SELECT r.name, r.rid FROM {role} r LEFT JOIN {permission} p ON p.rid = r.rid WHERE p.perm LIKE '%vote on polls%' AND r.rid != 1 ORDER BY r.name");
$role_options = array(0 => t('(Select a role)'));
while ($role = db_fetch_object($result)) {
$role_options[$role->rid] = $role->name;
@@ -719,12 +704,10 @@ function advpoll_electoral_list_form($ni
'#description' => t('Only roles that have the "vote on polls" permission are listed.'),
'#options' => $role_options,
);
-
$form['electoral_list']['submit'] = array(
'#type' => 'submit',
'#value' => t('Add to electoral list'),
);
-
$form['electoral_list']['reset'] = array(
'#type' => 'button',
'#value' => t('Clear electoral list'),
@@ -741,16 +724,15 @@ function advpoll_remove_voter() {
$nid = arg(1);
$uid = arg(3);
if ($uid && $node = node_load($nid)) {
- $result = db_query('SELECT name FROM {users} WHERE uid=%d', $uid);
+ $result = db_query('SELECT name FROM {users} WHERE uid = %d', $uid);
if (db_num_rows($result) > 0) {
$user = db_fetch_object($result);
- db_query('DELETE FROM {advpoll_electoral_list} WHERE nid=%d AND uid=%d', $nid, $uid);
+ db_query('DELETE FROM {advpoll_electoral_list} WHERE nid = %d AND uid = %d', $nid, $uid);
drupal_set_message(t('%user removed from the electoral list.', array('%user' => $user->name)));
}
else {
drupal_set_message(t('No user found with a uid of %uid.', array('%uid' => $uid)));
}
-
}
drupal_goto('node/'. $node->nid .'/electoral_list');
}
@@ -761,7 +743,7 @@ function advpoll_remove_voter() {
function advpoll_electoral_list_form_validate($form_id, $form_values) {
if ($form_values['op'] == t('Reset electoral list')) {
if (user_access('administer polls')) {
- db_query('DELETE FROM {advpoll_electoral_list} WHERE nid=%d', $form_values['nid']);
+ db_query('DELETE FROM {advpoll_electoral_list} WHERE nid = %d', $form_values['nid']);
drupal_set_message(t('Electoral list cleared.'));
return;
}
@@ -770,7 +752,7 @@ function advpoll_electoral_list_form_val
$add_user = $form_values['electoral_list']['add_user'];
if ($add_user) {
// Check that the user exists
- $result = db_query("SELECT uid FROM {users} WHERE name='%s'", $add_user);
+ $result = db_query("SELECT uid FROM {users} WHERE name = '%s'", $add_user);
if (db_num_rows($result) == 0) {
form_set_error('electoral_list][add_user', t('User %user does not exist.', array('%user' => $add_user)));
return FALSE;
@@ -791,7 +773,7 @@ function advpoll_electoral_list_form_sub
$add_role = $form_values['electoral_list']['add_role'];
if ($add_role) {
// Get the current electoral list.
- $result = db_query('SELECT uid FROM {advpoll_electoral_list} WHERE nid=%d', $form_values['nid']);
+ $result = db_query('SELECT uid FROM {advpoll_electoral_list} WHERE nid = %d', $form_values['nid']);
$current_list = array(0);
while ($user = db_fetch_object($result)) {
$current_list[] = $user->uid;
@@ -799,8 +781,8 @@ function advpoll_electoral_list_form_sub
$user_in_string = implode(',', $current_list);
// Check if all authenticated users should be added.
- $result = db_fetch_object(db_query("SELECT COUNT(*) AS hit FROM {role} r WHERE r.name = 'authenticated user' AND r.rid = %d", $add_role));
- if ($result->hit) {
+ $is_authenticated = db_result(db_query("SELECT COUNT(*) FROM {role} r WHERE r.name = 'authenticated user' AND r.rid = %d", $add_role));
+ if ($is_authenticated) {
// Special case: any authenticated user can vote.
// Add all current users to electoral list.
$result = db_query("INSERT INTO {advpoll_electoral_list} (nid, uid) SELECT '%d', u.uid FROM {users} u WHERE u.uid NOT IN('%s')", $form_values['nid'], $user_in_string);
@@ -809,8 +791,8 @@ function advpoll_electoral_list_form_sub
// Insert new users into the electoral_list based on the role chosen.
$result = db_query("INSERT INTO {advpoll_electoral_list} (nid, uid) SELECT '%d', u.uid FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid WHERE ur.rid = %d AND u.uid NOT IN('%s')", $form_values['nid'], $add_role, $user_in_string);
}
- drupal_set_message(format_plural(db_affected_rows($result), 'Added
1 user to the electoral list.', 'Added @count users to the electoral list.'));
-
+ $count = db_affected_rows($result);
+ drupal_set_message(format_plural($count, 'Added
1 user to the electoral list.', 'Added @count users to the electoral list.', array('@count' => $count)));
}
}
@@ -830,18 +812,18 @@ function advpoll_tab_votes() {
$header[] = array('data' => t('Visitor'), 'field' => 'u.name');
$header[] = array('data' => t('Vote'), '');
- $result = pager_query("SELECT v.value, v.uid, v.hostname, v.tag, u.name FROM {votingapi_vote} v LEFT JOIN {users} u ON v.uid = u.uid WHERE v.content_type='advpoll' AND v.content_id = %d". tablesort_sql($header), 20, 0, NULL, $node->nid);
+ $result = pager_query("SELECT v.value, v.uid, v.hostname, v.tag, u.name FROM {votingapi_vote} v LEFT JOIN {users} u ON v.uid = u.uid WHERE v.content_type = 'advpoll' AND v.content_id = %d". tablesort_sql($header), 20, 0, NULL, $node->nid);
$rows = array();
while ($vote = db_fetch_object($result)) {
- $key = $vote->uid? $vote->uid : $vote->hostname;
+ $key = $vote->uid ? $vote->uid : $vote->hostname;
$rows[$key]['name'] = $vote->name ? theme('username', $vote) : check_plain($vote->hostname);
if ($node->type == 'advpoll_ranking') {
// Need two dimensional results (if equal rankings are allowed)
- $rows[$key]['votes'][$vote->value][] = _advpoll_choice_markup($node->choice[$vote->tag]['label'], $node->format, false);
+ $rows[$key]['votes'][$vote->value][] = _advpoll_choice_markup($node->choice[$vote->tag]['label'], $node->format, FALSE);
}
else {
// Just need one dimensional results
- $rows[$key]['votes'][] = _advpoll_choice_markup($node->choice[$vote->tag]['label'], $node->format, false);
+ $rows[$key]['votes'][] = _advpoll_choice_markup($node->choice[$vote->tag]['label'], $node->format, FALSE);
}
}
@@ -917,7 +899,7 @@ function advpoll_perm() {
* Helper function to display 'cancel vote' button if user has voted.
*/
function advpoll_cancel_form($nid) {
- $form['#action'] = url("advpoll/cancel/$nid");
+ $form['#action'] = url('advpoll/cancel/'. $nid);
$form['submit'] = array('#type' => 'submit', '#value' => t('Cancel your vote'));
return $form;
}
@@ -964,13 +946,7 @@ function _advpoll_is_active($node, $retu
$status = 'passed';
}
}
-
- if ($return_status) {
- return $status;
- }
- else {
- return $active;
- }
+ return $return_status ? $status : $active;
}
function _advpoll_insert_choices($nid) {
@@ -1017,13 +993,7 @@ function advpoll_reset_confirm() {
$node = node_load($edit['nid']);
$form['nid'] = array('#type' => 'value', '#value' => $node->nid);
- $output = confirm_form($form,
- t('Are you sure you want to reset the votes for %title?',
- array('%title' => $node->title)),
- 'node/'. $node->nid,
- t('This action cannot be undone.'),
- t('Reset votes'),
- t('Cancel'));
+ $output = confirm_form($form, t('Are you sure you want to reset the votes for %title?', array('%title' => $node->title)), 'node/'. $node->nid, t('This action cannot be undone.'), t('Reset votes'), t('Cancel'));
return $output;
}
@@ -1035,13 +1005,12 @@ function advpoll_reset_confirm_submit($f
$nid = arg(1);
if ($node = node_load($nid)) {
// Delete any votes for the poll
- db_query("DELETE FROM {votingapi_vote} WHERE content_type='advpoll' AND content_id = %d", $node->nid);
+ db_query("DELETE FROM {votingapi_vote} WHERE content_type = 'advpoll' AND content_id = %d", $node->nid);
votingapi_recalculate_results('advpoll', $node->nid);
- drupal_set_message('Votes have been reset.');
+ drupal_set_message(t('Votes have been reset.'));
drupal_goto('node/'. $node->nid);
}
}
-
return '';
}
@@ -1073,7 +1042,7 @@ function advpoll_validate(&$node) {
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.'));
}
@@ -1129,7 +1098,7 @@ function advpoll_view($node, $teaser = F
// Show results (the user has voted, poll is closed or poll has passed).
$node->content['poll'] = array(
'#weight' => 1,
- '#value' => advpoll_view_results($node, $teaser, $page)
+ '#value' => advpoll_view_results($node, $teaser, $page),
);
}
return node_prepare($node, $teaser);
@@ -1172,7 +1141,7 @@ function theme_advpoll_bar($title, $perc
}
/**
- * Callback for 'results' tab for advpoll you can vote on.
+ * Callback for results tab.
*/
function advpoll_results() {
if ($node = node_load(arg(1))) {
@@ -1180,7 +1149,7 @@ function advpoll_results() {
return node_show($node, 0);
}
else {
- // The url does not provide the appropriate node id
+ // The url does not provide the appropriate node id.
drupal_not_found();
}
}
@@ -1193,7 +1162,7 @@ function _advpoll_vote_response($node, $
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);
+ $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;
}
@@ -1233,10 +1202,9 @@ function _advpoll_vote_response($node, $
function advpoll_view_results(&$node, $teaser, $page) {
$mode = _advpoll_get_mode($node->type);
if (_advpoll_can_view_results($node)) {
- if (function_exists("advpoll_view_results_$mode")) {
- $results = call_user_func("advpoll_view_results_$mode", $node, $teaser, $page);
- $output .= theme('advpoll_results', check_plain($node->title),
- $results['results'], $results['votes'], $node->links, $node->nid, $node->voted, $node->cancel_vote);
+ if (function_exists('advpoll_view_results_'. $mode)) {
+ $results = call_user_func('advpoll_view_results_'. $mode, $node, $teaser, $page);
+ $output .= theme('advpoll_results', check_plain($node->title), $results['results'], $results['votes'], $node->links, $node->nid, $node->voted, $node->cancel_vote);
}
}
$output .= _advpoll_show_cancel_form($node);
@@ -1256,7 +1224,7 @@ function advpoll_cancel($nid) {
}
else {
$host = $_SERVER['HTTP_X_FORWARDED_FOR']? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
- db_query("DELETE FROM {votingapi_vote} WHERE content_id=%d and hostname = '%s' AND uid=0", $node->nid, $host);
+ db_query("DELETE FROM {votingapi_vote} WHERE content_id = %d and hostname = '%s' AND uid = 0", $node->nid, $host);
votingapi_recalculate_results('advpoll', $nid);
}
@@ -1268,7 +1236,7 @@ function advpoll_cancel($nid) {
drupal_set_message(t('Your vote was canceled.'));
}
else {
- drupal_set_message(t("You are not allowed to cancel an invalid choice."), 'error');
+ drupal_set_message(t('You are not allowed to cancel an invalid choice.'), 'error');
}
drupal_goto('node/'. $nid);
}
@@ -1287,8 +1255,7 @@ function advpoll_eligible($node, $uid =
}
if ($node->uselist) {
- $can_vote = db_fetch_object(db_query("SELECT COUNT(*) AS eligible FROM {advpoll_electoral_list} WHERE nid=%d AND uid=%d", $node->nid, $uid));
- $eligible = $can_vote->eligible;
+ $eligible = db_result(db_query('SELECT COUNT(*) FROM {advpoll_electoral_list} WHERE nid = %d AND uid = %d', $node->nid, $uid));
}
else {
$eligible = user_access('vote on polls');
@@ -1297,7 +1264,7 @@ function advpoll_eligible($node, $uid =
}
function advpoll_algorithms($mode) {
- return call_user_func("advpoll_algorithms_$mode");
+ return call_user_func('advpoll_algorithms_'. $mode);
}
/**
@@ -1308,18 +1275,18 @@ function advpoll_algorithms($mode) {
* added to the mode list.
*/
function _advpoll_list_modes() {
- static $_advpoll_modes;
- if (!$_advpoll_modes) {
- foreach (file_scan_directory(dirname(__FILE__) .'/modes/',
- '^([^\.].*)\.inc$', array('.', '..', 'CVS'), 0, FALSE) as $file) {
+ static $advpoll_modes;
+ if (!$advpoll_modes) {
+ $files = file_scan_directory(dirname(__FILE__) .'/modes/', '^([^\.].*)\.inc$', array('.', '..', 'CVS'), 0, FALSE);
+ foreach ($files as $file) {
require_once($file->filename);
$mode = $file->name;
- if (function_exists("advpoll_info_$mode")) {
- $_advpoll_modes[$mode] = call_user_func("advpoll_info_$mode");
+ if (function_exists('advpoll_info_'. $mode)) {
+ $advpoll_modes[$mode] = call_user_func('advpoll_info_'. $mode);
}
}
}
- return $_advpoll_modes;
+ return $advpoll_modes;
}
/**
@@ -1328,18 +1295,17 @@ function _advpoll_list_modes() {
* We strip out the paragraphs which are not allowed within the label element
* and created by check_markup() when "Line break converter"-filter is used.
*/
-function _advpoll_choice_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = true) {
+function _advpoll_choice_markup($text, $format = FILTER_FORMAT_DEFAULT, $check = TRUE) {
$text = check_markup($text, $format, $check);
$text = str_replace(array('
', '
'), '', $text);
$text = trim($text);
-
return $text;
}
/**
* Wrapper function around form_set_error() to support validating of Ajax voting.
*/
-function _advpoll_form_set_error($name = NULL, $message = '', $ajax = false) {
+function _advpoll_form_set_error($name = NULL, $message = '', $ajax = FALSE) {
if ($ajax) {
drupal_set_header('Content-Type: text/plain; charset=utf-8');
print drupal_to_js(array('errors' => '
'. $message .'
'));
Index: modes/binary.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advpoll/modes/binary.inc,v
retrieving revision 1.7.2.25
diff -u -p -r1.7.2.25 binary.inc
--- modes/binary.inc 4 Sep 2007 15:36:47 -0000 1.7.2.25
+++ modes/binary.inc 5 Sep 2007 04:25:43 -0000
@@ -20,9 +20,10 @@ function advpoll_algorithms_binary() {
*/
function advpoll_voting_binary_form(&$node, $teaser, $page, $status) {
static $binary_form_count = 0;
- $form['#id'] = 'advpoll_voting_binary_form-'. $binary_form_count++;
- $form['#attributes'] = array('class' => 'advpoll-vote');
-
+ $form = array(
+ '#id' => 'advpoll_voting_binary_form-'. $binary_form_count++,
+ '#attributes' => array('class' => 'advpoll-vote'),
+ );
$form['ajax'] = array(
'#type' => 'hidden',
'#attributes' => array('class' => 'ajax'),
@@ -35,7 +36,7 @@ function advpoll_voting_binary_form(&$no
foreach ($node->choice as $i => $choice) {
// 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) . ($choice['writein'] ? ' '. t('(write-in)') : '');
+ $list[$i] = _advpoll_choice_markup($choice['label'], $node->format, $check) . ($choice['writein'] ? ' '. t('(write-in)') : '');
}
}
// Add write-in checkbox/radio if write-ins are enabled and user has permission.
@@ -53,12 +54,8 @@ function advpoll_voting_binary_form(&$no
'#suffix' => '