Index: branches/5.3.x/core/units/reviews/reviews_event_handler.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 15483)
+++ branches/5.3.x/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reviews_event_handler.php 15145 2012-03-04 09:04:08Z alex $
+* @version	$Id: reviews_event_handler.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -220,7 +220,7 @@
 
 			if ( $event->getEventParam('type') == 'current_user' ) {
 				$object->addFilter('current_user', '%1$s.CreatedById = ' . $this->Application->RecallVar('user_id'));
-				$object->addFilter('current_ip', '%1$s.IPAddress = "' . $_SERVER['REMOTE_ADDR'] . '"');
+				$object->addFilter('current_ip', '%1$s.IPAddress = "' . $this->Application->getClientIp() . '"');
 			}
 		}
 
@@ -275,7 +275,7 @@
 			$parent_info = $object->getLinkedInfo();
 			$item_type = $this->Application->getUnitOption($parent_info['ParentPrefix'], 'ItemType');
 
-			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
+			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 			$object->SetDBField('ItemType', $item_type);
 			$object->SetDBField('Module', $this->Application->findModule('Var', $parent_info['ParentPrefix'], 'Name'));
 
@@ -360,8 +360,8 @@
 
 				if ( $review_status == STATUS_ACTIVE || $review_status == STATUS_PENDING ) {
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'ADD' : 'ADD.PENDING');
-					$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
-					$this->Application->EmailEventAdmin($email_event);
+					$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
+					$this->Application->emailAdmin($email_event);
 				}
 			}
 		}
@@ -391,7 +391,7 @@
 					$this->_loadMainObject($event);
 
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY');
-					$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
+					$this->Application->emailUser($email_event, $object->GetDBField('CreatedById'));
 				}
 			}
 		}