Index: poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.289 diff -u -p -r1.289 poll.module --- poll.module 18 Feb 2009 14:28:22 -0000 1.289 +++ poll.module 7 Mar 2009 22:27:09 -0000 @@ -146,16 +146,25 @@ function poll_block_list() { function poll_block_view($delta = '') { if (user_access('access content')) { // Retrieve the latest poll. - $record = db_query_range(db_rewrite_sql("SELECT n.nid FROM {node} n INNER JOIN {poll} p ON p.nid = n.nid WHERE n.status = :status AND p.active = :active ORDER BY n.created DESC"), array(':status' => 1, ':active' => 1), 0, 1)->fetch(); + $select = db_select('node', 'n'); + $select->join('poll', 'p', 'p.nid = n.nid'); + $select->fields('n', array('nid')) + ->condition('n.status', 1) + ->condition('p.active', 1) + ->orderBy('n.created', 'DESC') + ->range(0, 1) + ->addTag('node_access'); + + $record = $select->execute()->fetchObject(); if ($record) { $poll = node_load($record->nid); if ($poll->nid) { $poll = poll_view($poll, TRUE, FALSE, TRUE); + $block['subject'] = t('Poll'); + $block['content'] = drupal_render($poll->content); + return $block; } - } - $block['subject'] = t('Poll'); - $block['content'] = drupal_render($poll->content); - return $block; + } } } @@ -165,9 +174,12 @@ function poll_block_view($delta = '') { * Closes polls that have exceeded their allowed runtime. */ function poll_cron() { - $result = db_query('SELECT p.nid FROM {poll} p INNER JOIN {node} n ON p.nid = n.nid WHERE (n.created + p.runtime) < ' . REQUEST_TIME . ' AND p.active = 1 AND p.runtime != 0'); + $result = db_query('SELECT p.nid FROM {poll} p INNER JOIN {node} n ON p.nid = n.nid WHERE (n.created + p.runtime) < :request_time AND p.active = :active AND p.runtime != :runtime', array(':request_time' => REQUEST_TIME, ':active' => 1, ':runtime' => 0)); while ($poll = db_fetch_object($result)) { - db_query("UPDATE {poll} SET active = 0 WHERE nid = %d", $poll->nid); + db_update('poll') + ->fields(array('active' => 0)) + ->condition('nid', $poll->nid) + ->execute(); } } @@ -405,7 +417,7 @@ function poll_validate($node, $form) { function poll_load($nodes) { global $user; foreach ($nodes as $node) { - $poll = db_query("SELECT runtime, active FROM {poll} WHERE nid = :nid", array(':nid' => $node->nid))->fetch(); + $poll = db_query("SELECT runtime, active FROM {poll} WHERE nid = :nid", array(':nid' => $node->nid))->fetchObject(); // Load the appropriate choices into the $poll object. $poll->choice = db_query("SELECT chid, chtext, chvotes, weight FROM {poll_choice} WHERE nid = :nid ORDER BY weight", array(':nid' => $node->nid))->fetchAllAssoc('chid', PDO::FETCH_ASSOC); @@ -414,10 +426,10 @@ function poll_load($nodes) { $poll->allowvotes = FALSE; if (user_access('vote on polls') && $poll->active) { if ($user->uid) { - $result = db_query('SELECT chid FROM {poll_vote} WHERE nid = :nid AND uid = :uid', array(':nid' => $node->nid, ':uid' => $user->uid))->fetch(); + $result = db_query('SELECT chid FROM {poll_vote} WHERE nid = :nid AND uid = :uid', array(':nid' => $node->nid, ':uid' => $user->uid))->fetchObject(); } else { - $result = db_query("SELECT chid FROM {poll_vote} WHERE nid = :nid AND hostname = :hostname", array(':nid' => $node->nid, ':hostname' => ip_address()))->fetch(); + $result = db_query("SELECT chid FROM {poll_vote} WHERE nid = :nid AND hostname = :hostname", array(':nid' => $node->nid, ':hostname' => ip_address()))->fetchObject(); } if ($result) { $poll->vote = $result->chid; @@ -445,11 +457,24 @@ function poll_insert($node) { $node->active = 1; } - db_query("INSERT INTO {poll} (nid, runtime, active) VALUES (%d, %d, %d)", $node->nid, $node->runtime, $node->active); - + db_insert('poll') + ->fields(array( + 'nid' => $node->nid, + 'runtime' => $node->runtime, + 'active' => $node->active, + )) + ->execute(); + foreach ($node->choice as $choice) { if ($choice['chtext'] != '') { - db_query("INSERT INTO {poll_choice} (nid, chtext, chvotes, weight) VALUES (%d, '%s', %d, %d)", $node->nid, $choice['chtext'], $choice['chvotes'], $choice['weight']); + db_insert('poll_choice') + ->fields(array( + 'nid' => $node->nid, + 'chtext' => $choice['chtext'], + 'chvotes' => $choice['chvotes'], + 'weight' => $choice['weight'], + )) + ->execute(); } } } @@ -459,21 +484,34 @@ function poll_insert($node) { */ function poll_update($node) { // Update poll settings. - db_query('UPDATE {poll} SET runtime = %d, active = %d WHERE nid = %d', $node->runtime, $node->active, $node->nid); - + db_update('poll') + ->fields(array( + 'runtime' => $node->runtime, + 'active' => $node->active, + )) + ->condition('nid', $node->nid) + ->execute(); + // Poll choices with empty titles signifies removal. We remove all votes to // the removed options, so people who voted on them can vote again. foreach ($node->choice as $key => $choice) { if (!empty($choice['chtext'])) { - if (isset($choice['chid'])) { - db_query("UPDATE {poll_choice} SET chtext = '%s', chvotes = %d, weight = %d WHERE chid = %d", $choice['chtext'], (int)$choice['chvotes'], $choice['weight'], $choice['chid']); - } - else { - db_query("INSERT INTO {poll_choice} (nid, chtext, chvotes, weight) VALUES (%d, '%s', %d, %d)", $node->nid, $choice['chtext'], (int)$choice['chvotes'], $choice['weight']); - } + db_merge('poll_choice') + ->key(array('chid' => $choice['chid'])) + ->fields(array( + 'nid' => $node->nid, + 'chtext' => $choice['chtext'], + 'chvotes' => (int) $choice['chvotes'], + 'weight' => $choice['weight'], + )) + ->updateExcept('nid') + ->execute(); } else { - db_query("DELETE FROM {poll_vote} WHERE nid = %d AND chid = %d", $node->nid, $key); + db_delete('poll_vote') + ->condition('nid', $node->nid) + ->condition('chid', $key) + ->execute(); } } } @@ -482,9 +520,16 @@ function poll_update($node) { * Implementation of hook_delete(). */ function poll_delete($node) { - db_query("DELETE FROM {poll} WHERE nid = %d", $node->nid); - db_query("DELETE FROM {poll_choice} WHERE nid = %d", $node->nid); - db_query("DELETE FROM {poll_vote} WHERE nid = %d", $node->nid); + db_delete('poll') + ->condition('nid', $node->nid) + ->execute(); + db_delete('poll_choice') + ->condition('nid', $node->nid) + ->execute(); + db_delete('poll_vote') + ->condition('nid', $node->nid) + ->execute(); + } /** @@ -502,6 +547,7 @@ function poll_view($node, $teaser = FALS if ($block) { // No 'read more' link $node->readmore = FALSE; + $node->teaser = ''; $links = module_invoke_all('link', 'node', $node, 1); $links[] = array('title' => t('Older polls'), 'href' => 'poll', 'attributes' => array('title' => t('View the list of polls on this site.'))); @@ -598,15 +644,21 @@ function poll_vote($form, &$form_state) $choice = $form_state['values']['choice']; global $user; - if ($user->uid) { - db_query('INSERT INTO {poll_vote} (nid, chid, uid, timestamp) VALUES (%d, %d, %d, %d)', $node->nid, $choice, $user->uid, REQUEST_TIME); - } - else { - db_query("INSERT INTO {poll_vote} (nid, chid, hostname, timestamp) VALUES (%d, %d, '%s', %d)", $node->nid, $choice, ip_address(), REQUEST_TIME); - } + db_insert('poll_vote') + ->fields(array( + 'nid' => $node->nid, + 'chid' => $choice, + 'uid' => $user->uid, + 'hostname' => $user->uid ? ip_address() : '', + )) + ->execute(); // Add one to the votes. - db_query("UPDATE {poll_choice} SET chvotes = chvotes + 1 WHERE chid = %d", $choice); + db_update('poll_choice') + ->expression('chvotes', 'chvotes + 1') + ->condition('chid', $choice) + ->execute(); + cache_clear_all(); drupal_set_message(t('Your vote was recorded.')); @@ -769,19 +821,20 @@ function poll_cancel_form(&$form_state, /** * Submit callback for poll_cancel_form */ -function poll_cancel($form, &$form_state) { - $node = node_load($form['#nid']); +function poll_cancel($form, &$form_state) { global $user; - - if ($user->uid) { - db_query('DELETE FROM {poll_vote} WHERE nid = %d and uid = %d', $node->nid, $user->uid); - } - else { - db_query("DELETE FROM {poll_vote} WHERE nid = %d and hostname = '%s'", $node->nid, ip_address()); - } + $node = node_load($form['#nid']); + + db_delete('poll_vote') + ->condition('nid', $node->nid) + ->condition($user->uid ? 'uid' : 'hostname', $user->uid ? $user->uid : ip_address()) + ->execute(); // Subtract from the votes. - db_query("UPDATE {poll_choice} SET chvotes = chvotes - 1 WHERE chid = %d", $node->vote); + db_update('poll_choice') + ->expression('chvotes', 'chvotes - 1') + ->condition('chid', $node->vote) + ->execute(); } /** @@ -790,11 +843,16 @@ function poll_cancel($form, &$form_state function poll_user_cancel($edit, $account, $method) { switch ($method) { case 'user_cancel_reassign': - db_update('poll_vote')->fields(array('uid' => 0))->condition('uid', $account->uid)->execute(); + db_update('poll_vote') + ->fields(array('uid' => 0)) + ->condition('uid', $account->uid) + ->execute(); break; case 'user_cancel_delete': - db_delete('poll_vote')->condition('uid', $account->uid)->execute(); + db_delete('poll_vote') + ->condition('uid', $account->uid) + ->execute(); break; } } Index: poll.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v retrieving revision 1.14 diff -u -p -r1.14 poll.pages.inc --- poll.pages.inc 26 Feb 2009 07:30:27 -0000 1.14 +++ poll.pages.inc 7 Mar 2009 22:27:09 -0000 @@ -10,17 +10,39 @@ * Menu callback to provide a simple list of all polls available. */ function poll_page() { + $polls_per_page = 15; + + $count_select = db_select('node', 'n'); + $count_select->addExpression('COUNT(*)', 'expression'); + $count_select->join('poll', 'p', 'p.nid = n.nid'); + $count_select->condition('n.status', 1); + // List all polls. - $sql = db_rewrite_sql("SELECT n.nid, n.title, p.active, n.created, SUM(c.chvotes) AS votes FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid INNER JOIN {poll_choice} c ON n.nid = c.nid WHERE n.status = 1 GROUP BY n.nid, n.title, p.active, n.created ORDER BY n.created DESC"); - // Count all polls for the pager. - $count_sql = db_rewrite_sql('SELECT COUNT(*) FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid WHERE n.status = 1'); - $result = pager_query($sql, 15, 0, $count_sql); + $select = db_select('node', 'n'); + $select->join('poll', 'p', 'p.nid = n.nid'); + $select->join('poll_choice', 'c', 'c.nid = n.nid'); + $select->addExpression('SUM(c.chvotes)', 'votes'); + $select = $select->fields('n', array('nid', 'title', 'created')) + ->fields('p', array('active')) + ->condition('n.status', 1) + ->orderBy('n.created', 'DESC') + ->groupBy('n.nid') + ->groupBy('n.title') + ->groupBy('p.active') + ->groupBy('n.created') + ->extend('PagerDefault') + ->limit($polls_per_page) + ->addTag('node_access'); + $select->setCountQuery($count_select); + $queried_nodes = $select->execute() + ->fetchAllAssoc('nid'); + $output = ''; - $output .= theme("pager", NULL, 15); + $output .= theme("pager", NULL, $polls_per_page); return $output; } @@ -28,6 +50,7 @@ function poll_page() { * Callback for the 'votes' tab for polls you can see other votes on */ function poll_votes($node) { + $votes_per_page = 20; drupal_set_title($node->title); $output = t('This table lists all the recorded votes for this poll. If anonymous users are allowed to vote, they will be identified by the IP address of the computer they used when they voted.'); @@ -35,9 +58,22 @@ function poll_votes($node) { $header[] = array('data' => t('Vote'), 'field' => 'pc.chtext'); $header[] = array('data' => t('Timestamp'), 'field' => 'pv.timestamp', 'sort' => 'desc'); - $result = pager_query("SELECT pv.chid, pv.uid, pv.hostname, pv.timestamp, pv.nid, pc.chtext, u.name FROM {poll_vote} pv INNER JOIN {poll_choice} pc ON pv.chid = pc.chid LEFT JOIN {users} u ON pv.uid = u.uid WHERE pv.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid); + $select = db_select('poll_vote', 'pv'); + $select->join('poll_choice', 'pc', 'pv.chid = pc.chid'); + $select->join('users', 'u', 'pv.uid = u.uid'); + $queried_votes = $select->fields('pv', array('chid', 'uid', 'hostname', 'timestamp', 'nid')) + ->fields('pc', array('chtext')) + ->fields('u', array('name')) + ->condition('pv.nid', $node->nid) + ->extend('PagerDefault') + ->limit($votes_per_page) + ->extend('TableSort') + ->setHeader($header) + ->execute() + ->fetchAllAssoc('hostname'); + $rows = array(); - while ($vote = db_fetch_object($result)) { + foreach ($queried_votes as $vote) { $rows[] = array( $vote->name ? theme('username', $vote) : check_plain($vote->hostname), check_plain($vote->chtext), @@ -45,7 +81,7 @@ function poll_votes($node) { ); } $output .= theme('table', $header, $rows); - $output .= theme('pager', NULL, 20, 0); + $output .= theme('pager', NULL, $votes_per_page, 0); return $output; }