Always store IP address for poll votes [#702134]

From poll.module:

+++ modules/poll/poll.module 25 Jan 2010 21:34:11 -0000
@@ -720,7 +720,8 @@ function poll_vote($form, &$form_state)
-      'hostname' => $user->uid ? ip_address() : '',
+      'hostname' => $user->uid ? '' : ip_address(),

It doesn't make a lot of sense to only store the hostname for anonymous users. Some extra history in #602998-12: Poll vote missing timestamp and broken for anon users

Comment	File	Size	Author
#3	702134-poll-hostnames.patch	1.9 KB	aaronbauman
#1	702134-grndlvl-1.patch	1.26 KB	grndlvl

Comments

Comment #1

grndlvl commented 3 February 2010 at 14:25

Status	File	Size
new	702134-grndlvl-1.patch	1.26 KB

Made change to store the hostname for all users for polls.

<?php
@@ -720,7 +720,7 @@ function poll_vote($form, &$form_state) 
       'nid' => $node->nid,
       'chid' => $choice,
       'uid' => $user->uid,
-      'hostname' => $user->uid ? '' : ip_address(),
+      'hostname' => ip_address(),
?>

Needed to change poll_load query for anon users so that it does not do the lookup completely based on the hostname but also user.uid = 0.

<?php
@@ -483,7 +483,7 @@ function poll_load($nodes) {
         $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()))->fetchObject();
+        $result = db_query("SELECT chid FROM {poll_vote} WHERE nid = :nid AND hostname = :hostname AND uid = 0", array(':nid' => $node->nid, ':hostname' => ip_address()))->fetchObject();
?>