Index: branches/5.2.x/units/polls/poll_tp.php
===================================================================
diff -u -N -r15155 -r15567
--- branches/5.2.x/units/polls/poll_tp.php	(.../poll_tp.php)	(revision 15155)
+++ branches/5.2.x/units/polls/poll_tp.php	(.../poll_tp.php)	(revision 15567)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_tp.php 15155 2012-03-04 09:27:01Z alex $
+* @version	$Id: poll_tp.php 15567 2012-10-10 13:26:29Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -27,10 +27,17 @@
 			$object = $this->getObject($params);
 			/* @var $object kDBItem */
 
-			if (!$object->GetDBField('AllowMultipleVotings')) {
+			if ( !$object->GetDBField('AllowMultipleVotings') ) {
+				$where_clause = Array (
+					'PollId = ' . $object->GetID(),
+					'CreatedById = ' . $this->Application->RecallVar('user_id'),
+					'UserIP = ' . $this->Conn->qstr($this->Application->getClientIp()),
+				);
+
 				$sql = 'SELECT StatisticsId
-						FROM '.TABLE_PREFIX.'PollsStatistics
-						WHERE PollId = '.$object->GetID().' AND CreatedById = '.$this->Application->RecallVar('user_id').' AND UserIP = '.$this->Conn->qstr(getenv('REMOTE_ADDR'));
+						FROM ' . TABLE_PREFIX . 'PollsStatistics
+						WHERE (' . implode(') AND (', $where_clause) . ')';
+
 				return $this->Conn->GetOne($sql) > 0;
 			}
 
Index: branches/5.2.x/units/posts/post_eh.php
===================================================================
diff -u -N -r15249 -r15567
--- branches/5.2.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 15249)
+++ branches/5.2.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 15567)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_eh.php 15249 2012-03-30 16:27:14Z alex $
+* @version	$Id: post_eh.php 15567 2012-10-10 13:26:29Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,7 +60,7 @@
 			$object->SetDBField('Modified_date', $now);
 			$object->SetDBField('Modified_time', $now);
 
-			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
+			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 
 			$sql = 'SELECT Username
 					FROM ' . TABLE_PREFIX . 'Users
Index: branches/5.2.x/units/poll_comments/poll_comment_eh.php
===================================================================
diff -u -N -r15148 -r15567
--- branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 15148)
+++ branches/5.2.x/units/poll_comments/poll_comment_eh.php	(.../poll_comment_eh.php)	(revision 15567)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_comment_eh.php 15148 2012-03-04 09:04:48Z alex $
+* @version	$Id: poll_comment_eh.php 15567 2012-10-10 13:26:29Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -109,7 +109,7 @@
 				}
 
 				$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
-				$object->SetDBField('UserIP', $_SERVER['REMOTE_ADDR']);
+				$object->SetDBField('UserIP', $this->Application->getClientIp());
 				$object->SetDBField('Status', STATUS_ACTIVE);
 			}
 
Index: branches/5.2.x/units/polls/poll_eh.php
===================================================================
diff -u -N -r15148 -r15567
--- branches/5.2.x/units/polls/poll_eh.php	(.../poll_eh.php)	(revision 15148)
+++ branches/5.2.x/units/polls/poll_eh.php	(.../poll_eh.php)	(revision 15567)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: poll_eh.php 15148 2012-03-04 09:04:48Z alex $
+* @version	$Id: poll_eh.php 15567 2012-10-10 13:26:29Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -116,7 +116,7 @@
 				return ;
 			}
 
-			$ip_address = $_SERVER['REMOTE_ADDR'];
+			$ip_address = $this->Application->getClientIp();
 
 			if (!$object->GetDBField('AllowMultipleVotings')) {
 				$sql = 'SELECT StatisticsId