Index: branches/5.3.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r15492 -r15671
--- branches/5.3.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15492)
+++ branches/5.3.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 15671)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_event_handler.php 15149 2012-03-04 09:05:03Z alex $
+* @version	$Id: affiliates_event_handler.php 15671 2013-01-17 11:39:41Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -346,8 +346,8 @@
 			$object->SetDBField('PortalUserId', $user->GetID());
 
 			if ( $object->Create() ) {
-				$this->Application->EmailEventUser('AFFILIATE.REGISTER', $user->GetID());
-				$this->Application->EmailEventAdmin('AFFILIATE.REGISTER');
+				$this->Application->emailUser('AFFILIATE.REGISTER', $user->GetID());
+				$this->Application->emailAdmin('AFFILIATE.REGISTER');
 			}
 		}
 
@@ -404,8 +404,8 @@
 				$object = $event->getObject();
 				/* @var $object kDBItem */
 
-				$this->Application->EmailEventUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
-				$this->Application->EmailEventAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
+				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
 
 				$next_template = $this->Application->GetVar('next_template');
 
@@ -448,8 +448,8 @@
 
 			foreach ($new_ids as $payment_id) {
 				$payment_object->Load($payment_id);
-				$this->Application->EmailEventUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'));
-				$this->Application->EmailEventAdmin('AFFILIATE.PAYMENT');
+				$this->Application->emailUser('AFFILIATE.PAYMENT', $payment_object->GetDBField('PortalUserId'));
+				$this->Application->emailAdmin('AFFILIATE.PAYMENT');
 			}
 
 			$object = $event->getObject();
@@ -467,8 +467,8 @@
 			$old_status = $this->Conn->GetOne($sql);
 
 			if ( $old_status == 2 && $object->GetDBField('Status') == 1 ) {
-				$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-				$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.APPROVED');
+				$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
+				$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
 			}
 		}
 
@@ -591,7 +591,7 @@
 			$ids = $this->StoreSelectedIDs($event);
 
 			if ( $ids ) {
-				$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
+				$status_field = $object->getStatusField();
 
 				foreach ($ids as $id) {
 					$object->Load($id);
@@ -617,12 +617,12 @@
 					if ( $object->Update() ) {
 						switch ($event->Name) {
 							case 'OnMassApprove':
-								$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
-								$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.APPROVED');
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.APPROVED');
 								break;
 							case 'OnMassDecline':
-								$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
-								$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.DENIED');
+								$this->Application->emailUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
+								$this->Application->emailAdmin('AFFILIATE.REGISTRATION.DENIED');
 								break;
 						}
 						$event->status = kEvent::erSUCCESS;