Index: branches/5.2.x/units/downloads/download_helper.php
===================================================================
diff -u -N -r15172 -r15568
--- branches/5.2.x/units/downloads/download_helper.php	(.../download_helper.php)	(revision 15172)
+++ branches/5.2.x/units/downloads/download_helper.php	(.../download_helper.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: download_helper.php 15172 2012-03-09 12:34:43Z alex $
+* @version	$Id: download_helper.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -67,7 +67,7 @@
 			$down_object->SetDBField('ProductName', $product_object->GetField('Name'));
 			$down_object->SetDBField('FileId', $file_info['FileId']);
 			$down_object->SetDBField('Filename', $file_info['FilePath']);
-			$down_object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
+			$down_object->SetDBField('IPAddress', $this->Application->getClientIp());
 			$down_object->SetDBField('StartedOn_date', $file_info['download_start']);
 			$down_object->SetDBField('StartedOn_time', $file_info['download_start']);
 
Index: branches/5.2.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r15141 -r15568
--- branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 15141)
+++ branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 15141 2012-03-04 08:08:18Z alex $
+* @version	$Id: usps.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1158,7 +1158,7 @@
 			if ($fp) {
 				$request_url = sprintf("Date %s : IP %s\n\nPost\n\n%s\n\nReplay\n\n%s\n\n",
 			   		adodb_date('m/d/Y H:i:s'),
-			   		$_SERVER['REMOTE_ADDR'],
+					$this->Application->getClientIp(),
 			   		$usps_server . '/' . $api_dll . '?' . urldecode($request),
 			   		$body
 			   	);
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r15540 -r15568
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15540)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 15540 2012-09-14 15:37:53Z alex $
+* @version	$Id: orders_event_handler.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -1610,7 +1610,7 @@
 
 		$this->setNextOrderNumber($event);
 
-		$object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']);
+		$object->SetDBField('OrderIP', $this->Application->getClientIp());
 
 		$order_type = $this->getTypeBySpecial( $this->Application->GetVar('order_type') );
 		$object->SetDBField('Status', $order_type);
@@ -2427,7 +2427,7 @@
 		$this->CheckUser($event);
 
 		if ( !$object->GetDBField('OrderIP') ) {
-			$object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']);
+			$object->SetDBField('OrderIP', $this->Application->getClientIp());
 		}
 
 		$shipping_option = $this->Application->GetVar('OriginalShippingOption');
Index: branches/5.2.x/units/gateways/gw_classes/atosorigin.php
===================================================================
diff -u -N -r15376 -r15568
--- branches/5.2.x/units/gateways/gw_classes/atosorigin.php	(.../atosorigin.php)	(revision 15376)
+++ branches/5.2.x/units/gateways/gw_classes/atosorigin.php	(.../atosorigin.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: atosorigin.php 15376 2012-06-01 13:34:11Z alex $
+* @version	$Id: atosorigin.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -70,7 +70,7 @@
 			$params['amount'] = str_replace( Array('.', ','), '', $txt_amount);
 			$params['caddie'] = $this->Application->GetSID() . ',' . MD5($item_data['OrderId']);
 			$params['order_id'] = $item_data['OrderId'];
-			$params['customer_ip_address'] = $_SERVER['REMOTE_ADDR'];
+			$params['customer_ip_address'] = $this->Application->getClientIp();
 			$params['customer_id'] = $item_data['PortalUserId'];
 
 			$billing_email = $item_data['BillingEmail'];
Index: branches/5.2.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r15540 -r15568
--- branches/5.2.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 15540)
+++ branches/5.2.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_event_handler.php 15540 2012-09-14 15:37:53Z alex $
+* @version	$Id: products_event_handler.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -693,15 +693,15 @@
 
 		$sql = '	SELECT * FROM ' . TABLE_PREFIX . 'SpamControl
 					WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
