Index: branches/5.2.x/units/pricing/pricing_event_handler.php
===================================================================
diff -u -N -r14750 -r14986
--- branches/5.2.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 14750)
+++ branches/5.2.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 14986)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pricing_event_handler.php 14750 2011-11-09 09:36:43Z alex $
+* @version	$Id: pricing_event_handler.php 14986 2012-01-04 16:11:56Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -21,22 +21,35 @@
 	/**
 	 * Allows to override standard permission mapping
 	 *
+	 * @return void
+	 * @access protected
+	 * @see kEventHandler::$permMapping
 	 */
-	function mapPermissions()
+	protected function mapPermissions()
 	{
 		parent::mapPermissions();
-		$permissions = Array(
-			'OnMoreBrackets' => Array('subitem' => 'add|edit'),
-			'OnInfinity' => Array('subitem' => 'add|edit'),
-			'OnArrange' => Array('subitem' => 'add|edit'),
-			'OnDeleteBrackets' => Array('subitem' => 'add|edit'),
+
+		$permissions = Array (
+			'OnMoreBrackets' => Array ('subitem' => 'add|edit'),
+			'OnInfinity' => Array ('subitem' => 'add|edit'),
+			'OnArrange' => Array ('subitem' => 'add|edit'),
+			'OnDeleteBrackets' => Array ('subitem' => 'add|edit'),
 		);
+
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
-	function mapEvents()
+	/**
+	 * Define alternative event processing method names
+	 *
+	 * @return void
+	 * @see kEventHandler::$eventMethods
+	 * @access protected
+	 */
+	protected function mapEvents()
 	{
-		parent::mapEvents();	// ensure auto-adding of approve/decine and so on events
+		parent::mapEvents();	// ensure auto-adding of approve/decline and so on events
+
 		$brackets_events = Array(
 			'OnMoreBrackets' => 'PricingBracketsAction',
 			'OnArrange' => 'PricingBracketsAction',
@@ -448,12 +461,13 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(&$event)
+	protected function SetCustomQuery(kEvent &$event)
 	{
 		$object =& $event->getObject();
+		/* @var $object kDBList */
 
-		if ($this->Application->isAdminUser) {
-			return ;
+		if ( $this->Application->isAdminUser ) {
+			return;
 		}
 
 		if ( $this->Application->ConfigValue('Comm_PriceBracketCalculation') == 1 ) {
@@ -462,7 +476,7 @@
 					WHERE PortalUserId = ' . $this->Application->GetVar('u_id');
 			$pricing_group = $this->Conn->GetOne($sql);
 
-			if ($pricing_group) {
+			if ( $pricing_group ) {
 				$sql = 'SELECT COUNT(*)
 						FROM ' . TABLE_PREFIX . 'ProductsPricing
 						WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND GroupId = ' . $pricing_group . ' AND Price IS NOT NULL';
@@ -484,28 +498,28 @@
 					ORDER BY GroupId ASC, MinQty ASC';
 			$effective_brackets = $this->Conn->Query($sql, 'PriceId');
 
-			$group_prices = array();
+			$group_prices = array ();
 			$min_price = -1;
 			$cheapest_group = 0;
 
 			foreach ($effective_brackets as $bracket) {
-				if (!isset($group_prices[$bracket['GroupId']])) {
+				if ( !isset($group_prices[$bracket['GroupId']]) ) {
 					$group_prices[$bracket['GroupId']] = $bracket['Price'];
-					if ($bracket['Price'] < $min_price || $min_price == -1) {
+					if ( $bracket['Price'] < $min_price || $min_price == -1 ) {
 						$min_price = $bracket['Price'];
 						$cheapest_group = $bracket['GroupId'];
 					}
 				}
 			}
 
-			if (!$cheapest_group) {
+			if ( !$cheapest_group ) {
 				$cheapest_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			}
 
 			$pricing_group = $cheapest_group;
 		}
 
-		$object->addFilter('price_user_group', $object->TableName.'.GroupId='.$pricing_group);
+		$object->addFilter('price_user_group', $object->TableName . '.GroupId=' . $pricing_group);
 	}
 
 }
\ No newline at end of file