Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r15047 -r15061
--- branches/5.2.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15047)
+++ branches/5.2.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15061)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_event_handler.php 15047 2012-01-16 15:18:30Z alex $
+* @version	$Id: affiliates_event_handler.php 15061 2012-01-17 14:50:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -117,7 +117,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -142,7 +142,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -420,7 +420,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteFromLive(&$event)
+		protected function OnBeforeDeleteFromLive(kEvent &$event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
@@ -563,26 +563,32 @@
 			return $start_timestamp;
 		}
 
-		function iterateItems(&$event)
+		/**
+		 * Apply same processing to each item being selected in grid
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function iterateItems(kEvent &$event)
 		{
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
+			/* @var $object kDBItem */
+
 			$ids = $this->StoreSelectedIDs($event);
 
-			if($ids)
-			{
-				$status_field = array_shift( $this->Application->getUnitOption($event->Prefix,'StatusField') );
+			if ( $ids ) {
+				$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
 
-				foreach($ids as $id)
-				{
+				foreach ($ids as $id) {
 					$object->Load($id);
 
-					switch ($event->Name)
-					{
+					switch ($event->Name) {
 						case 'OnMassApprove':
 							$object->SetDBField($status_field, 1);
 							break;
@@ -600,26 +606,23 @@
 							break;
 					}
 
-					if( $object->Update() )
-					{
-						switch ($event->Name)
-						{
+					if ( $object->Update() ) {
+						switch ($event->Name) {
 							case 'OnMassApprove':
-								$email_event_user =& $this->Application->EmailEventUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-								$email_event_admin =& $this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.APPROVED');
+								$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
+								$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.APPROVED');
 								break;
 							case 'OnMassDecline':
-								$email_event_user =& $this->Application->EmailEventUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
-								$email_event_admin =& $this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.DENIED');
+								$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
+								$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.DENIED');
 								break;
 						}
-						$event->status=kEvent::erSUCCESS;
-						$event->setRedirectParams(Array('opener' => 's'), true); //stay!
+						$event->status = kEvent::erSUCCESS;
+						$event->SetRedirectParam('opener', 's'); //stay!
 					}
-					else
-					{
-						$event->status=kEvent::erFAIL;
-						$event->redirect=false;
+					else {
+						$event->status = kEvent::erFAIL;
+						$event->redirect = false;
 						break;
 					}
 				}