Index: branches/5.2.x/units/payment_type/payment_type_event_handler.php
===================================================================
diff -u -N -r14849 -r14986
--- branches/5.2.x/units/payment_type/payment_type_event_handler.php	(.../payment_type_event_handler.php)	(revision 14849)
+++ branches/5.2.x/units/payment_type/payment_type_event_handler.php	(.../payment_type_event_handler.php)	(revision 14986)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: payment_type_event_handler.php 14849 2011-12-08 12:29:09Z alex $
+* @version	$Id: payment_type_event_handler.php 14986 2012-01-04 16:11:56Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -15,9 +15,17 @@
 
 class PaymentTypeEventHandler extends kDBEventHandler
 {
-	function mapEvents()
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
 	{
 		parent::mapEvents();
+
 		$common_events = Array (
 			'OnMassApprove'=>'iterateItems',
 			'OnMassDecline'=>'OnMassDecline',
@@ -31,12 +39,16 @@
 	/**
 	 * Allows to override standard permission mapping
 	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
 	 */
-	function mapPermissions()
+	protected function mapPermissions()
 	{
 		parent::mapPermissions();
-		$permissions = Array(
-			'OnItemBuild' => Array('self' => true),
+
+		$permissions = Array (
+			'OnItemBuild' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
@@ -221,10 +233,11 @@
 	 *
 	 * @param kEvent $event
 	 * @return int
+	 * @access public
 	 */
-	function getPassedID(&$event)
+	public function getPassedID(kEvent &$event)
 	{
-		if ($event->Special == 'auto-ord') {
+		if ( $event->Special == 'auto-ord' ) {
 			$main_object =& $this->Application->recallObject('ord');
 			/* @var $main_object kDBItem */
 
@@ -234,7 +247,7 @@
 			// returns first matched enabled payment type
 			return Array (
 				'Status' => STATUS_ACTIVE,
-				TABLE_PREFIX . 'Gateways.Name' => $event->getEventParam('gateway'),
+				TABLE_PREFIX . 'Gateways.Name' => $event->getEventParam('gateway')
 			);
 		}
 
@@ -249,20 +262,20 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(&$event)
+	protected function SetCustomQuery(kEvent &$event)
 	{
 		parent::SetCustomQuery($event);
 
 		$object =& $event->getObject();
 		/* @var $object kDBList */
 
-		if (in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser) {
+		if ( in_array($event->Special, Array ('enabled', 'selected', 'available')) || !$this->Application->isAdminUser ) {
 			// "enabled" special or Front-End
 			$object->addFilter('enabled_filter', '%1$s.Status = ' . STATUS_ACTIVE);
 		}
 
 		// site domain payment type picker
-		if ($event->Special == 'selected' || $event->Special == 'available') {
+		if ( $event->Special == 'selected' || $event->Special == 'available' ) {
 			$edit_picker_helper =& $this->Application->recallObject('EditPickerHelper');
 			/* @var $edit_picker_helper EditPickerHelper */
 
@@ -272,7 +285,7 @@
 		// apply domain-based payment type filtering
 		$payment_types = $this->Application->siteDomainField('PaymentTypes');
 
-		if (strlen($payment_types)) {
+		if ( strlen($payment_types) ) {
 			$payment_types = explode('|', substr($payment_types, 1, -1));
 			$object->addFilter('domain_filter', '%1$s.PaymentTypeId IN (' . implode(',', $payment_types) . ')');
 		}