-					AND IPaddress="' . $_SERVER['REMOTE_ADDR'] . '"
+					AND IPaddress="' . $this->Application->getClientIp() . '"
 					AND PortalUserId=' . $user_id . '
 					AND DataType="Rating"';
 		$res = $this->Conn->GetRow($sql);
 
 		if ( $res && $res['Expire'] < adodb_mktime() ) {
 			$sql = '	DELETE FROM ' . TABLE_PREFIX . 'SpamControl
 						WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
-						AND IPaddress="' . $_SERVER['REMOTE_ADDR'] . '"
+						AND IPaddress="' . $this->Application->getClientIp() . '"
 						AND PortalUserId=' . $user_id . '
 						AND DataType="Rating"';
 			$this->Conn->Query($sql);
@@ -724,7 +724,7 @@
 			$sql = '	INSERT INTO ' . TABLE_PREFIX . 'SpamControl
 							(ItemResourceId, IPaddress, PortalUserId, DataType, Expire)
 						VALUES (' . $object->GetDBField('ResourceId') . ',
-								"' . $_SERVER['REMOTE_ADDR'] . '",
+								"' . $this->Application->getClientIp() . '",
 								' . $user_id . ',
 								"Rating",
 								' . $expire . ')';
Index: branches/5.2.x/units/gateways/gw_classes/rightconnect.php
===================================================================
diff -u -N -r15141 -r15568
--- branches/5.2.x/units/gateways/gw_classes/rightconnect.php	(.../rightconnect.php)	(revision 15141)
+++ branches/5.2.x/units/gateways/gw_classes/rightconnect.php	(.../rightconnect.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: rightconnect.php 15141 2012-03-04 08:08:18Z alex $
+* @version	$Id: rightconnect.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -60,7 +60,7 @@
 			$post_fields["trans_amount"] = "8.98";
 			$post_fields["user1"] = "DELIM";
 			$post_fields["ALIAS"] = "www.yourdomain.com";
-			$post_fields["customer_ip"] = $_SERVER['REMOTE_ADDR'];
+			$post_fields["customer_ip"] = $this->Application->getClientIp();
 			$post_fields["ADMIN_EMAIL"] = "admin@yourdomain.com";*/
 
 
Index: branches/5.2.x/units/gateways/gw_classes/paybox.php
===================================================================
diff -u -N -r15376 -r15568
--- branches/5.2.x/units/gateways/gw_classes/paybox.php	(.../paybox.php)	(revision 15376)
+++ branches/5.2.x/units/gateways/gw_classes/paybox.php	(.../paybox.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: paybox.php 15376 2012-06-01 13:34:11Z alex $
+* @version	$Id: paybox.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -73,7 +73,7 @@
 			$params['PBX_CMD'] = $this->Application->GetSID().','.MD5($item_data['OrderId']);
 
 			/*$params['order_id'] = $item_data['OrderId'];
-			$params['customer_ip_address'] = $_SERVER['REMOTE_ADDR'];
+			$params['customer_ip_address'] = $this->Application->getClientIp();
 			$params['customer_id'] = $item_data['PortalUserId'];*/
 
 			$billing_email = $item_data['BillingEmail'];
Index: branches/5.2.x/units/gateways/gw_classes/paypal_direct.php
===================================================================
diff -u -N -r15141 -r15568
--- branches/5.2.x/units/gateways/gw_classes/paypal_direct.php	(.../paypal_direct.php)	(revision 15141)
+++ branches/5.2.x/units/gateways/gw_classes/paypal_direct.php	(.../paypal_direct.php)	(revision 15568)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: paypal_direct.php 15141 2012-03-04 08:08:18Z alex $
+* @version	$Id: paypal_direct.php 15568 2012-10-10 13:27:55Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -38,7 +38,7 @@
 			// -- Login Information --
 			$post_fields['METHOD']				=	'DoDirectPayment';
 			$post_fields['VERSION']				=	'52.0';
-			$post_fields['IPADDRESS']			=	$_SERVER['REMOTE_ADDR'];
+			$post_fields['IPADDRESS']			=	$this->Application->getClientIp();
 			$post_fields['USER']				=	$gw_params['api_username'];
 			$post_fields['PWD']					=	$gw_params['api_password'];
 			$post_fields['SIGNATURE']			=	$gw_params['signature'];