Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php
===================================================================
diff -u -N -r16458 -r16516
--- branches/5.2.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 16458)
+++ branches/5.2.x/units/affiliates/affiliates_event_handler.php	(.../affiliates_event_handler.php)	(revision 16516)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_event_handler.php 16458 2016-11-24 17:05:50Z alex $
+* @version	$Id: affiliates_event_handler.php 16516 2017-01-20 14:12:22Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -121,8 +121,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('AffiliateCode', $this->generateAffiliateCode($event));
 
@@ -147,8 +147,8 @@
 			parent::OnBeforeItemUpdate($event);
 
 			if ( !$this->Application->isAdmin ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$object->SetDBField('PortalUserId', $object->GetOriginalField('PortalUserId'));
 
@@ -170,8 +170,8 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod');
 
@@ -186,8 +186,8 @@
 
 			if ( $object->isLoaded() && ($object->GetDBField('Status') == 1) ) {
 				// user is found with such email
+				/** @var UsersItem $affiliate_user */
 				$affiliate_user = $this->Application->recallObject('u.affiliate', null, Array ('skip_autoload' => true));
-				/* @var $affiliate_user UsersItem */
 
 				$affiliate_user->Load($object->GetDBField('PortalUserId'));
 
@@ -225,20 +225,20 @@
 		 */
 		function OnOrderApprove($event)
 		{
+			/** @var OrdersItem $order */
 			$order = $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial'));
-			/* @var $order OrdersItem */
 
 			$affiliate_id = $order->GetDBField('AffiliateId');
 			if ( !$affiliate_id ) {
 				return false;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('ship_autoload' => true));
-			/* @var $object kDBItem */
 
 			if ( $object->Load($affiliate_id) ) {
+				/** @var kDBItem $affiliate_plan */
 				$affiliate_plan = $this->Application->recallObject('ap', null, Array ('skip_autoload' => true));
-				/* @var $affiliate_plan kDBItem */
 
 				$affiliate_plan->Load($object->GetDBField('AffiliatePlanId'));
 
@@ -309,17 +309,17 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$object->setID(0);
 			$field_values = $this->getSubmittedFields($event);
 			$object->SetFieldsFromHash($field_values);
 			$event->setEventParam('form_data', $field_values);
 
 			if ( !$object->Validate() ) {
+				/** @var kDBItem $user */
 				$user = $event->MasterEvent->getObject();
-				/* @var $user kDBItem */
 
 				$user->Validate();
 
@@ -338,11 +338,11 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var UsersItem $user */
 			$user = $event->MasterEvent->getObject();
-			/* @var $user UsersItem */
 
 			$object->SetDBField('PortalUserId', $user->GetID());
 
@@ -374,8 +374,8 @@
 		 */
 		function OnBecomeAffiliate($event)
 		{
+			/** @var UsersItem $object */
 			$object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
-			/* @var $object UsersItem */
 
 			$event->CallSubEvent('OnCreate');
 
@@ -402,8 +402,8 @@
 			$event->CallSubEvent('OnUpdate');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$this->Application->emailUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
 				$this->Application->emailAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
@@ -429,8 +429,8 @@
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
+			/** @var kDBItem $payment_object */
 			$payment_object = $this->Application->recallObject('apayments', 'apayments', Array ('skip_autoload' => true));
-			/* @var $payment_object kDBItem */
 
 			$id = $event->getEventParam('id');
 			$ap_table = $this->Application->getUnitOption('apayments', 'TableName');
@@ -453,8 +453,8 @@
 				$this->Application->emailAdmin('AFFILIATE.PAYMENT');
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$passed_id = $event->getEventParam('id');
 
@@ -586,8 +586,8 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);
 
@@ -647,8 +647,8 @@
 				return true;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;