--- modules/advpoll/advpoll-orig.module	2007-08-06 14:15:01.000000000 -0700
+++ modules/advpoll/advpoll.module	2007-08-06 14:09:35.000000000 -0700
@@ -1,5 +1,5 @@
 <?php
-// $Id: advpoll.module,v 1.21.2.32 2007/05/11 00:00:41 chriskennedy Exp $
+// $Id: advpoll.module,v 1.5 2007/08/06 21:09:35 fletch Exp $
 
 /**
  * @file
@@ -7,6 +7,7 @@
  */
 
 define('ADVPOLL_DEFAULT_ELECTORAL_LIST', 0);
+define('ADVPOLL_DEFAULT_DETECT_IP', 1);
 // Options: always, aftervote, or afterclose.
 define('ADVPOLL_DEFAULT_VIEW_RESULTS', 'aftervote');
 
@@ -396,7 +397,7 @@ function _advpoll_user_voted($node) {
   }
 
   // Check if the user's IP has already voted.
-  if (!$cancel_vote) {
+  if (!$cancel_vote && variable_get('advpoll_ip_detect', ADVPOLL_DEFAULT_DETECT_IP)) {
     $host = $_SERVER['HTTP_X_FORWARDED_FOR']? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR'];
     $result = db_query("SELECT uid, value FROM {votingapi_vote} "
       ."WHERE content_id=%d AND content_type='advpoll' AND hostname='%s'",
@@ -805,6 +806,13 @@ function advpoll_admin_settings() {
     '#options' => $enabled,
   );
 
+  $form['main']['advpoll_ip_detect'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('IP address blocking.'),
+    '#description' => t('Stop the same IP address from voting multiple times on a poll.'),
+    '#default_value' => variable_get('advpoll_ip_detect', ADVPOLL_DEFAULT_DETECT_IP),
+  );
+
   $view_results = array(
     'always' => t('Always'),
     'aftervote' => t('After user has voted'),