Index: branches/5.2.x/units/affiliate_plans/affiliate_plans_event_handler.php
===================================================================
--- branches/5.2.x/units/affiliate_plans/affiliate_plans_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/affiliate_plans/affiliate_plans_event_handler.php	(revision 15540)
@@ -1,127 +1,126 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class AffiliatePlansEventHandler extends kDBEventHandler {
 
 		/**
 		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
 			if ( $event->Special == 'active' ) {
 				$object = $event->getObject();
 				/* @var $object kDBList */
 
 				$object->addFilter('active', '%1$s.Enabled = 1');
 			}
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPrimary($event)
 		{
 			$object = $event->getObject();
 			$object->SetDBField('IsPrimary', 1);
 			$object->Update();
 		}
 
 		/**
 		 * Occurs before updating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->itemChanged($event);
 		}
 
 		/**
 		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->itemChanged($event);
 		}
 
 		/**
 		 * Occurs before item is changed
 		 *
 		 * @param kEvent $event
 		 */
 		function itemChanged($event)
 		{
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$live_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$plans_count = $this->Conn->GetOne('SELECT COUNT(*) FROM ' . $live_table);
 			if ( !$plans_count ) {
 				$object->SetDBField('IsPrimary', 1);
 			}
 
 			if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
 				$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 						SET IsPrimary = 0';
 				$this->Conn->Query($sql);
 
-				$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
-				$object->SetDBField($status_field, 1);
+				$object->SetDBField($object->getStatusField(), 1);
 			}
 		}
 
 		/**
 		 * Don't allow to delete primary affiliate plan
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
 
 				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
 						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 						WHERE IsPrimary = 1';
 				$primary_id = $this->Conn->GetOne($sql);
 
 				$ids = array_diff($ids, Array ($primary_id));
 
 				$event->setEventParam('ids', $ids);
 			}
 		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/pricing/pricing_event_handler.php
===================================================================
--- branches/5.2.x/units/pricing/pricing_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/pricing/pricing_event_handler.php	(revision 15540)
@@ -1,522 +1,522 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 // include globals.php from current folder
-kUtil::includeOnce(MODULES_PATH  .'/in-commerce/units/pricing/globals.php');
+kUtil::includeOnce(MODULES_PATH . '/in-commerce/units/pricing/globals.php');
 
 class PricingEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	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'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Define alternative event processing method names
 	 *
 	 * @return void
 	 * @see kEventHandler::$eventMethods
 	 * @access protected
 	 */
 	protected function mapEvents()
 	{
 		parent::mapEvents();	// ensure auto-adding of approve/decline and so on events
 
 		$brackets_events = Array(
 			'OnMoreBrackets' => 'PricingBracketsAction',
 			'OnArrange' => 'PricingBracketsAction',
 			'OnInfinity' => 'PricingBracketsAction',
 			'OnDeleteBrackets' => 'PricingBracketsAction',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $brackets_events);
 	}
 
 	function PricingBracketsAction($event)
 	{
 		$event->redirect=false;
 		$temp = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 //		$object = $event->getObject();
 //		$formatter = $this->Application->recallObject('kFormatter');
 //		$temp = $formatter->TypeCastArray($temp, $object);
 
 		//uasort($temp, 'pr_bracket_comp');
 		$bracket = $this->Application->recallObject($event->getPrefixSpecial());
 		foreach($temp as $id => $record)
 		{
 			if( $record['MaxQty'] == '&#8734;' || $record['MaxQty'] == '∞')
 			{
 				$temp[$id]['MaxQty'] = -1;
 			}
 		}
 
 		$group_id = $this->Application->getVar('group_id');
 		if($group_id>0){
 			$where_group=' GroupId = '.$group_id.' ';
 		}
 		else {
 			$where_group= ' TRUE ';
 		}
 
 		switch ($event->Name)
 		{
 			case 'OnMoreBrackets':
 
 				$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$bracket->IDField.') FROM '.$bracket->TableName);
 				if($new_id > 0) $new_id = 0;
 				do
 				{
 					$new_id--;
 				} while
 				($this->check_array($this->Application->GetVar($event->getPrefixSpecial(true)), 'PriceId', $new_id));
 
 
 				$last_max_qty = $this->Conn->GetOne('SELECT MAX(MaxQty) FROM '.$bracket->TableName.' WHERE '.$where_group);
 				$min_qty = $this->Conn->GetOne('SELECT MIN(MaxQty) FROM '.$bracket->TableName.' WHERE '.$where_group);
 
 				if ($min_qty==-1) $last_max_qty = -1;
 				if (!$last_max_qty) $last_max_qty=1;
 
 				for($i = $new_id; $i > $new_id - 5; $i--)
 				{
 					$temp[$i]['PriceId'] = $i;
 					$temp[$i]['MinQty'] = ($i == $new_id-4 && $last_max_qty != -1) ? $last_max_qty : '';
 					$temp[$i]['MaxQty'] = ($i == $new_id-4 && $last_max_qty != -1) ? -1 : '';
 					$temp[$i]['Price'] = '';
 					$temp[$i]['Cost'] = '';
 					$temp[$i]['Points'] = '';
 					$temp[$i]['Negotiated'] = '0';
 					$temp[$i]['IsPrimary'] = '0';
 					$temp[$i]['GroupId'] = $group_id;
 				}
 
 				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
 				$event->CallSubEvent('OnPreSaveBrackets');
 				break;
 
 			case 'OnArrange':
 				$temp=$this->OnArrangeBrackets($event, $temp, $bracket);
 				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
 				$event->CallSubEvent('OnPreSaveBrackets');
 				break;
 
 			case 'OnInfinity':
 				$temp=$this->OnArrangeBrackets($event, $temp, $bracket);
 				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
 				$event->CallSubEvent('OnPreSaveBrackets');
 
 				$infinite_exists = $this->Conn->GetOne('SELECT count(*) FROM '.$bracket->TableName.' WHERE MaxQty=-1 '.' AND '.$where_group);
 
 				if($infinite_exists==0){
 					reset($temp);
 					$last_bracket=end($temp);
 					$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$bracket->IDField.') FROM '.$bracket->TableName);
 
 					$brackets_exist = (int)$this->Conn->GetOne('SELECT COUNT(*) FROM '.$bracket->TableName.' WHERE '.$where_group);
 
 					if($new_id > 0) $new_id = 0;
 					do
 					{
 						$new_id--;
 					} while
 					($this->check_array($this->Application->GetVar($event->getPrefixSpecial(true)), 'PriceId', $new_id));
 
 
 					$infinite_bracket['PriceId'] = $new_id;
 					$infinite_bracket['MinQty'] = ($brackets_exist>0)?$last_bracket['MaxQty']:1;
 					$infinite_bracket['MaxQty'] = '-1';
 					$infinite_bracket['Price'] = '';
 					$infinite_bracket['Cost'] = '';
 					$infinite_bracket['Points'] = '';
 					$infinite_bracket['Negotiated'] = '0';
 					$infinite_bracket['IsPrimary'] = '0';
 					$infinite_bracket['GroupId'] = $group_id;
 					$temp[$new_id]=$infinite_bracket;
 					reset($temp);
 				}
 
 				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
 				$event->CallSubEvent('OnPreSaveBrackets');
 				break;
 
 			case 'OnDeleteBrackets':
 				if ($group_id) {
 					$temp = ''; // delete all pricings from "pr_tang" var
 
 					$sql = 'DELETE FROM ' . $bracket->TableName . '
 							WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND GroupId = ' . $group_id;
 					$this->Conn->Query($sql);
 				}
 				break;
 
 			default:
 		}
 
 		$this->Application->SetVar($event->getPrefixSpecial(true), $temp); // store pr_tang var
 	}
 
 	function OnPreSaveBrackets($event)
 	{
 		if( $this->Application->GetVar('pr_tang') ) {
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$product_id = $this->Application->GetVar('p_id');
 			$group_id = $this->Application->getVar('group_id');
 
 			$sql = 'SELECT PriceId
 					FROM ' . $object->TableName . '
 					WHERE ProductId = ' . $product_id . ' ' . ($group_id? 'AND GroupId = ' . $group_id : '');
 			$stored_ids = $this->Conn->GetCol($sql);
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); // get pr_tang var
 			uasort($items_info, 'pr_bracket_comp');
 
 			foreach ($items_info as $item_id => $field_values) {
 
 				if (in_array($item_id, $stored_ids)) { //if it's already exist
 					$object->Load($item_id);
 					$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 
 					if (!$object->Validate()) {
 						unset($stored_ids[array_search($item_id, $stored_ids)]);
 						$event->redirect = false;
 						continue;
 					}
 					if( $object->Update($item_id) ) {
 						$event->status=kEvent::erSUCCESS;
 					}
 					else {
 						$event->status=kEvent::erFAIL;
 						$event->redirect=false;
 						break;
 					}
 					unset($stored_ids[array_search($item_id, $stored_ids)]);
 				}
 				else {
 					$object->Clear();
 					$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 					$object->SetDBField('ProductId', $product_id);
 
 					if( $object->Create() ) {
 						$event->status=kEvent::erSUCCESS;
 					}
 				}
 			}
 
 			// delete
 			foreach ($stored_ids as $stored_id) {
 				$this->Conn->Query('DELETE FROM ' . $object->TableName . ' WHERE PriceId = ' . $stored_id);
 			}
 
 		}
 	}
 
 	/**
 	 * Apply custom processing to item
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
 		$bracket = $event->getObject();
 		/* @var $bracket kDBItem */
 
 		switch ($type) {
 			case 'before':
 				$bracket->SetDBField('ProductId', $this->Application->GetVar('p_id'));
 
 				if ( $bracket->GetDBField('MaxQty') == '&#8734;' || $bracket->GetDBField('MaxQty') == '∞' ) {
 					$bracket->SetDBField('MaxQty', -1);
 				}
 				break;
 		}
 	}
 
 	function OnArrangeBrackets($event, &$temp, &$bracket)
 	{
 		$temp_orig = $temp;
 		reset($temp);
 		if (is_array($temp))
 		{
 			// array to store max values (2nd column)
 			$end_values = Array();
 
 			// get minimal value of Min
 			$first_elem=current($temp);
 			$start = $first_elem['MinQty'];
 			if (!$start){
 				$start = 1;
 			}
 			foreach($temp as $id => $record)
 			{
 
 				/*
 				This 3-ifs logic fixes collision with invalid input values having
 				1 pricing record.
 				The logic is:
 				1) If we got Max less than Min, we set Min to 1 that gives us
 				integrity.
 				2) If we got equal values for Min and Max, we set range 1..Max like
 				in previous. But if Min was 1 and Max was 1 we set full range 1..infinity
 				3) If we got Max = 0 we just set it tom infinity because we can't
 				guess what user meant
 				*/
 
 				if (sizeof($temp) == 1 && $record['MinQty'] > ($record['MaxQty'] == -1 ? $record['MinQty']+1 : $record['MaxQty']) ){
 					$record['MinQty'] = 1;
 					$temp[$id]['MinQty'] = 1;
 					$start = 1;
 				}
 
 				if (sizeof($temp) == 1 && $record['MinQty'] == $record['MaxQty']){
 					if ($record['MaxQty'] == 1){
 						$record['MaxQty'] = -1;
 						$temp[$id]['MaxQty'] = -1;
 					}
 					else {
 						$record['MinQty'] = 1;
 						$temp[$id]['MinQty'] = 1;
 					}
 				}
 
 				if (sizeof($temp) == 1 && $record['MaxQty'] == 0){
 					$record['MaxQty'] = -1;
 					$temp[$id]['MaxQty'] = -1;
 				}
 
 				if(
 				// MAX is less than start
 				($record['MaxQty'] <= $start && $record['MaxQty'] != -1) ||
 				// Max is empty
 				!$record['MaxQty'] ||
 				// Max already defined in $end_values
 				(array_search($record['MaxQty'], $end_values) !== false)
 				) {	// then delete from brackets list
 					unset($temp[$id]);
 				}
 				else {	// this is when ok - add to end_values list
 					$end_values[] = $record['MaxQty'];
 				}
 			}
 
 			// sort brackets by 2nd column (Max values)
 			uasort($temp, 'pr_bracket_comp');
 			reset($temp);
 			$first_item=each($temp);
 			$first_item_key=$first_item['key'];
 
 			$group_id = $this->Application->getVar('group_id');
 
 
 			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			if($group_id>0){
 				$where_group=' AND GroupId = '.$group_id.' ';
 			}
 
 			$ids = $this->Conn->GetCol('SELECT PriceId FROM '.$bracket->TableName.' WHERE ProductId='.$this->Application->GetVar('p_id').' '.$where_group);
 			if(is_array($ids)) {
 				usort($ids, 'pr_bracket_id_sort');
 			}
 			$min_id = min( min($ids) - 1, -1 );
 
 
 			foreach($temp as $key => $record)
 			{
 				$temp[$key]['MinQty']=$start;
 				$temp[$key]['IsPrimary']=0;
 				$temp[$key]['GroupId']=$group_id;
 				$start=$temp[$key]['MaxQty'];
 
 			}
 			if ($temp[$first_item_key]['GroupId'] == $default_group) {
 				$temp[$first_item_key]['IsPrimary']=1;
 			}
 
 		}
 		return $temp;
 	}
 
 	/**
 	 * Set's price as primary for product
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSetPrimary($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$this->StoreSelectedIDs($event);
 		$ids=$this->getSelectedIDs($event);
 		if($ids)
 		{
 			$id = array_shift($ids);
 			$table_info = $object->getLinkedInfo();
 
 			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 0 WHERE '.$table_info['ForeignKey'].' = '.$table_info['ParentId']);
 			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 1 WHERE ('.$table_info['ForeignKey'].' = '.$table_info['ParentId'].') AND (PriceId = '.$id.')');
 		}
 		$event->SetRedirectParam('opener', 's');
 	}
 
 	/**
 	 * Resets primary mark for other prices of given product, when current pricing is primary
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		if ( $object->GetDBField('IsPrimary') == 1 ) {
 			// make all prices non primary, when this one is
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET IsPrimary = 0
 					WHERE (ProductId = ' . $object->GetDBField('ProductId') . ') AND (' . $object->IDField . ' <> ' . $object->GetID() . ')';
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
 	 * Occurs before creating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$table_info = $object->getLinkedInfo($event->Special);
 
 		$table_info['ParentId'] = ($table_info['ParentId'] ? $table_info['ParentId'] : 0);
 
 		if ( $object->GetDBField('IsPrimary') == 1 ) {
 			$sql = 'UPDATE ' . $object->TableName . '
 					SET IsPrimary = 0
 					WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
 			$this->Conn->Query($sql);
 		}
 		else {
 			$sql = 'SELECT COUNT(*)
 					FROM ' . $object->TableName . '
 					WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
 			$prices_qty = $this->Conn->GetOne($sql);
 
 			if ( $prices_qty == 0 ) {
 				$object->SetDBField('IsPrimary', 1);
 			}
 		}
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		$object = $event->getObject();
 		/* @var $object kDBList */
 
 		if ( $this->Application->isAdminUser ) {
 			return;
 		}
 
 		if ( $this->Application->ConfigValue('Comm_PriceBracketCalculation') == 1 ) {
 			$sql = 'SELECT PrimaryGroupId
 					FROM ' . TABLE_PREFIX . 'Users
 					WHERE PortalUserId = ' . $this->Application->GetVar('u_id');
 			$pricing_group = $this->Conn->GetOne($sql);
 
 			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';
 				$pricing_for_group_exists = $this->Conn->GetOne($sql);
 			}
 
 			if ( !$pricing_group || !$pricing_for_group_exists ) {
 				$pricing_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			}
 		}
 		else {
 			$user_groups = $this->Application->RecallVar('UserGroups');
 
 			//$cheapest_group = $this->Conn->GetOne('SELECT GroupId FROM '.$object->TableName.' WHERE ProductId='.$this->Application->GetVar('p_id').' AND Price IS NOT NULL AND GroupId IN ('.$user_groups.') AND MinQty = 1 GROUP BY GroupId ORDER BY Price ASC');
 
 			$sql = 'SELECT PriceId, Price, GroupId
 					FROM ' . $object->TableName . '
 					WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND Price IS NOT NULL AND GroupId IN (' . $user_groups . ')
 					ORDER BY GroupId ASC, MinQty ASC';
 			$effective_brackets = $this->Conn->Query($sql, 'PriceId');
 
 			$group_prices = array ();
 			$min_price = -1;
 			$cheapest_group = 0;
 
 			foreach ($effective_brackets as $bracket) {
 				if ( !isset($group_prices[$bracket['GroupId']]) ) {
 					$group_prices[$bracket['GroupId']] = $bracket['Price'];
 					if ( $bracket['Price'] < $min_price || $min_price == -1 ) {
 						$min_price = $bracket['Price'];
 						$cheapest_group = $bracket['GroupId'];
 					}
 				}
 			}
 
 			if ( !$cheapest_group ) {
 				$cheapest_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			}
 
 			$pricing_group = $cheapest_group;
 		}
 
 		$object->addFilter('price_user_group', $object->TableName . '.GroupId=' . $pricing_group);
 	}
 
 }
\ No newline at end of file
Index: branches/5.2.x/units/brackets/brackets_tag_processor.php
===================================================================
--- branches/5.2.x/units/brackets/brackets_tag_processor.php	(revision 15539)
+++ branches/5.2.x/units/brackets/brackets_tag_processor.php	(revision 15540)
@@ -1,199 +1,202 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class BracketsTagProcessor extends kDBTagProcessor {
 
 	function Field($params)
 	{
 		$value = parent::Field($params);
+		$field = $this->SelectParam($params, 'name,field');
 
-		if ( ($params['field'] == 'Start' || $params['name'] == 'End') && $value == -1) {
+		if ( ($field == 'Start' || $field == 'End') && $value == -1 ) {
 			$value = '&#8734;';
 		}
 
 		return $value;
 	}
 
 	function ShowBracketsForm($params)
 	{
 		$shipping_object = $this->Application->recallObject('s');
+		/* @var $shipping_object kDBItem */
+
 		$default_start = ($shipping_object->GetDBField('Type') == 1) ? 0 : 1;
 
 		$brackets_helper = $this->Application->recallObject('BracketsHelper');
 		/* @var $brackets_helper kBracketsHelper */
 
 		$brackets_helper->InitHelper('Start', 'End', Array(), $default_start );
 
 		$br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
 
 		$event = new kEvent($this->getPrefixSpecial(true) . ':OnArrange');
 		$br_data = $brackets_helper->getBrackets($event);
 		$linked_info = $br_object->getLinkedInfo($this->Special);
 
 		if (!$br_data) {
 			$sql = 	'SELECT * FROM '.$br_object->TableName.' WHERE '.$linked_info['ForeignKey'].' = '.$linked_info['ParentId'];
 			$brackets = $this->Conn->Query($sql, $br_object->IDField);
 
 			usort($brackets, Array(&$brackets_helper, 'compareBrackets'));
 
 			$dummy = $this->Application->recallObject($this->Prefix.'.-dummy', null, array('skip_autoload' => true));
 			/* @var $dummy kDBItem */
 
 			// performs number formatting
 			foreach($brackets as $id => $values)
 			{
 				foreach($values as $value_key=>$value_val){
 					$dummy->SetDBField($value_key, $value_val);
 					$brackets[$id][$value_key] = $dummy->GetField($value_key);
 				}
 			}
 
 			$br_data = $brackets;
 			$brackets_helper->setBrackets($event, $brackets);
 		}
 		else {
 			usort($br_data, Array(&$brackets_helper, 'compareBrackets'));
 			$br_data = $brackets_helper->formatBrackets($br_data);
 		}
 
 		$ret = '';
 		if ( is_array($br_data) ) {
 			$block_params = $this->prepareTagParams($params);
 			$block_params['IdField'] = $br_object->IDField;
 			$block_params['name'] = $params['block'];
 			$first = true;
 
 			$main_object = $this->Application->recallObject($linked_info['ParentPrefix'].'.'.$this->Special);
 //			$plan_type = $main_object->GetDBField('PlanType');
 //			$limits_format = ($plan_type == 2) ? '%d' : $br_object->getFieldOption('Start', 'format');
 
 			// this is needed to find next id
 			$br_data_copy = $br_data;
 			foreach($br_data as $id => $values)
 			{
 
 				foreach($values as $value_key => $value_val)
 				{
 					$block_params[$value_key] = $value_val;
 				}
 				reset($values);
 
 				next($br_data_copy);
 				$next_bracket = current($br_data_copy);
 
 //				$values['Start'] = sprintf($limits_format, $values['Start']);
 //				$values['End'] = sprintf($limits_format, $values['End']);
 
 				$block_params['id']	= $values[$br_object->IDField];
 				$block_params['min'] = ($id == -1) ? ($values['Start'] ? $values['Start'] : 0) : $values['Start'];
 				$block_params['max'] = ($values['End'] == -1) ? '&#8734;' : $values['End'];
 				$block_params['next_min_id'] = $next_bracket[$br_object->IDField];
 
 				$lang_object = $this->Application->recallObject('lang.current');
 				if($lang_object->GetDBField('UnitSystem') == 2 && $main_object->GetDBField('Type') == 1)
 				{
 					if($block_params['min'] === '')
 					{
 						$block_params['min_a'] = '';
 						$block_params['min_b'] = '';
 					}
 					else
 					{
 						list($block_params['min_a'], $block_params['min_b']) = kUtil::Kg2Pounds($block_params['min']);
 					}
 
 					if($block_params['max'] == '&#8734;')
 					{
 						$block_params['max_a'] = '&#8734;';
 						$block_params['max_b'] = '';
 					}
 					else
 					{
 						list($block_params['max_a'], $block_params['max_b']) = kUtil::Kg2Pounds($block_params['max']);
 					}
 				}
 
 				if($first)
 				{
 					$block_params['first'] = 1;
 					$first = false;
 				}
 				else
 				{
 					$block_params['first'] = 0;
 				}
 				$ret .= $this->Application->ParseBlock($block_params, 1);
 			}
 		}
 		return $ret;
 	}
 
 
 	/*
 	function ShowBracketsForm($params)
 	{
 		$br_object = $this->Application->recallObject( $this->getPrefixSpecial() );
 
 		$br_data = $this->Application->GetVar('br');
 
 		if(!$br_data)
 		{
 			$sql = 	'SELECT * FROM '.$br_object->TableName.
 					' WHERE ShippingTypeID = '.$this->Application->GetVar('s_id');
 			$brackets = $this->Conn->Query($sql, 'BracketId');
 			usort($brackets, 'bracket_comp');
 
 			$br_data = array_reverse($brackets);
 			$this->Application->SetVar('br', $br_data);
 		}
 		else
 		{
 			$br_data = array_reverse($br_data);
 		}
 
 		$ret = '';
 		if( is_array($br_data) )
 		{
 			$i = -count($br_data);
 			ksort($br_data);
 			foreach($br_data as $record)
 			{
 				$temp_sorted[$i] = $record;
 				$i++;
 			}
 			$br_data = array_reverse($temp_sorted, true);
 
 			$block_params['name'] = $params['block'];
 			$first = true;
 			foreach($br_data as $id => $values)
 			{
 				$block_params['id']	= $id;
 				$block_params['start']	= ($id == -1) ? ($values['Start'] ? $values['Start'] : 0) : $values['Start'];
 				$block_params['end'] = ($values['End'] == -1) ? '&infin;' : $values['End'];
 				if ($first)
 				{
 					$block_params['first'] = 1;
 					$first = false;
 				}
 				else
 				{
 					$block_params['first'] = 0;
 				}
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
 		}
 		return $ret;
 	}*/
 }
\ No newline at end of file
Index: branches/5.2.x/units/destinations/dst_event_handler.php
===================================================================
--- branches/5.2.x/units/destinations/dst_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/destinations/dst_event_handler.php	(revision 15540)
@@ -1,132 +1,134 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class DstEventHandler extends kDBEventHandler {
 
 	/**
 	 * Creates item from submit data
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCreate(kEvent $event)
 	{
 		$object = $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
 
 		// creates multiple db records from single request (OnCreate event only creates 1 record)
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 		if ( !$items_info ) {
 			return;
 		}
 
 		foreach ($items_info as $field_values) {
 			$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 			$this->customProcessing($event, 'before');
 
 			if ( $object->Create() ) {
 				$this->customProcessing($event, 'after');
 				$event->status = kEvent::erSUCCESS;
 			}
 			else {
 				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 				$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 				$object->setID(0);
 			}
 		}
 	}
 
 	/**
 	 * Apply custom processing to item
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $type != 'before' ) {
 			return;
 		}
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$events = $this->Application->GetVar('events');
 
 		if ( $events['z'] == 'OnUpdate' ) {
 			$object->SetDBField('ShippingZoneId', $this->Application->GetVar('z_id'));
 		}
 
 		$zone_object = $this->Application->recallObject('z');
 		/* @var $zone_object kDBItem */
 
 		if ( $zone_object->GetDBField('Type') == 3 ) {
 			$object->SetDBField('StdDestId', $this->Application->GetVar('ZIPCountry'));
 		}
 	}
 
 	 /**
 	 *
 	 *
 	 * @param kEvent $event
 	 */
 	function OnZoneUpdate($event) {
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
-		$zone_object = &$this->Application->recallObject('z');
+		$zone_object = $this->Application->recallObject('z');
+		/* @var $zone_object kDBItem */
+
 		$zone_id = (int)$zone_object->GetID();
 		$zone_type = $zone_object->GetDBField('Type');
 
 		$delete_zones_sql = 'DELETE FROM '.$object->TableName.' WHERE ShippingZoneId = '.$zone_id;
 		$this->Conn->Query($delete_zones_sql);
 
 		if ($zone_id != 0){
 			$delete_zones_sql = 'DELETE FROM '.$object->TableName.' WHERE ShippingZoneId = 0';
 			$this->Conn->Query($delete_zones_sql);
 		}
 
 		$selected_destinations = $this->Application->GetVar('selected_destinations');
 		$selected_destinations_array = explode(',', $selected_destinations);
 		$selected_destinations_array = array_unique($selected_destinations_array);
 		foreach ($selected_destinations_array as $key => $dest_id) {
 
 					if ($zone_object->GetDBField('Type') == 3){
 						list ($zone_dest_id, $dest_value) = explode('|', $dest_id);
 						$dest_id = $this->Application->GetVar('CountrySelector');
 					}
 					else {
 						$dest_value = '';
 					}
 
 					if ($dest_id > 0){
 						$object->SetDBField('ShippingZoneId', $zone_id);
 						$object->SetDBField('StdDestId', $dest_id);
 						$object->SetDBField('DestValue', $dest_value);
 						$object->Create();
 					}
 
 		}
 
 
 	}
 
 }
\ No newline at end of file
Index: branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_event_handler.php
===================================================================
--- branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(revision 15540)
@@ -1,124 +1,123 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class AffiliatePaymentTypesEventHandler extends kDBEventHandler  {
 
 		/**
 		 * Lists only active affiliate payment types on Front-End
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
 		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
 			if ( !$this->Application->isAdmin ) {
 				$object = $event->getObject();
 				/* @var $object kDBList */
 
 				$object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSetPrimary($event)
 		{
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$object->SetDBField('IsPrimary', 1);
 			$object->Update();
 		}
 
 
 		/**
 		 * Ensures, that user have only one "use as billing" / "use as shipping" address
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			$this->itemChanged($event);
 		}
 
 		/**
 		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->itemChanged($event);
 		}
 
 		/**
 		 * Occurs before item is changed
 		 *
 		 * @param kEvent $event
 		 */
 		function itemChanged($event)
 		{
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
 				$sql = 'UPDATE ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 						SET IsPrimary = 0';
 				$this->Conn->Query($sql);
 
-				$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
-				$object->SetDBField($status_field, 1);
+				$object->SetDBField($object->getStatusField(), 1);
 			}
 		}
 
 		/**
 		 * Don't allow to delete primary affiliate payment type
 		 *
 		 * @param kEvent $event
 		 * @param string $type
 		 * @return void
 		 * @access protected
 		 */
 		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
 
 				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
 						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 						WHERE IsPrimary = 1';
 				$primary_id = $this->Conn->GetOne($sql);
 
 				$ids = array_diff($ids, Array ($primary_id));
 
 				$event->setEventParam('ids', $ids);
 			}
 		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/payment_type/payment_type_event_handler.php
===================================================================
--- branches/5.2.x/units/payment_type/payment_type_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/payment_type/payment_type_event_handler.php	(revision 15540)
@@ -1,295 +1,295 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class PaymentTypeEventHandler extends kDBEventHandler
 {
 	/**
 	 * 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',
 			'OnMassMoveUp'=>'iterateItems',
 			'OnMassMoveDown'=>'iterateItems',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $common_events);
 	}
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			'OnItemBuild' => Array ('self' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Set's new category as primary for product
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSetPrimary($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$this->StoreSelectedIDs($event);
 		$ids=$this->getSelectedIDs($event);
 		if($ids)
 		{
 			$id = array_shift($ids);
 			$table_info = $object->getLinkedInfo();
 
 			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 0 ');
 			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 1, Status = 1 WHERE PaymentTypeId = '.$id.' ');
 		}
 		$event->SetRedirectParam('opener', 's');
 	}
 
 	function OnMassDecline($event)
 	{
 		$object = $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
 
 		$this->StoreSelectedIDs($event);
 		$ids = $this->getSelectedIDs($event);
 
 		if ( $ids ) {
-			$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
+			$status_field = $object->getStatusField();
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				if ( !$object->GetDBField("IsPrimary") ) {
 					$object->SetDBField($status_field, 0);
 				}
 
 				if ( $object->Update() ) {
 					$event->status = kEvent::erSUCCESS;
 					$event->SetRedirectParam('opener', 's');
 				}
 				else {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					break;
 				}
 			}
 		}
 	}
 
 	/**
 	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
-		$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
+		$status_field = $object->getStatusField();
 
 		if ( $object->GetDBField('IsPrimary') == 1 && $object->GetDBField($status_field) == 0 ) {
 			$object->SetDBField($status_field, 1);
 		}
 
 		$this->convertGroups($event);
 	}
 
 	/**
 	 * Occurs before creating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$this->convertGroups($event);
 	}
 
 	/**
 	 * Disable delete on primary payment type
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$ids_ok = Array ();
 			$ids = $event->getEventParam('ids');
 
 			foreach ($ids as $id) {
 				$object->Load($id);
 
 				if ( $object->GetDBField('IsPrimary') ) {
 					$this->Application->StoreVar('pt_delete_error', '1');
 				}
 				else {
 					$ids_ok[] = $id;
 				}
 			}
 
 			$event->setEventParam('ids', $ids_ok);
 		}
 	}
 
 	/**
 	 * Saves content of temp table into live and
 	 * redirects to event' default redirect (normally grid template)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		$this->Application->StoreVar('check_unused_currencies', 1);
 
 		parent::OnSave($event);
 	}
 
 	/**
 	 * Sets default payment type group
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
 
 		$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
 		$fields['PortalGroups']['default'] = ','.$default_group.',';
 		$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 	}
 
 	/**
 	 * Earlier version of group selector control needs such conversion (also used in shipping)
 	 *
 	 * @param kEvent $event
 	 */
 	function convertGroups($event)
 	{
 		$object = $event->getObject();
 
 		$selected_groups = $object->GetDBField('PortalGroups');
 		if ($selected_groups) {
 			$selected_groups = str_replace('|', ',', $selected_groups);
 			$selected_groups = ','.trim($selected_groups, ',').',';
 			$object->SetDBField('PortalGroups', $selected_groups);
 		}
 	}
 
 	/**
 	 * Returns ID of current item to be edited
 	 * by checking ID passed in get/post as prefix_id
 	 * or by looking at first from selected ids, stored.
 	 * Returned id is also stored in Session in case
 	 * it was explicitly passed as get/post
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access public
 	 */
 	public function getPassedID(kEvent $event)
 	{
 		if ( $event->Special == 'auto-ord' ) {
 			$main_object = $this->Application->recallObject('ord');
 			/* @var $main_object kDBItem */
 
 			return $main_object->GetDBField('PaymentType');
 		}
 		elseif ( substr($event->Special, 0, 3) == 'gw-' ) {
 			// returns first matched enabled payment type
 			return Array (
 				'Status' => STATUS_ACTIVE,
 				TABLE_PREFIX . 'Gateways.Name' => $event->getEventParam('gateway')
 			);
 		}
 
 		return parent::getPassedID($event);
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	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 ) {
 			// "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' ) {
 			$edit_picker_helper = $this->Application->recallObject('EditPickerHelper');
 			/* @var $edit_picker_helper EditPickerHelper */
 
 			$edit_picker_helper->applyFilter($event, 'PaymentTypes');
 		}
 
 		// apply domain-based payment type filtering
 		$payment_types = $this->Application->siteDomainField('PaymentTypes');
 
 		if ( strlen($payment_types) ) {
 			$payment_types = explode('|', substr($payment_types, 1, -1));
 			$object->addFilter('domain_filter', '%1$s.PaymentTypeId IN (' . implode(',', $payment_types) . ')');
 		}
 	}
 
 }
\ No newline at end of file
Index: branches/5.2.x/units/shipping/shipping_tag_processor.php
===================================================================
--- branches/5.2.x/units/shipping/shipping_tag_processor.php	(revision 15539)
+++ branches/5.2.x/units/shipping/shipping_tag_processor.php	(revision 15540)
@@ -1,323 +1,337 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
+// include globals.php from current folder
+kUtil::includeOnce(MODULES_PATH . '/in-commerce/units/pricing/globals.php');
+
 class ShippingTagProcessor extends kDBTagProcessor {
 
 	function CostInputSize($params)
 	{
 		$object = $this->Application->recallObject( $this->getPrefixSpecial() );
 		$prec_before_sep = $object->GetDBField('PrecisionBeforeSep');
 		$prec_after_sep = $object->GetDBField('PrecisionAfterSep');
 		return $prec_before_sep + $prec_after_sep + 1 + ($prec_before_sep > 3 ? 1:0);
 	}
 
 	function ShowCostsTable($params)
 	{
 		$object = $this->Application->recallObject( $this->getPrefixSpecial() );
 		$zones_object = $this->Application->recallObject('z');
 		$brackets_object = $this->Application->recallObject('br');
 
 		$costs_object = $this->Application->recallObject('sc');
 		/* @var $costs_object kDBItem */
 
 		$main_processor = $this->Application->recallObject('m_TagProcessor');
 
 		$zones_sql = 'SELECT * FROM '.$zones_object->TableName.' WHERE ShippingTypeID='.$this->Application->GetVar('s_id').' ORDER BY Name ASC';
 		$brackets_sql = 'SELECT * FROM '.$brackets_object->TableName.' WHERE ShippingTypeID='.$this->Application->GetVar('s_id').' ORDER BY Start ASC';
 
 		$sql = 'SELECT * FROM '.$costs_object->TableName;
 		$costs_array = $this->Conn->Query($sql, 'ShippingCostId');
 
 		$zones = $this->Conn->Query($zones_sql, 'ZoneID');
 		$brackets = $this->Conn->Query($brackets_sql, 'BracketId');
 
 		$oddevenparam['odd'] = 'table-color1';
 		$oddevenparam['even'] = 'table-color2';
 
 		if(!$zones || !$brackets)
 		{
 			return '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td>'.$this->Application->Phrase('la_NoZonesOrBrackets').'</td></tr>';
 		}
 
 		uasort($brackets, 'bracket_comp');
 
 		if( $this->Application->GetLinkedVar('CostsTableAligment') )
 		{
 			$column_items = $brackets;
 			$column_object =& $brackets_object;
 			$column_params['header_caption'] = 'bracket_caption';
 			$column_params['IdField'] = 'BracketId';
 			$column_params['prefix'] = 'br';
 
 			$row_items = $zones;
 			$row_object =& $zones_object;
 			$row_params['header_caption'] = 'zone_caption';
 			$row_params['IdField'] = 'ZoneID';
 			$row_params['prefix'] = 'z';
 		}
 		else
 		{
 			$column_items = $zones;
 			$column_object =& $zones_object;
 			$column_params['header_caption'] = 'zone_caption';
 			$column_params['IdField'] = 'ZoneID';
 			$column_params['prefix'] = 'z';
 
 			$row_items = $brackets;
 			$row_object =& $brackets_object;
 			$row_params['header_caption'] = 'bracket_caption';
 			$row_params['IdField'] = 'BracketId';
 			$row_params['prefix'] = 'br';
 		}
 
 		$costs_table = '<tr class="'.$main_processor->Odd_Even($oddevenparam).'"><td>&nbsp;</td>';
 
 		foreach($column_items as $id => $record)
 		{
 			$column_object->Load($id);
 			$head_row_params = $column_params;
 			$head_row_params['name'] = 'column_header';
 			$costs_table .= $this->Application->ParseBlock($head_row_params);
 		}
 		$costs_table .= '</tr>';
 
 		$cost_ids = Array();
 		foreach($row_items as $id =>$record)
 		{
 			$costs_table .= '<tr class="'.$main_processor->Odd_Even($oddevenparam).'">';
 			$row_object->Load($id);
 			$head_row_params = $row_params;
 			$head_row_params['name'] = 'row_header';
 			$costs_table .= $this->Application->ParseBlock($head_row_params);
 			foreach($column_items as $col_id => $col_record)
 			{
 				$res = false;
 
 				foreach($costs_array as $cost_id => $cost_record)
 				{
 					if($cost_record[$row_params['IdField']] == $id && $cost_record[$column_params['IdField']] == $col_id)
 					{
 						$costs_object->SetDBFieldsFromHash($cost_record);
 						$res = true;
 						break;
 					}
 				}
 
 				if($res == false)
 				{
 					$costs_object->Clear();
 					$sql = 'SELECT MIN(ShippingCostId) FROM '.$costs_object->TableName;
 					$new_id = $cost_ids ? min( $this->Conn->GetOne($sql) - 1, min($cost_ids) - 1 ) : 0;
 					$costs_object->SetDBField( 'ShippingCostId', $new_id );
 					$cost_ids[] = $new_id;
 				}
 				$column_object->Load($col_id);
 				$costs_object->SetID($costs_object->GetDBField('ShippingCostId'));
 				$cost_cell_params['name'] = 'cost_cell';
 
 				$costs_table .= $this->Application->ParseBlock($cost_cell_params);
 			}
 			$costs_table .= '</tr>';
 		}
 		return $costs_table;
 	}
 
 	function HiddenSelection($params)
 	{
 		// $object = $this->getPrefixSpecial();
 
 		$zones = $this->Application->GetVar('z');
 		$brackets = $this->Application->GetVar('br');
 
 		$ret = '';
 		foreach($zones as $id => $record)
 		{
 			$ret .= '<input type="hidden" name="z['.$id.'][ZoneID]" value="'.$id.'">'."\n";
 		}
 		foreach ($brackets as $id => $record)
 		{
 			$ret .= '<input type="hidden" name="br['.$id.'][BracketId]" value="'.$id.'">'."\n";
 		}
 		return $ret;
 	}
 
 	function Order_PrintShippingTypes($params)
 	{
 		$weight = $this->Application->Parser->GetParam('weight_metric');
 		$items = $this->Application->Parser->GetParam('items');
 		$amount = $this->Application->Parser->GetParam('amount');
 		$selected_id = $this->Application->Parser->GetParam('selected_id');
 		$package_id = $this->Application->Parser->GetParam('package_num');
 
 		// free promo shipping params if applicable, if not then the same as standard
 		$promo_items = $this->Application->Parser->GetParam('promo_items');
 		$promo_amount = $this->Application->Parser->GetParam('promo_amount');
 		$promo_weight = $this->Application->Parser->GetParam('promo_weight_metric');
 
 		$user_country_id = $this->Application->Parser->GetParam('user_country_id');
 		$user_state_id = $this->Application->Parser->GetParam('user_state_id');
 		$user_zip = $this->Application->Parser->GetParam('user_zip');
 		$user_city = $this->Application->Parser->GetParam('user_city');
 		$user_addr1 = $this->Application->Parser->GetParam('user_addr1');
 		$user_addr2 = $this->Application->Parser->GetParam('user_addr2');
 		$user_name = $this->Application->Parser->GetParam('user_name');
 
 		$limit_types = $this->Application->Parser->GetParam('limit_types');
 
 		$this->Application->recallObject('ShippingQuoteEngine'); // TODO: why call this here?
 
 		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
 		/* @var $quote_engine_collector ShippingQuoteCollector */
 
 		$shipping_quote_params = Array (
 			'dest_country'	=>	$user_country_id,
 			'dest_state'	=>	$user_state_id,
 			'dest_postal'	=>	$user_zip,
 			'dest_city'		=>	$user_city,
 			'dest_addr1'	=>	$user_addr1,
 			'dest_addr2'	=>	$user_addr2,
 			'dest_name'		=>	$user_name,
 			'packages' 		=>	Array (
 				Array (
 					'package_key'	=>	'package1',
 					'weight'		=>	$weight,
 					'weight_unit'	=>	'KG',
 					'length'		=>	'',
 					'width'			=>	'',
 					'height'		=>	'',
 					'dim_unit'		=>	'IN',
 					'packaging'		=>	'BOX',
 					'contents'		=>	'OTR',
 					'insurance'		=>	'0'
 				),
 			),
 			'amount'		=>	$amount,
 			'items'			=>	$items,
 			'limit_types' 	=> 	$limit_types,
 			'promo_params'	=>	Array (
 				'items'		=>	$promo_items,
 				'amount'	=>	$promo_amount,
 				'weight'	=>	$promo_weight,
 			)
 		);
 
 		$shipping_types = $quote_engine_collector->GetShippingQuotes($shipping_quote_params);
 
 		$last_shippings = $this->Application->RecallVar('LastShippings');
 		if ( $last_shippings ) {
 			$last_shippings = unserialize($last_shippings);
 		}
 
 		$order_object = $this->Application->recallObject('ord');
 		/* @var $order_object OrdersItem */
 
 		$original_shipping = $order_object->GetDBField('ShippingInfo');
 		$original_shipping = unserialize($original_shipping);
 		$shipping_type_keys = array_keys($shipping_types);
 
 		if(	getArrayValue($original_shipping, $package_id, 'ShippingId') &&
 			( $this->Application->isAdminUser || in_array( $original_shipping[$package_id]['ShippingId'], $shipping_type_keys ) ) )
 		{
 			$original_shipping = $original_shipping[$package_id];
 			$key = $original_shipping['ShippingId'];
 			$shipping_types[$key]['TotalCost'] = $this->Application->isAdminUser ? $original_shipping['TotalCost'] : $shipping_types[$key]['TotalCost'];
 			$shipping_types[$key]['ShippingName'] = $this->Application->isAdminUser ? 'Original: '.$original_shipping['ShippingName'] : $shipping_types[$key]['ShippingName'];
 			$shipping_types[$key]['ShippingId'] = $key;
 			$selected_id = $key;
 		}
 
 		$last_shippings[$package_id] = $shipping_types;
 		if ( $this->Application->isAdminUser && $key ) {
 			$orig_name = ltrim($last_shippings[$package_id][$key]['ShippingName'], 'Original: ');
 			$last_shippings[$package_id][$key]['ShippingName'] = $orig_name;
 		}
 		$this->Application->StoreVar('LastShippings', serialize($last_shippings));
 
 		$o = '';
 		$def_block_params = Array();
 		$def_block_params['name'] = $this->SelectParam($params, 'render_as,block');
 
 		if ( !count($shipping_types) ) {
 			$this->Application->SetVar('ItemShipmentsExists', 0);
 
 			return '';
 		}
 
 		$lang = $this->Application->recallObject('lang.current');
 		/* @var $lang LanguagesItem */
 
 		foreach ($shipping_types as $shipping_type) {
 			if ( isset($shipping_type['InsuranceFee']) ) {
 				$shipping_type['TotalCost'] += $shipping_type['InsuranceFee'];
 			}
 
 			$shipping_type['ShippingFree'] = ($shipping_type['TotalCost'] == 0) ? 1 : 0;
 
 			$iso = $this->GetISO($params['currency']);
 			$amount = $this->ConvertCurrency($shipping_type['TotalCost'], $iso);
 			$amount = $lang->formatNumber($amount, 2);
 			$shipping_type['TotalCost'] = $this->AddCurrencySymbol($amount, $iso);
 
 			$block_params = array_merge($def_block_params, $shipping_type);
 			$block_params['selected'] = $shipping_type['ShippingId'] == $selected_id ? 'selected' : '';
 
 			if ( isset($params['selected_only']) && $block_params['selected'] == '' ) {
 				continue;
 			}
 
 			$o .= $this->Application->ParseBlock($block_params);
 		}
 
 		return $o;
 	}
 
 	function AvailableTypes($params)
 	{
 		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
 		/* @var $quote_engine_collector ShippingQuoteCollector */
 
 		$types = $quote_engine_collector->GetAvailableShippingTypes();
 
 		$o;
 		foreach ($types as $a_type)
 		{
 			$block_params = $a_type;
 			$block_params['name']	= $params['render_as'];
 			$o .= $this->Application->ParseBlock($block_params);
 		}
 		return $o;
 	}
 
-	function ListGroups($params)
+	protected function ListGroups($params)
 	{
-
 		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
+		$o = '';
 		$selected = trim($object->GetDBField('PortalGroups'), ',');
 		$selected_arr = explode(',', $selected);
-		$all_groups = $this->Conn->Query('SELECT GroupId, Name FROM '.TABLE_PREFIX.'UserGroups ORDER BY NAME', 'GroupId');
 
-		$o = '';
-		foreach ($all_groups as $a_group)
-		{
+		$sql = 'SELECT GroupId, Name
+				FROM ' . TABLE_PREFIX . 'UserGroups
+				ORDER BY Name';
+		$all_groups = $this->Conn->Query($sql, 'GroupId');
+
+		$mode = array_key_exists('mode', $params) ? $params['mode'] : false;
+
+		foreach ($all_groups as $a_group) {
 			$is_selected = in_array($a_group['GroupId'], $selected_arr);
-			$continue = $params['mode'] == 'selected' ? !$is_selected : $is_selected;
-			if ($continue) continue;
+			$continue = $mode == 'selected' ? !$is_selected : $is_selected;
+
+			if ( $continue ) {
+				continue;
+			}
+
 			$block_params = $a_group;
-			$block_params['name']	= $params['render_as'];
+			$block_params['name'] = $params['render_as'];
 			$o .= $this->Application->ParseBlock($block_params);
 		}
+
 		return $o;
 	}
 }
\ No newline at end of file
Index: branches/5.2.x/units/taxes/taxes_event_handler.php
===================================================================
--- branches/5.2.x/units/taxes/taxes_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/taxes/taxes_event_handler.php	(revision 15540)
@@ -1,252 +1,253 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class TaxesEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array(
 			'OnTypeChange'		=>	Array('self' => 'add|edit'),
 			'OnCountryChange'	=>	Array('self' => 'add|edit'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * 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
 
 		$zones_events = Array (
 			'OnAddLocation'		=>	'DestinationAction',
 			'OnRemoveLocation'	=>	'DestinationAction',
 			'OnLoadZoneForm'	=>	'DestinationAction',
 			/*'OnCountryChange'	=>	'DestinationAction',*/
 			'OnNew'				=>	'DestinationAction'
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $zones_events);
 	}
 
 	/**
 	 * Apply custom processing to item
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
 		$zone_object = $event->getObject();
 		/* @var $zone_object kDBItem */
 
 		if ( $type == 'after' ) {
 			$dst_object = $this->Application->recallObject('taxdst');
 			/* @var $dst_object kDBItem */
 
 			if ( $event->Name == 'OnUpdate' ) {
 				$sql = 'DELETE FROM ' . $dst_object->TableName . '
 						WHERE TaxZoneId = ' . $zone_object->GetID();
 				$this->Conn->Query($sql);
 			}
 			else {
 				$temp = $this->Application->GetVar('taxdst', Array ());
 
 				foreach ($temp as $key => $value) {
 					$temp[$key]['TaxZoneId'] = $zone_object->GetID();
 				}
 
 				$this->Application->SetVar('taxdst', $temp);
 			}
 
 			$this->Application->HandleEvent(new kEvent('taxdst:OnCreate'));
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnTypeChange($event)
 	{
 		$this->Application->DeleteVar('taxdst');
 		$event->CallSubEvent('OnPreSave');
 		$event->redirect = false;
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function DestinationAction($event)
 	{
 		$event->redirect = false;
 
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 		if($items_info)
 		{
 			foreach($items_info as $item_id => $field_values)
 			{
 				// this is to receive $item_id
 			}
 		}
 
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$object->Load($item_id);
 
 		$object->SetFieldsFromHash($field_values);
 		$object->SetDBField('TaxZoneID', $item_id);
 
 		$destination = $this->Application->recallObject('taxdst');
 		$tax_object = $this->Application->recallObject('tax');
 
 		switch($event->Name)
 		{
 			case 'OnAddLocation':
 
 				$temp = $this->Application->GetVar('taxdst');
 				$zip = $this->Application->GetVar('zip_input') ? $this->Application->GetVar('zip_input') : $this->Application->GetVar('zip_dropdown');
 				$exist=0;
 
 				switch ($object->GetDBField('Type'))
 				{
 					case 1:
 						$location_id = $this->Application->GetVar('country');
 						break;
 					case 2:
 						$location_id = $this->Application->GetVar('state');
 						break;
 					default:
 						$location_id = $this->Application->GetVar('StatesCountry');
 						foreach($temp as $temp_id => $temp_val){
 							if ($temp_val['DestValue']==$zip){
 								$exist=1;
 								break;
 							}
 						}
 				}
 
 				if ($exist == 0){
 					$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$destination->IDField.') FROM '.$destination->TableName);
 
 					if($new_id > 0) $new_id = 0;
 					do
 					{
 						$new_id--;
 					} while ($this->check_array($this->Application->GetVar('taxdst'), 'TaxZoneDestId', $new_id));
 
 
 
 
 					if( ($location_id && !$this->check_array($temp, 'StdDestId', $location_id)) ||
 							($zip && !$this->check_array($temp, 'DestValue', $zip)) )
 					{
 
 						if($tax_object->GetDBField('Type') == 3 && $zip ==''){
 							continue;
 						}
 
 						$temp[$new_id]['TaxZoneDestId'] = $new_id;
 						$temp[$new_id]['StdDestId'] = $location_id;
 						$temp[$new_id]['DestValue'] = $zip ? $zip : '';
 
 						$this->Application->SetVar('taxdst', $temp);
 					}
 				}
 				break;
 
 			case 'OnRemoveLocation':
 
 				$temp = $this->Application->GetVar('taxdst');
 				$selected_destinations = explode(',', $this->Application->GetVar('selected_destinations'));
 				foreach ($selected_destinations as $dest)
 				{
 					unset( $temp[$dest] );
 					if (strlen($dest)>0){
 						$sql = 'DELETE FROM '.$destination->TableName.' WHERE TaxZoneDestId ='.$dest;
 						$this->Conn->Query($sql);
 					}
 				}
 				$this->Application->SetVar('taxdst', $temp);
 
 				break;
 
 			case 'OnLoadZoneForm':
 
 				$sql = 'SELECT * FROM '.$destination->TableName.' WHERE TaxZoneId='.$item_id;
 				$res = $this->Conn->Query($sql);
 				$temp = Array();
 				foreach ($res as $dest_record)
 				{
 					$temp[$dest_record['TaxZoneDestId']]['TaxZoneDestId'] = $dest_record['TaxZoneDestId'];
 					$temp[$dest_record['TaxZoneDestId']]['StdDestId'] = $dest_record['StdDestId'];
 					$temp[$dest_record['TaxZoneDestId']]['DestValue'] = $dest_record['DestValue'];
 				}
 				$this->Application->SetVar('taxdst', $temp);
 				//$object = $event->getObject();
 				//$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
 
 				break;
 
 			case 'OnNew':
 
 				//$object = $event->getObject();
 				//$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
 				break;
 
 			case 'OnCountryChange':
 
 				$this->Application->DeleteVar('taxdst');
 
 				break;
 
 			default:
 		}
 
 		$event->CallSubEvent("OnPreSave");
 	}
 
 	function OnCountryChange($event)
 	{
-		$destinations = &$this->Application->recallObject('taxdst');
+		$destinations = $this->Application->recallObject('taxdst');
+		/* @var $destinations kDBItem */
 
 		$queryDel="DELETE FROM ".$destinations->TableName." WHERE TaxZoneId=".(int)$this->Application->GetVar('tax_id');
 		$this->Conn->Query($queryDel);
 
 		$this->Application->DeleteVar('taxdst');
 		$event->CallSubEvent('OnPreSave');
 		$event->redirect = false;
 	}
 
 }
\ No newline at end of file
Index: branches/5.2.x/units/zones/zones_event_handler.php
===================================================================
--- branches/5.2.x/units/zones/zones_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/zones/zones_event_handler.php	(revision 15540)
@@ -1,275 +1,276 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ZonesEventHandler extends kDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array(
 			'OnTypeChange'		=>	Array('subitem' => 'add|edit'),
 			'OnCountryChange'	=>	Array('subitem' => 'add|edit'),
 			'OnLoadZoneForm'	=>	Array('subitem' => 'add|edit'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Define alternative event processing method names
 	 *
 	 * @return void
 	 * @see kEventHandler::$eventMethods
 	 * @access protected
 	 */
 	protected function mapEvents()
 	{
 		parent::mapEvents();	// ensure auto-adding of approve/decline and so on events
 
 		$zones_events = Array(
 			'OnAddLocation'		=>	'DestinationAction',
 			'OnRemoveLocation'	=>	'DestinationAction',
 			'OnLoadZoneForm'	=>	'DestinationAction',
 			/*'OnCountryChange'	=>	'DestinationAction',*/
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $zones_events);
 	}
 
 	/**
 	 * Apply custom processing to item
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
 		$zone_object = $event->getObject();
 		/* @var $zone_object kDBItem */
 
 		switch ($type) {
 			case 'before':
 				if ( $event->Name == 'OnCreate' ) {
 					$zone_object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
 				}
 				break;
 
 			case 'after':
 				$dst_object = $this->Application->recallObject('dst');
 				/* @var $dst_object kDBItem */
 
 				if ( $event->Name == 'OnUpdate' ) {
 					$sql = 'DELETE FROM ' . $dst_object->TableName . '
 							WHERE ShippingZoneId = ' . $zone_object->GetID();
 					$this->Conn->Query($sql);
 				}
 				else {
 					$temp = $this->Application->GetVar('dst', Array ());
 					foreach ($temp as $key => $value) {
 						$temp[$key]['ShippingZoneId'] = $zone_object->GetID();
 					}
 					$this->Application->SetVar('dst', $temp);
 				}
 
 				$this->Application->HandleEvent(new kEvent('dst:OnCreate'));
 				break;
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnTypeChange($event)
 	{
 		$this->Application->DeleteVar('dst');
 
 		$event->CallSubEvent($this->Application->GetVar('z_OriginalSaveEvent'));
 		$event->redirect = false;
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function DestinationAction($event)
 	{
 		$event->redirect = false;
 
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 		if($items_info)
 		{
 			foreach($items_info as $item_id => $field_values)
 			{
 				// this is to receive $item_id
 			}
 		}
 
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$object->Load($item_id);
 
 		$object->SetFieldsFromHash($field_values);
 		$object->SetDBField('ZoneID', $item_id);
 
 		$destination = $this->Application->recallObject('dst');
 
 		switch($event->Name)
 		{
 			case 'OnAddLocation':
 				$new_id = (int)$this->Conn->GetOne('SELECT MIN('.$destination->IDField.') FROM '.$destination->TableName);
 				if($new_id > 0) $new_id = 0;
 				do
 				{
 					$new_id--;
 				} while ($this->check_array($this->Application->GetVar('dst'), 'ZoneDestId', $new_id));
 
 				switch ($object->GetDBField('Type'))
 				{
 					case 1:
 						$location_id = $this->Application->GetVar('country');
 						break;
 					case 2:
 						$location_id = $this->Application->GetVar('state');
 						break;
 					default:
 						$location_id = '';
 				}
 
 				$temp = $this->Application->GetVar('dst');
 				$zip = $this->Application->GetVar('zip_input') ? $this->Application->GetVar('zip_input') : $this->Application->GetVar('zip_dropdown');
 
 				if( ($location_id && !$this->check_array($temp, 'StdDestId', $location_id)) ||
 						($zip && !$this->check_array($temp, 'DestValue', $zip)) )
 				{
 					$temp[$new_id]['ZoneDestId'] = $new_id;
 					$temp[$new_id]['StdDestId'] = $location_id;
 					$temp[$new_id]['DestValue'] = $zip ? $zip : '';
 
 					$this->Application->SetVar('dst', $temp);
 				}
 				break;
 
 			case 'OnRemoveLocation':
 
 				$temp = $this->Application->GetVar('dst');
 				$selected_destinations = explode(',', $this->Application->GetVar('selected_destinations'));
 				foreach ($selected_destinations as $dest)
 				{
 					unset( $temp[$dest] );
 				}
 				$this->Application->SetVar('dst', $temp);
 
 				break;
 
 			case 'OnLoadZoneForm':
 
 				$sql = 'SELECT * FROM '.$destination->TableName.' WHERE ShippingZoneId='.$item_id;
 				$res = $this->Conn->Query($sql);
 				$temp = Array();
 				foreach ($res as $dest_record)
 				{
 					$temp[$dest_record['ZoneDestId']]['ZoneDestId'] = $dest_record['ZoneDestId'];
 					$temp[$dest_record['ZoneDestId']]['StdDestId'] = $dest_record['StdDestId'];
 					$temp[$dest_record['ZoneDestId']]['DestValue'] = $dest_record['DestValue'];
 				}
 				$this->Application->SetVar('dst', $temp);
 				$object = $event->getObject();
 				$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
 				$this->Application->StoreVar('zone_mode'.$this->Application->GetVar('m_wid'), 'edit');
 
 				break;
 
 			/*case 'OnNew':
 				$object = $event->getObject();
 				$object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
 				break;*/
 
 			case 'OnCountryChange':
 
 				$this->Application->DeleteVar('dst');
 
 				break;
 
 			default:
 		}
 	}
 
 	function OnCountryChange($event)
 	{
-		$destinations = &$this->Application->recallObject('dst');
+		$destinations = $this->Application->recallObject('dst');
+		/* @var $destinations kDBItem */
 
 		$queryDel="DELETE FROM ".$destinations->TableName." WHERE ShippingZoneId=".$this->Application->GetVar($event->Prefix.'_id');
 		$this->Conn->Query($queryDel);
 
 		$this->Application->DeleteVar('dst');
 
 		$event->CallSubEvent($this->Application->GetVar('z_OriginalSaveEvent'));
 		$event->redirect = false;
 	}
 
 	/**
 	 * Cancels kDBItem Editing/Creation
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCancel(kEvent $event)
 	{
 		parent::OnCancel($event);
 
-		$dst_object = &$this->Application->recallObject('dst');
+		$dst_object = $this->Application->recallObject('dst');
 		/* @var $dst_object kDBItem */
 
 		$sql = 'DELETE FROM ' . $dst_object->TableName . '
 				WHERE ShippingZoneId = 0';
 		$this->Conn->Query($sql);
 
 		// if cancelling after create
 		if ( $this->Application->RecallVar('zone_mode' . $this->Application->GetVar('m_wid')) == 'create' ) {
 			$zone = $event->getObject();
 			/* @var $zone kDBItem */
 
 			$zone->Delete();
 		}
 	}
 
 	/**
 	 * Prepares new kDBItem object
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnNew(kEvent $event)
 	{
 		parent::OnNew($event);
 
 		$this->Application->StoreVar('zone_mode' . $this->Application->GetVar('m_wid'), 'create');
 	}
 
 }
\ No newline at end of file
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
--- branches/5.2.x/units/orders/orders_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(revision 15540)
@@ -1,3984 +1,3985 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class OrdersEventHandler extends kDBEventHandler
 {
 
 	/**
 	 * Checks user permission to execute given $event
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access public
 	 */
 	public function CheckPermission(kEvent $event)
 	{
 		if ( !$this->Application->isAdminUser ) {
 			if ( $event->Name == 'OnCreate' ) {
 				// user can't initiate custom order creation directly
 				return false;
 			}
 
 			$user_id = $this->Application->RecallVar('user_id');
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 			if ( $items_info ) {
 				// when POST is present, then check when is beeing submitted
 				$order_session_id = $this->Application->RecallVar($event->getPrefixSpecial(true) . '_id');
 
 				$order_dummy = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 				/* @var $order_dummy OrdersItem */
 
 				foreach ($items_info as $id => $field_values) {
 					if ( $order_session_id != $id ) {
 						// user is trying update not his order, even order from other guest
 						return false;
 					}
 
 					$order_dummy->Load($id);
 
 					// session_id matches order_id from submit
 					if ( $order_dummy->GetDBField('PortalUserId') != $user_id ) {
 						// user performs event on other user order
 						return false;
 					}
 
-					$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
+					$status_field = $order_dummy->getStatusField();
+
 					if ( isset($field_values[$status_field]) && $order_dummy->GetDBField($status_field) != $field_values[$status_field] ) {
 						// user can't change status by himself
 						return false;
 					}
 
 					if ( $order_dummy->GetDBField($status_field) != ORDER_STATUS_INCOMPLETE ) {
 						// user can't edit orders being processed
 						return false;
 					}
 
 					if ( $event->Name == 'OnUpdate' ) {
 						// all checks were ok -> it's user's order -> allow to modify
 						return true;
 					}
 				}
 			}
 		}
 
 		if ( $event->Name == 'OnQuietPreSave' ) {
 			$section = $event->getSection();
 
 			if ( $this->isNewItemCreate($event) ) {
 				return $this->Application->CheckPermission($section . '.add', 1);
 			}
 			else {
 				return $this->Application->CheckPermission($section . '.add', 1) || $this->Application->CheckPermission($section . '.edit', 1);
 			}
 		}
 
 		return parent::CheckPermission($event);
 	}
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array (
 			// admin
 			'OnRecalculateItems'	=>	Array('self' => 'add|edit'),
 			'OnResetToUser'			=>	Array('self' => 'add|edit'),
 			'OnResetToBilling'		=>	Array('self' => 'add|edit'),
 			'OnResetToShipping'		=>	Array('self' => 'add|edit'),
 			'OnMassOrderApprove'	=>	Array('self' => 'advanced:approve'),
 			'OnMassOrderDeny'		=>	Array('self' => 'advanced:deny'),
 			'OnMassOrderArchive'	=>	Array('self' => 'advanced:archive'),
 			'OnMassPlaceOrder'		=>	Array('self' => 'advanced:place'),
 			'OnMassOrderProcess'	=>	Array('self' => 'advanced:process'),
 			'OnMassOrderShip'		=>	Array('self' => 'advanced:ship'),
 			'OnResetToPending'		=>	Array('self' => 'advanced:reset_to_pending'),
 			'OnLoadSelected'		=>	Array('self' => 'view'),	// print in this case
 			'OnGoToOrder'			=>	Array('self' => 'view'),
 
 			// front-end
 			'OnViewCart'			=>	Array('self' => true),
 			'OnAddToCart'			=>	Array('self' => true),
 			'OnRemoveFromCart'		=>	Array('self' => true),
 			'OnUpdateCart'			=>	Array('self' => true),
 			'OnUpdateCartJSON'		=>	Array('self' => true),
 			'OnUpdateItemOptions'	=>	Array('self' => true),
 			'OnCleanupCart'			=>	Array('self' => true),
 			'OnContinueShopping'	=>	Array('self' => true),
 			'OnCheckout'			=>	Array('self' => true),
 			'OnSelectAddress'		=>	Array('self' => true),
 			'OnProceedToBilling'	=>	Array('self' => true),
 			'OnProceedToPreview'	=>	Array('self' => true),
 			'OnCompleteOrder'		=>	Array('self' => true),
 			'OnUpdateAjax'			=>	Array('self' => true),
 
 			'OnRemoveCoupon'		=>	Array('self' => true),
 			'OnRemoveGiftCertificate'		=>	Array('self' => true),
 
 			'OnCancelRecurring'		=>	Array('self' => true),
 			'OnAddVirtualProductToCart'		=>	Array('self' => true),
 			'OnItemBuild'		=>	Array('self' => true),
 			'OnDownloadLabel' 	=>  Array('self' => true, 'subitem' => true),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * Define alternative event processing method names
 	 *
 	 * @return void
 	 * @see kEventHandler::$eventMethods
 	 * @access protected
 	 */
 	protected function mapEvents()
 	{
 		parent::mapEvents();
 
 		$common_events = Array (
 			'OnResetToUser'		=>	'OnResetAddress',
 			'OnResetToBilling'	=>	'OnResetAddress',
 			'OnResetToShipping'	=>	'OnResetAddress',
 
 			'OnMassOrderProcess'	=>	'MassInventoryAction',
 			'OnMassOrderApprove'	=>	'MassInventoryAction',
 			'OnMassOrderDeny'		=>	'MassInventoryAction',
 			'OnMassOrderArchive'	=>	'MassInventoryAction',
 			'OnMassOrderShip'		=>	'MassInventoryAction',
 
 			'OnOrderProcess'	=>	'InventoryAction',
 			'OnOrderApprove'	=>	'InventoryAction',
 			'OnOrderDeny'		=>	'InventoryAction',
 			'OnOrderArchive'	=>	'InventoryAction',
 			'OnOrderShip'		=>	'InventoryAction',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $common_events);
 	}
 
 	/* ======================== FRONT ONLY ======================== */
 
 	function OnQuietPreSave($event)
 	{
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$object->IgnoreValidation = true;
 		$event->CallSubEvent('OnPreSave');
 		$object->IgnoreValidation = false;
 	}
 
 	/**
 	 * Sets new address to order
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSelectAddress($event)
 	{
 		if ($this->Application->isAdminUser) {
 			return ;
 		}
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$shipping_address_id = $this->Application->GetVar('shipping_address_id');
 		$billing_address_id = $this->Application->GetVar('billing_address_id');
 
 		if ($shipping_address_id || $billing_address_id) {
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
 			/* @var $cs_helper kCountryStatesHelper */
 
 			$address = $this->Application->recallObject('addr.-item','addr', Array('skip_autoload' => true));
 			/* @var $address AddressesItem */
 
 			$addr_list = $this->Application->recallObject('addr', 'addr_List', Array('per_page'=>-1, 'skip_counting'=>true) );
 			/* @var $addr_list AddressesList */
 
 			$addr_list->Query();
 		}
 
 		if ($shipping_address_id > 0) {
 			$addr_list->CopyAddress($shipping_address_id, 'Shipping');
 			$address->Load($shipping_address_id);
 			$address->MarkAddress('Shipping');
 
 			$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
 			$object->setRequired('ShippingState', false);
 		}
 		elseif ($shipping_address_id == -1) {
 			$object->ResetAddress('Shipping');
 		}
 
 		if ($billing_address_id > 0) {
 			$addr_list->CopyAddress($billing_address_id, 'Billing');
 			$address->Load($billing_address_id);
 			$address->MarkAddress('Billing');
 
 			$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
 			$object->setRequired('BillingState', false);
 		}
 		elseif ($billing_address_id == -1) {
 			$object->ResetAddress('Billing');
 		}
 
 		$event->redirect = false;
 
 		$object->IgnoreValidation = true;
 		$this->RecalculateTax($event);
 		$object->Update();
 	}
 
 	/**
 	 * Updates order with registred user id
 	 *
 	 * @param kEvent $event
 	 */
 	function OnUserCreate($event)
 	{
 		if( !($event->MasterEvent->status == kEvent::erSUCCESS) ) return false;
 
 		$ses_id = $this->Application->RecallVar('front_order_id');
 		if($ses_id)
 		{
 			$this->updateUserID($ses_id, $event);
 			$this->Application->RemoveVar('front_order_id');
 		}
 	}
 
 	/**
 	 * Updates shopping cart with logged-in user details
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnUserLogin($event)
 	{
 		if ( ($event->MasterEvent->status != kEvent::erSUCCESS) || kUtil::constOn('IS_INSTALL') ) {
 			// login failed OR login during installation
 			return;
 		}
 
 		$ses_id = $this->Application->RecallVar('ord_id');
 
 		if ( $ses_id ) {
 			$this->updateUserID($ses_id, $event);
 		}
 
 		$user_id = $this->Application->RecallVar('user_id');
 		$affiliate_id = $this->isAffiliate($user_id);
 
 		if ( $affiliate_id ) {
 			$this->Application->setVisitField('AffiliateId', $affiliate_id);
 		}
 
 		$event->CallSubEvent('OnRecalculateItems');
 	}
 
 	/**
 	 * Puts ID of just logged-in user into current order
 	 *
 	 * @param int $order_id
 	 * @param kEvent $event
 	 * @return void
 	 */
 	function updateUserID($order_id, $event)
 	{
 		$user = $this->Application->recallObject('u.current');
 		/* @var $user UsersItem */
 
 		$affiliate_id = $this->isAffiliate( $user->GetID() );
 
 		$fields_hash = Array (
 			'PortalUserId' => $user->GetID(),
 			'BillingEmail' => $user->GetDBField('Email'),
 		);
 
 		if ( $affiliate_id ) {
 			$fields_hash['AffiliateId'] = $affiliate_id;
 		}
 
 		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 		$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
 		$this->Conn->doUpdate($fields_hash, $table_name, $id_field . ' = ' . $order_id);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		// set user id to object, since it will be used during order update from OnRecalculateItems event
 		$object->SetDBField('PortalUserId', $user->GetID());
 	}
 
 	function isAffiliate($user_id)
 	{
 		$affiliate_user = $this->Application->recallObject('affil.-item', null, Array('skip_autoload' => true) );
 		/* @var $affiliate_user kDBItem */
 
 		$affiliate_user->Load($user_id, 'PortalUserId');
 
 		return $affiliate_user->isLoaded() ? $affiliate_user->GetDBField('AffiliateId') : 0;
 	}
 
 	/**
 	 * Charge order
 	 *
 	 * @param OrdersItem $order
 	 * @return Array
 	 */
 	function ChargeOrder(&$order)
 	{
 		$gw_data = $order->getGatewayData();
 
 		$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
 		$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
 		/* @var $gateway_object kGWBase */
 
 		$payment_result = $gateway_object->DirectPayment($order->GetFieldValues(), $gw_data['gw_params']);
 		$sql = 'UPDATE %s SET GWResult1 = %s WHERE %s = %s';
 		$sql = sprintf($sql, $order->TableName, $this->Conn->qstr($gateway_object->getGWResponce()), $order->IDField, $order->GetID() );
 		$this->Conn->Query($sql);
 		$order->SetDBField('GWResult1', $gateway_object->getGWResponce() );
 
 		return array('result'=>$payment_result, 'data'=>$gateway_object->parsed_responce, 'gw_data' => $gw_data, 'error_msg'=>$gateway_object->getErrorMsg());
 	}
 
 	/**
 	 * Returns parameters, used to send order-related e-mails
 	 *
 	 * @param OrdersItem $order
 	 * @return array
 	 */
 	function OrderEmailParams(&$order)
 	{
 		$billing_email = $order->GetDBField('BillingEmail');
 		$user_email = $this->Conn->GetOne('	SELECT Email FROM '.$this->Application->getUnitOption('u', 'TableName').'
 											WHERE PortalUserId = '.$order->GetDBField('PortalUserId'));
 		$email_params = Array();
 		$email_params['_user_email'] = $user_email; //for use when shipping vs user is required in InventoryAction
 		$email_params['to_email'] = $billing_email ? $billing_email : $user_email;
 		$email_params['to_name'] = $order->GetDBField('BillingTo');
 		return $email_params;
 	}
 
 	function PrepareCoupons($event, &$order)
 	{
 		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
 
 		$order_items->linkToParent($order->Special);
 		$order_items->Query();
 		$order_items->GoFirst();
 
 		$assigned_coupons = array();
 		$coup_handler = $this->Application->recallObject('coup_EventHandler');
 		foreach($order_items->Records as $product_item)
 		{
 			if ($product_item['ItemData']) {
 				$item_data = unserialize($product_item['ItemData']);
 				if (isset($item_data['AssignedCoupon']) && $item_data['AssignedCoupon']) {
 					$coupon_id = $item_data['AssignedCoupon'];
 					// clone coupon, get new coupon ID
 					$coupon = $this->Application->recallObject('coup',null,array('skip_autload' => true));
 					/* @var $coupon kDBItem */
 					$coupon->Load($coupon_id);
 					if (!$coupon->isLoaded()) continue;
 
 					$coup_handler->SetNewCode($coupon);
 					$coupon->NameCopy();
 					$coupon->SetDBField('Name', $coupon->GetDBField('Name').' (Order #'.$order->GetField('OrderNumber').')');
 					$coupon->Create();
 
 					// add coupon code to array
 					array_push($assigned_coupons, $coupon->GetDBField('Code'));
 				}
 			}
 		}
 
 		/* @var $order OrdersItem */
 		if ($assigned_coupons) {
 			$comments = $order->GetDBField('AdminComment');
 			if ($comments) $comments .= "\r\n";
 			$comments .= "Issued coupon(s): ". join(',', $assigned_coupons);
 			$order->SetDBField('AdminComment', $comments);
 			$order->Update();
 		}
 
 		if ($assigned_coupons) $this->Application->SetVar('order_coupons', join(',', $assigned_coupons));
 	}
 
 	/**
 	 * Completes order if possible
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 */
 	function OnCompleteOrder($event)
 	{
 		$this->LockTables($event);
 		if ( !$this->CheckQuantites($event) ) {
 			return;
 		}
 
 		$this->ReserveItems($event);
 
 		$order = $event->getObject();
 		/* @var $order OrdersItem */
 
 		$charge_result = $this->ChargeOrder($order);
 
 		if (!$charge_result['result']) {
 			$this->FreeItems($event);
 			$this->Application->StoreVar('gw_error', $charge_result['error_msg']);
 
 			//$this->Application->StoreVar('gw_error', getArrayValue($charge_result, 'data', 'responce_reason_text') );
 			$event->redirect = $this->Application->GetVar('failure_template');
 			$event->SetRedirectParam('m_cat_id', 0);
 			if ($event->Special == 'recurring') { // if we set failed status for other than recurring special the redirect will not occur
 				$event->status = kEvent::erFAIL;
 			}
 			return false;
 		}
 
 		// call CompleteOrder events for items in order BEFORE SplitOrder (because ApproveEvents are called there)
 		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
 
 		$order_items->linkToParent($order->Special);
 		$order_items->Query(true);
 		$order_items->GoFirst();
 
 		foreach($order_items->Records as $product_item)
 		{
 			if (!$product_item['ProductId']) continue; // product may have been deleted
 			$this->raiseProductEvent('CompleteOrder', $product_item['ProductId'], $product_item);
 		}
 
 		$shipping_control = getArrayValue($charge_result, 'gw_data', 'gw_params', 'shipping_control');
 		if ($event->Special != 'recurring') {
 			if ($shipping_control && $shipping_control != SHIPPING_CONTROL_PREAUTH ) {
 				// we have to do it here, because the coupons are used in the e-mails
 				$this->PrepareCoupons($event, $order);
 			}
 
 			$this->Application->EmailEventUser('ORDER.SUBMIT', $order->GetDBField('PortalUserId'), $this->OrderEmailParams($order));
 			$this->Application->EmailEventAdmin('ORDER.SUBMIT');
 		}
 
 		if ($shipping_control === false || $shipping_control == SHIPPING_CONTROL_PREAUTH ) {
 			$order->SetDBField('Status', ORDER_STATUS_PENDING);
 			$order->Update();
 		}
 		else {
 			$this->SplitOrder($event, $order);
 		}
 
 		if (!$this->Application->isAdminUser) {
 			// for tracking code
 			$this->Application->StoreVar('last_order_amount', $order->GetDBField('TotalAmount'));
 			$this->Application->StoreVar('last_order_number', $order->GetDBField('OrderNumber'));
 			$this->Application->StoreVar('last_order_customer', $order->GetDBField('BillingTo'));
 			$this->Application->StoreVar('last_order_user', $order->GetDBField('Username'));
 
 			$event->redirect = $this->Application->GetVar('success_template');
 			$event->SetRedirectParam('m_cat_id', 0);
 		}
 		else
 		{
 //			$event->CallSubEvent('OnSave');
 		}
 
 		$order_id = $order->GetId();
 		$order_idfield = $this->Application->getUnitOption('ord','IDField');
 		$order_table = $this->Application->getUnitOption('ord','TableName');
 		$original_amount = $order->GetDBField('SubTotal') + $order->GetDBField('ShippingCost') + $order->GetDBField('VAT') + $order->GetDBField('ProcessingFee') + $order->GetDBField('InsuranceFee') - $order->GetDBField('GiftCertificateDiscount');
 		$sql = 'UPDATE '.$order_table.'
 				SET OriginalAmount = '.$original_amount.'
 				WHERE '.$order_idfield.' = '.$order_id;
 		$this->Conn->Query($sql);
 
 		$this->Application->StoreVar('front_order_id', $order_id);
 		$this->Application->RemoveVar('ord_id');
 		$this->Application->Session->SetCookie('shop_cart_cookie', '', strtotime('-1 month'));
 	}
 
 	/**
 	 * Set billing address same as shipping
 	 *
 	 * @param kEvent $event
 	 */
 	function setBillingAddress($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		if ( $object->HasTangibleItems() ) {
 			if ( $this->Application->GetVar('same_address') ) {
 				// copy shipping address to billing
 				$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 				list($id, $field_values) = each($items_info);
 
 				$address_fields = Array (
 					'To', 'Company', 'Phone', 'Fax', 'Email',
 					'Address1', 'Address2', 'City', 'State',
 					'Zip', 'Country'
 				);
 
 				foreach ($address_fields as $address_field) {
 					$items_info[$id]['Billing' . $address_field] = $object->GetDBField('Shipping' . $address_field);
 				}
 
 				$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
 			}
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnProceedToPreview($event)
 	{
 		$this->setBillingAddress($event);
 
 		$event->CallSubEvent('OnUpdate');
 		$event->redirect = $this->Application->GetVar('preview_template');
 	}
 
 
 	function OnViewCart($event)
 	{
 		$this->StoreContinueShoppingLink();
 		$event->redirect = $this->Application->GetVar('viewcart_template');
 	}
 
 	function OnContinueShopping($event)
 	{
 		$order_helper = $this->Application->recallObject('OrderHelper');
 		/* @var $order_helper OrderHelper */
 
 		$template = $this->Application->GetVar('continue_shopping_template');
 
 		$event->redirect = $order_helper->getContinueShoppingTemplate($template);
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnCheckout($event)
 	{
 		$this->OnUpdateCart($event);
 		if ( !$event->getEventParam('RecalculateChangedCart') ) {
 			$object = $event->getObject();
 			/* @var $object OrdersItem */
 
 			if ( !$object->HasTangibleItems() ) {
 				$object->SetDBField('ShippingTo', '');
 				$object->SetDBField('ShippingCompany', '');
 				$object->SetDBField('ShippingPhone', '');
 				$object->SetDBField('ShippingFax', '');
 				$object->SetDBField('ShippingEmail', '');
 				$object->SetDBField('ShippingAddress1', '');
 				$object->SetDBField('ShippingAddress2', '');
 				$object->SetDBField('ShippingCity', '');
 				$object->SetDBField('ShippingState', '');
 				$object->SetDBField('ShippingZip', '');
 				$object->SetDBField('ShippingCountry', '');
 				$object->SetDBField('ShippingType', 0);
 				$object->SetDBField('ShippingCost', 0);
 				$object->SetDBField('ShippingCustomerAccount', '');
 				$object->SetDBField('ShippingTracking', '');
 				$object->SetDBField('ShippingDate', 0);
 				$object->SetDBField('ShippingOption', 0);
 				$object->SetDBField('ShippingInfo', '');
 				$object->Update();
 			}
 
 			$event->redirect = $this->Application->GetVar('next_step_template');
 
 			$order_id = $this->Application->GetVar('order_id');
 
 			if ( $order_id !== false ) {
 				$event->SetRedirectParam('ord_id', $order_id);
 			}
 		}
 	}
 
 	/**
 	 * Restores order from cookie
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRestoreOrder(kEvent $event)
 	{
 		if ( $this->Application->isAdmin || $this->Application->RecallVar('ord_id') ) {
 			// admin OR there is an active order -> don't restore from cookie
 			return;
 		}
 
 		$shop_cart_cookie = $this->Application->GetVarDirect('shop_cart_cookie', 'Cookie');
 
 		if ( !$shop_cart_cookie ) {
 			return;
 		}
 
 		$user_id = $this->Application->RecallVar('user_id');
 
 		$sql = 'SELECT OrderId
 				FROM ' . TABLE_PREFIX . 'Orders
 				WHERE (OrderId = ' . (int)$shop_cart_cookie . ') AND (Status = ' . ORDER_STATUS_INCOMPLETE . ') AND (PortalUserId = ' . $user_id . ')';
 		$order_id = $this->Conn->GetOne($sql);
 
 		if ( $order_id ) {
 			$this->Application->StoreVar('ord_id', $order_id);
 		}
 	}
 
 	/**
 	 * Redirect user to Billing checkout step
 	 *
 	 * @param kEvent $event
 	 */
 	function OnProceedToBilling($event)
 	{
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ( $items_info ) {
 			list($id, $field_values) = each($items_info);
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$payment_type_id = $object->GetDBField('PaymentType');
 
 			if ( !$payment_type_id ) {
 				$default_type = $this->_getDefaultPaymentType();
 
 				if ( $default_type ) {
 					$field_values['PaymentType'] = $default_type;
 					$items_info[$id] = $field_values;
 					$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
 				}
 			}
 		}
 
 		$event->CallSubEvent('OnUpdate');
 		$event->redirect = $this->Application->GetVar('next_step_template');
 	}
 
 	/**
 	 * Removes reoccurring mark from the order
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 */
 	protected function OnCancelRecurring($event)
 	{
 		$order = $event->getObject();
 		/* @var $order OrdersItem */
 
 		$order->SetDBField('IsRecurringBilling', 0);
 		$order->Update();
 
 		if ( $this->Application->GetVar('cancelrecurring_ok_template') ) {
 			$event->redirect = $this->Application->GetVar('cancelrecurring_ok_template');
 		}
 	}
 
 	/**
 	 * Occurs after updating item
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$cvv2 = $object->GetDBField('PaymentCVV2');
 
 		if ( $cvv2 !== false ) {
 			$this->Application->StoreVar('CVV2Code', $cvv2);
 		}
 	}
 
 
 	/**
 	 * Updates kDBItem
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnUpdate(kEvent $event)
 	{
 		$this->setBillingAddress($event);
 
 		parent::OnUpdate($event);
 
 		if ($this->Application->isAdminUser) {
 			return ;
 		}
 		else {
 			$event->SetRedirectParam('opener', 's');
 		}
 
 		if ($event->status == kEvent::erSUCCESS) {
 			$this->createMissingAddresses($event);
 		}
 		else {
 			// strange: recalculate total amount on error
 			$object = $event->getObject();
 			/* @var $object OrdersItem */
 
 			$object->SetDBField('TotalAmount', $object->getTotalAmount());
 		}
 	}
 
 	/**
 	 * Creates new address
 	 *
 	 * @param kEvent $event
 	 */
 	function createMissingAddresses($event)
 	{
 		if ( !$this->Application->LoggedIn() ) {
 			return ;
 		}
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$addr_list = $this->Application->recallObject('addr', 'addr_List', Array ('per_page' => -1, 'skip_counting' => true));
 		/* @var $addr_list kDBList */
 
 		$addr_list->Query();
 
 		$address_dummy = $this->Application->recallObject('addr.-item', null, Array ('skip_autoload' => true));
 		/* @var $address_dummy AddressesItem */
 
 		$address_prefixes = Array ('Billing', 'Shipping');
 		$address_fields = Array (
 			'To', 'Company', 'Phone', 'Fax', 'Email', 'Address1',
 			'Address2', 'City', 'State', 'Zip', 'Country'
 		);
 
 		foreach ($address_prefixes as $address_prefix) {
 			$address_id = $this->Application->GetVar(strtolower($address_prefix) . '_address_id');
 
 			if ( !$this->Application->GetVar('check_' . strtolower($address_prefix) . '_address') ) {
 				// form type doesn't match check type, e.g. shipping check on billing form
 				continue;
 			}
 
 			if ( $address_id > 0 ) {
 				$address_dummy->Load($address_id);
 			}
 			else {
 				$address_dummy->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
 			}
 
 			foreach ($address_fields as $address_field) {
 				$address_dummy->SetDBField($address_field, $object->GetDBField($address_prefix . $address_field));
 			}
 
 			$address_dummy->MarkAddress($address_prefix, false);
 
 			$ret = ($address_id > 0) ? $address_dummy->Update() : $address_dummy->Create();
 		}
 	}
 
 	/**
 	 * Updates shopping cart content
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnUpdateCart($event)
 	{
 		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
 
 		$event->CallSubEvent('OnRecalculateItems');
 	}
 
 	/**
 	 * Updates cart and returns various info in JSON format
 	 *
 	 * @param kEvent $event
 	 */
 	function OnUpdateCartJSON($event)
 	{
 		if ( $this->Application->GetVar('ajax') != 'yes' ) {
 			return;
 		}
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		// 1. delete given order item by id
 		$delete_id = $this->Application->GetVar('delete_id');
 
 		if ( $delete_id !== false ) {
 			$sql = 'DELETE FROM ' . TABLE_PREFIX . 'OrderItems
 					WHERE OrderId = ' . $object->GetID() . ' AND OrderItemId = ' . (int)$delete_id;
 			$this->Conn->Query($sql);
 		}
 
 		// 2. remove coupon
 		$remove = $this->Application->GetVar('remove');
 
 		if ( $remove == 'coupon' ) {
 			$this->RemoveCoupon($object);
 			$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED);
 		}
 		elseif ( $remove == 'gift_certificate' ) {
 			$this->RemoveGiftCertificate($object);
 			$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_REMOVED);
 		}
 
 		// 3. update product quantities and recalculate all discounts
 		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
 		$event->CallSubEvent('OnRecalculateItems');
 
 		// 4. remove "orditems" object of kDBItem class, since getOrderInfo uses kDBList object under same prefix
 		$this->Application->removeObject('orditems');
 
 		$order_helper = $this->Application->recallObject('OrderHelper');
 		/* @var $order_helper OrderHelper */
 
 		$event->status = kEvent::erSTOP;
 		$currency = $this->Application->GetVar('currency', 'selected');
 
 		echo json_encode( $order_helper->getOrderInfo($object, $currency) );
 	}
 
 	/**
 	 * Adds item to cart
 	 *
 	 * @param kEvent $event
 	 */
 	function OnAddToCart($event)
 	{
 		$this->StoreContinueShoppingLink();
 
 		$qty = $this->Application->GetVar('qty');
 		$options = $this->Application->GetVar('options');
 
 		// multiple or options add
 		$items = Array();
 		if (is_array($qty)) {
 			foreach ($qty as $item_id => $combinations)
 			{
 				if (is_array($combinations)) {
 					foreach ($combinations as $comb_id => $comb_qty) {
 						if ($comb_qty == 0) continue;
 						$items[] = array('item_id' => $item_id, 'qty' => $comb_qty, 'comb' => $comb_id);
 					}
 				}
 				else {
 					$items[] = array('item_id' => $item_id, 'qty' => $combinations);
 				}
 			}
 		}
 
 		if (!$items) {
 			if (!$qty || is_array($qty)) $qty = 1;
 			$item_id = $this->Application->GetVar('p_id');
 			if (!$item_id) return ;
 			$items = array(array('item_id' => $item_id, 'qty' => $qty));
 		}
 
 		// remember item data passed to event when called
 		$default_item_data = $event->getEventParam('ItemData');
 		$default_item_data = $default_item_data ? unserialize($default_item_data) : Array();
 
 		foreach ($items as $an_item) {
 			$item_id = $an_item['item_id'];
 			$qty = $an_item['qty'];
 			$comb = getArrayValue($an_item, 'comb');
 
 			$item_data = $default_item_data;
 
 			$product = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
 			/* @var $product ProductsItem */
 
 			$product->Load($item_id);
 
 			$event->setEventParam('ItemData', null);
 
 			if ($product->GetDBField('AssignedCoupon')) {
 				$item_data['AssignedCoupon'] = $product->GetDBField('AssignedCoupon');
 			}
 
 			// 1. store options information OR
 			if ($comb) {
 				$combination = $this->Conn->GetOne('SELECT Combination FROM '.TABLE_PREFIX.'ProductOptionCombinations WHERE CombinationId = '.$comb);
 				$item_data['Options'] = unserialize($combination);
 			}
 			elseif (is_array($options)) {
 				$item_data['Options'] = $options[$item_id];
 			}
 
 			// 2. store subscription information OR
 			if( $product->GetDBField('Type') == 2 )	// subscriptions
 			{
 				$item_data = $this->BuildSubscriptionItemData($item_id, $item_data);
 			}
 
 			// 3. store package information
 			if( $product->GetDBField('Type') == 5 )	// package
 			{
 				$package_content_ids = $product->GetPackageContentIds();
 
 				$product_package_item = $this->Application->recallObject('p.-packageitem');
 				/* @var $product_package_item ProductsItem */
 
 				$package_item_data = array();
 
 				foreach ($package_content_ids as $package_item_id){
 					$product_package_item->Load($package_item_id);
 					$package_item_data[$package_item_id] = array();
 					if( $product_package_item->GetDBField('Type') == 2 )	// subscriptions
 					{
 						$package_item_data[$package_item_id] = $this->BuildSubscriptionItemData($package_item_id, $item_data);
 					}
 				}
 
 				$item_data['PackageContent'] = $product->GetPackageContentIds();
 				$item_data['PackageItemsItemData'] = $package_item_data;
 			}
 
 			$event->setEventParam('ItemData', serialize($item_data));
 			// 1 for PacakgeNum when in admin - temporary solution to overcome splitting into separate sub-orders
 			// of orders with items added through admin when approving them
 			$this->AddItemToOrder($event, $item_id, $qty, $this->Application->isAdminUser ? 1 : null);
 		}
 		if ($event->status == kEvent::erSUCCESS && !$event->redirect) {
 			$event->SetRedirectParam('pass', 'm');
 			$event->SetRedirectParam('pass_category', 0); //otherwise mod-rewrite shop-cart URL will include category
 			$event->redirect = true;
 		}
 		else {
 			if ($this->Application->isAdminUser) {
 				$event->SetRedirectParam('opener', 'u');
 			}
 		}
 	}
 
 	/**
 	 * Returns table prefix from event (temp or live)
 	 *
 	 * @param kEvent $event
 	 * @return string
 	 * @todo Needed? Should be refactored (by Alex)
 	 */
 	function TablePrefix(kEvent $event)
 	{
 		return $this->UseTempTables($event) ? $this->Application->GetTempTablePrefix('prefix:' . $event->Prefix) . TABLE_PREFIX : TABLE_PREFIX;
 	}
 
 	/**
 	 * Check if required options are selected & selected option combination is in stock
 	 *
 	 * @param kEvent $event
 	 * @param Array $options
 	 * @param int $product_id
 	 * @param int $qty
 	 * @param int $selection_mode
 	 * @return bool
 	 */
 	function CheckOptions($event, &$options, $product_id, $qty, $selection_mode)
 	{
 		// 1. check for required options
 		$selection_filter = $selection_mode == 1 ? ' AND OptionType IN (1,3,6) ' : '';
 		$req_options = $this->Conn->GetCol('SELECT ProductOptionId FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductId = '.$product_id.' AND Required = 1 '.$selection_filter);
 		$result = true;
 		foreach ($req_options as $opt_id) {
 			if (!getArrayValue($options, $opt_id)) {
 				$this->Application->SetVar('opt_error', 1); //let the template know we have an error
 				$result = false;
 			}
 		}
 
 		// 2. check for option combinations in stock
 		$comb_salt = $this->OptionsSalt($options, true);
 		if ($comb_salt) {
 			// such option combination is defined explicitly
 			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 			$sql = 'SELECT Availability
 					FROM '.$poc_table.'
 					WHERE CombinationCRC = '.$comb_salt;
 			$comb_availble = $this->Conn->GetOne($sql);
 
 			// 2.1. check if Availability flag is set, then
 			if ($comb_availble == 1) {
 				// 2.2. check for quantity in stock
 				$table = Array();
 				$table['poc'] = $this->Application->getUnitOption('poc', 'TableName');
 				$table['p'] = $this->Application->getUnitOption('p', 'TableName');
 				$table['oi'] = $this->TablePrefix($event).'OrderItems';
 
 				$object = $event->getObject();
 				$ord_id = $object->GetID();
 
 				// 2.3. check if some amount of same combination & product are not already in shopping cart
 				$sql = 'SELECT '.
 								$table['p'].'.InventoryStatus,'.
 								$table['p'].'.BackOrder,
 								IF('.$table['p'].'.InventoryStatus = 2, '.$table['poc'].'.QtyInStock, '.$table['p'].'.QtyInStock) AS QtyInStock,
 								IF('.$table['oi'].'.OrderItemId IS NULL, 0, '.$table['oi'].'.Quantity) AS Quantity
 						FROM '.$table['p'].'
 						LEFT JOIN '.$table['poc'].' ON
 								'.$table['p'].'.ProductId = '.$table['poc'].'.ProductId
 						LEFT JOIN '.$table['oi'].' ON
 								('.$table['oi'].'.OrderId = '.$ord_id.') AND
 								('.$table['oi'].'.OptionsSalt = '.$comb_salt.') AND
 								('.$table['oi'].'.ProductId = '.$product_id.') AND
 								('.$table['oi'].'.BackOrderFlag = 0)
 						WHERE '.$table['poc'].'.CombinationCRC = '.$comb_salt;
 				$product_info = $this->Conn->GetRow($sql);
 
 				if ($product_info['InventoryStatus']) {
 					$backordering = $this->Application->ConfigValue('Comm_Enable_Backordering');
 					if (!$backordering || $product_info['BackOrder'] == 0) {
 						// backordering is not enabled generally or for this product directly, then check quantities in stock
 						if ($qty + $product_info['Quantity'] > $product_info['QtyInStock']) {
 							$this->Application->SetVar('opt_error', 2);
 							$result = false;
 						}
 					}
 				}
 			}
 			elseif ($comb_availble !== false) {
 				$this->Application->SetVar('opt_error', 2);
 				$result = false;
 			}
 		}
 
 		if ($result) {
 			$event->status = kEvent::erSUCCESS;
 			$shop_cart_template = $this->Application->GetVar('shop_cart_template');
 			$event->redirect = $this->Application->isAdminUser || !$shop_cart_template ? true : $shop_cart_template;
 		}
 		else {
 			$event->status = kEvent::erFAIL;
 		}
 		return $result;
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnUpdateItemOptions($event)
 	{
 		$opt_data = $this->Application->GetVar('options');
 		$options = getArrayValue($opt_data, $this->Application->GetVar('p_id'));
 
 		if (!$options) {
 			$qty_data = $this->Application->GetVar('qty');
 			$comb_id = key(getArrayValue($qty_data, $this->Application->GetVar('p_id')));
 			$options = unserialize($this->Conn->GetOne('SELECT Combination FROM '.TABLE_PREFIX.'ProductOptionCombinations WHERE CombinationId = '.$comb_id));
 		}
 
 		if (!$options) return;
 
 		$ord_item = $this->Application->recallObject('orditems.-opt', null, Array ('skip_autoload' => true));
 		/* @var $ord_item kDBItem */
 
 		$ord_item->Load($this->Application->GetVar('orditems_id'));
 
 		// assuming that quantity cannot be changed during order item editing
 		if (!$this->CheckOptions($event, $options, $ord_item->GetDBField('ProductId'), 0, $ord_item->GetDBField('OptionsSelectionMode'))) return;
 
 		$item_data = unserialize($ord_item->GetDBField('ItemData'));
 		$item_data['Options'] = $options;
 		$ord_item->SetDBField('ItemData', serialize($item_data));
 		$ord_item->SetDBField('OptionsSalt', $this->OptionsSalt($options));
 		$ord_item->Update();
 		$event->CallSubEvent('OnRecalculateItems');
 		if ($event->status == kEvent::erSUCCESS && $this->Application->isAdminUser) {
 			$event->SetRedirectParam('opener', 'u');
 		}
 	}
 
 	function BuildSubscriptionItemData($item_id, $item_data)
 	{
 		$products_table = $this->Application->getUnitOption('p', 'TableName');
 		$products_idfield = $this->Application->getUnitOption('p', 'IDField');
 		$sql = 'SELECT AccessGroupId FROM %s WHERE %s = %s';
 		$item_data['PortalGroupId'] = $this->Conn->GetOne( sprintf($sql, $products_table, $products_idfield, $item_id) );
 
 		$pricing_table = $this->Application->getUnitOption('pr', 'TableName');
 		$pricing_idfield = $this->Application->getUnitOption('pr', 'IDField');
 
 		/* TODO check on implementation
 		$sql = 'SELECT AccessDuration, AccessUnit, DurationType, AccessExpiration FROM %s WHERE %s = %s';
 		*/
 
 		$sql = 'SELECT * FROM %s WHERE %s = %s';
 		$pricing_id = $this->GetPricingId($item_id, $item_data);
 		$item_data['PricingId'] = $pricing_id;
 
 		$pricing_info = $this->Conn->GetRow( sprintf($sql, $pricing_table, $pricing_idfield, $pricing_id ) );
 		$unit_secs = Array(1 => 1, 2 => 60, 3 => 3600, 4 => 86400, 5 => 604800, 6 => 2592000, 7 => 31536000);
 
 		/* TODO check on implementation (code from customization healtheconomics.org)
 		$item_data['DurationType'] = $pricing_info['DurationType'];
 		$item_data['AccessExpiration'] = $pricing_info['AccessExpiration'];
 		*/
 
 		$item_data['Duration'] = $pricing_info['AccessDuration'] * $unit_secs[ $pricing_info['AccessUnit'] ];
 
 		return $item_data;
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnApplyCoupon($event)
 	{
 		$code = $this->Application->GetVar('coupon_code');
 
 		if ($code == '') {
 			return ;
 		}
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$coupon = $this->Application->recallObject('coup', null, Array ('skip_autoload' => true));
 		/* @var $coupon kDBItem */
 
 		$coupon->Load($code, 'Code');
 
 		if ( !$coupon->isLoaded() ) {
 			$event->status = kEvent::erFAIL;
 			$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_CODE_INVALID);
 			$event->redirect = false; // check!!!
 
 			return ;
 		}
 
 		$expire_date = $coupon->GetDBField('Expiration');
 		$number_of_use = $coupon->GetDBField('NumberOfUses');
 		if ( $coupon->GetDBField('Status') != 1 || ($expire_date && $expire_date < adodb_mktime()) ||
 			(isset($number_of_use) && $number_of_use <= 0))
 		{
 			$event->status = kEvent::erFAIL;
 			$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_CODE_EXPIRED);
 			$event->redirect = false;
 
 			return ;
 		}
 
 		$last_used = adodb_mktime();
 		$coupon->SetDBField('LastUsedBy', $this->Application->RecallVar('user_id'));
 		$coupon->SetDBField('LastUsedOn_date', $last_used);
 		$coupon->SetDBField('LastUsedOn_time', $last_used);
 
 
 		if ( isset($number_of_use) ) {
 			$coupon->SetDBField('NumberOfUses', $number_of_use - 1);
 
 			if ($number_of_use == 1) {
 				$coupon->SetDBField('Status', 2);
 			}
 		}
 
 		$coupon->Update();
 
 		$this->Application->setUnitOption('ord', 'AutoLoad', true);
 		$order = $this->Application->recallObject('ord');
 		/* @var $order OrdersItem */
 
 		$order->SetDBField('CouponId', $coupon->GetDBField('CouponId'));
 		$order->SetDBField('CouponName', $coupon->GetDBField('Name')); // calculated field
 
 		$order->Update();
 
 		$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_APPLIED);
 //		OnApplyCoupon is called as hook for OnUpdateCart/OnCheckout, which calls OnRecalcualate themself
 	}
 
 	/**
 	 * Removes coupon from order
 	 *
 	 * @param kEvent $event
 	 * @deprecated
 	 */
 	function OnRemoveCoupon($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$this->RemoveCoupon($object);
 		$object->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED);
 
 		$event->CallSubEvent('OnRecalculateItems');
 	}
 
 	/**
 	 * Removes coupon from a given order
 	 *
 	 * @param OrdersItem $object
 	 */
 	function RemoveCoupon(&$object)
 	{
 		$coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
 		/* @var $coupon kDBItem */
 
 		$coupon->Load( $object->GetDBField('CouponId') );
 
 		if ( $coupon->isLoaded() ) {
 			$coupon->SetDBField('NumberOfUses', $coupon->GetDBField('NumberOfUses') + 1);
 			$coupon->SetDBField('Status', STATUS_ACTIVE);
 			$coupon->Update();
 		}
 
 		$object->SetDBField('CouponId', 0);
 		$object->SetDBField('CouponName', ''); // calculated field
 		$object->SetDBField('CouponDiscount', 0);
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnAddVirtualProductToCart($event)
 	{
 		$l_info = $this->Application->GetVar('l');
 		if($l_info)
 		{
 			foreach($l_info as $link_id => $link_info) {}
 			$item_data['LinkId'] = $link_id;
 			$item_data['ListingTypeId'] = $link_info['ListingTypeId'];
 		}
 		else
 		{
 			$link_id = $this->Application->GetVar('l_id');
 			$sql = 'SELECT ResourceId FROM '.$this->Application->getUnitOption('l', 'TableName').'
 					WHERE LinkId = '.$link_id;
 			$sql = 'SELECT ListingTypeId FROM '.$this->Application->getUnitOption('ls', 'TableName').'
 					WHERE ItemResourceId = '.$this->Conn->GetOne($sql);
 			$item_data['LinkId'] = $link_id;
 			$item_data['ListingTypeId'] = $this->Conn->GetOne($sql);
 		}
 
 		$sql = 'SELECT VirtualProductId FROM '.$this->Application->getUnitOption('lst', 'TableName').'
 				WHERE ListingTypeId = '.$item_data['ListingTypeId'];
 		$item_id = $this->Conn->GetOne($sql);
 
 		$event->setEventParam('ItemData', serialize($item_data));
 		$this->AddItemToOrder($event, $item_id);
 
 		$shop_cart_template = $this->Application->GetVar('shop_cart_template');
 
 		if ( $shop_cart_template ) {
 			$event->redirect = $shop_cart_template;
 		}
 
 		// don't pass unused info to shopping cart, brokes old mod-rewrites
 		$event->SetRedirectParam('pass', 'm'); // not to pass link id
 		$event->SetRedirectParam('m_cat_id', 0); // not to pass link id
 	}
 
 	function OnRemoveFromCart($event)
 	{
 		$ord_item_id = $this->Application->GetVar('orditems_id');
 		$ord_id = $this->getPassedID($event);
 		$this->Conn->Query('DELETE FROM '.TABLE_PREFIX.'OrderItems WHERE OrderId = '.$ord_id.' AND OrderItemId = '.$ord_item_id);
 		$this->OnRecalculateItems($event);
 	}
 
 	function OnCleanupCart($event)
 	{
 		$object = $event->getObject();
 
 		$sql = 'DELETE FROM '.TABLE_PREFIX.'OrderItems
 				WHERE OrderId = '.$this->getPassedID($event);
 		$this->Conn->Query($sql);
 
 		$this->RemoveCoupon($object);
 		$this->RemoveGiftCertificate($object);
 
 		$this->OnRecalculateItems($event);
 	}
 
 	/**
 	 * Returns order id from session or last used
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access public
 	 */
 	public function getPassedID(kEvent $event)
 	{
 		$event->setEventParam('raise_warnings', 0);
 		$passed = parent::getPassedID($event);
 
 		if ( $this->Application->isAdminUser ) {
 			// work as usual in admin
 			return $passed;
 		}
 
 		if ( $event->Special == 'last' ) {
 			// return last order id (for using on thank you page)
 			$order_id = $this->Application->RecallVar('front_order_id');
 
 			return $order_id > 0 ? $order_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
 		}
 
 		$ses_id = $this->Application->RecallVar($event->getPrefixSpecial(true) . '_id');
 
 		if ( $passed && ($passed != $ses_id) ) {
 			// order id given in url doesn't match our current order id
 			$sql = 'SELECT PortalUserId
 					FROM ' . TABLE_PREFIX . 'Orders
 					WHERE OrderId = ' . $passed;
 			$user_id = $this->Conn->GetOne($sql);
 
 			if ( $user_id == $this->Application->RecallVar('user_id') ) {
 				// current user is owner of order with given id -> allow him to view order details
 				return $passed;
 			}
 			else {
 				// current user is not owner of given order -> hacking attempt
 				$this->Application->SetVar($event->getPrefixSpecial() . '_id', 0);
 				return 0;
 			}
 		}
 
 		// not passed or equals to ses_id
 		return $ses_id > 0 ? $ses_id : FAKE_ORDER_ID; // FAKE_ORDER_ID helps to keep parent filter for order items set in "kDBList::linkToParent"
 	}
 
 	/**
 	 * Load item if id is available
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function LoadItem(kEvent $event)
 	{
 		$id = $this->getPassedID($event);
 
 		if ( $id == FAKE_ORDER_ID ) {
 			// if we already know, that there is no such order,
 			// then don't run database query, that will confirm that
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$object->Clear($id);
 			return;
 		}
 
 		parent::LoadItem($event);
 	}
 
 	/**
 	 * Creates new shopping cart
 	 *
 	 * @param kEvent $event
 	 */
 	function _createNewCart($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
 
 		$this->setNextOrderNumber($event);
 		$object->SetDBField('Status', ORDER_STATUS_INCOMPLETE);
 		$object->SetDBField('VisitId', $this->Application->RecallVar('visit_id') );
 
 		// get user
 		if ( $this->Application->LoggedIn() ) {
 			$user = $this->Application->recallObject('u.current');
 			/* @var $user UsersItem */
 
 			$user_id = $user->GetID();
 			$object->SetDBField('BillingEmail', $user->GetDBField('Email'));
 		}
 		else {
 			$user_id = USER_GUEST;
 		}
 
 		$object->SetDBField('PortalUserId', $user_id);
 
 		// get affiliate
 		$affiliate_id = $this->isAffiliate($user_id);
 		if ( $affiliate_id ) {
 			$object->SetDBField('AffiliateId', $affiliate_id);
 		}
 		else {
 			$affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod');
 
 			if ( $affiliate_storage_method == 1 ) {
 				$object->SetDBField('AffiliateId', (int)$this->Application->RecallVar('affiliate_id'));
 			}
 			else {
 				$object->SetDBField('AffiliateId', (int)$this->Application->GetVar('affiliate_id'));
 			}
 		}
 
 		// get payment type
 		$default_type = $this->_getDefaultPaymentType();
 
 		if ( $default_type ) {
 			$object->SetDBField('PaymentType', $default_type);
 		}
 
 		// vat setting
 		$object->SetDBField('VATIncluded', $this->Application->ConfigValue('OrderVATIncluded'));
 
 		$created = $object->Create();
 
 		if ( $created ) {
 			$id = $object->GetID();
 
 			$this->Application->SetVar($event->getPrefixSpecial(true) . '_id', $id);
 			$this->Application->StoreVar($event->getPrefixSpecial(true) . '_id', $id);
 			$this->Application->Session->SetCookie('shop_cart_cookie', $id, strtotime('+1 month'));
 
 			return $id;
 		}
 
 		return 0;
 	}
 
 	/**
 	 * Returns default payment type for order
 	 *
 	 * @return int
 	 */
 	function _getDefaultPaymentType()
 	{
 		$default_type = $this->Application->siteDomainField('PrimaryPaymentTypeId');
 
 		if (!$default_type) {
 			$sql = 'SELECT PaymentTypeId
 					FROM ' . TABLE_PREFIX . 'PaymentTypes
 					WHERE IsPrimary = 1';
 			$default_type = $this->Conn->GetOne($sql);
 		}
 
 		return $default_type;
 	}
 
 	function StoreContinueShoppingLink()
 	{
 		$this->Application->StoreVar('continue_shopping', 'external:'.PROTOCOL.SERVER_NAME.$this->Application->RecallVar('last_url'));
 	}
 
 	/**
 	 * Sets required fields for order, based on current checkout step
 	 * !!! Do not use switch here, since all cases may be on the same form simultaneously
 	 *
 	 * @param kEvent $event
 	 */
 	function SetStepRequiredFields($event)
 	{
 		$order = $event->getObject();
 		/* @var $order OrdersItem */
 
 		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
 		/* @var $cs_helper kCountryStatesHelper */
 
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ($items_info) {
 			// updated address available from SUBMIT -> use it
 			list($id, $field_values) = each($items_info);
 		}
 		else {
 			// no updated address -> use current address
 			$field_values = Array (
 				'ShippingCountry' => $order->GetDBField('ShippingCountry'),
 				'BillingCountry' => $order->GetDBField('BillingCountry'),
 				'PaymentType' => $order->GetDBField('PaymentType'),
 			);
 		}
 
 		// shipping address required fields
 		if ($this->Application->GetVar('check_shipping_address')) {
 			$has_tangibles = $order->HasTangibleItems();
 			$req_fields = array('ShippingTo', 'ShippingAddress1', 'ShippingCity', 'ShippingZip', 'ShippingCountry', /*'ShippingPhone',*/ 'BillingEmail');
 			$order->setRequired($req_fields, $has_tangibles);
 			$order->setRequired('ShippingState', $cs_helper->CountryHasStates( $field_values['ShippingCountry'] ));
 		}
 
 		// billing address required fields
 		if ($this->Application->GetVar('check_billing_address')) {
 			$req_fields = array('BillingTo', 'BillingAddress1', 'BillingCity', 'BillingZip', 'BillingCountry', 'BillingPhone', 'BillingEmail');
 			$order->setRequired($req_fields);
 			$order->setRequired('BillingState', $cs_helper->CountryHasStates( $field_values['BillingCountry'] ));
 		}
 
 		$check_cc = $this->Application->GetVar('check_credit_card');
 
 		if ( $check_cc && ($field_values['PaymentType'] == $order->GetDBField('PaymentType')) ) {
 			// cc check required AND payment type was not changed during SUBMIT
 			if ( $this->Application->isAdminUser ) {
 				$req_fields = Array (/*'PaymentCardType',*/ 'PaymentAccount', /*'PaymentNameOnCard',*/ 'PaymentCCExpDate');
 			}
 			else {
 				$req_fields = Array (/*'PaymentCardType',*/ 'PaymentAccount', /*'PaymentNameOnCard',*/ 'PaymentCCExpDate', 'PaymentCVV2');
 			}
 
 			$order->setRequired($req_fields);
 		}
 	}
 
 	/**
 	 * Set's order's user_id to user from session or Guest otherwise
 	 *
 	 * @param kEvent $event
 	 */
 	function CheckUser($event)
 	{
 		if ($this->Application->isAdminUser || defined('GW_NOTIFY')) {
 			// don't check for user in order while processing payment
 			// gateways, because they can do cross-domain ssl redirects
 			return;
 		}
 
 		$order = $event->getObject();
 		/* @var $order OrdersItem */
 
 		$ses_user = $this->Application->RecallVar('user_id');
 
 		if ( $order->GetDBField('PortalUserId') != $ses_user ) {
 			if ( $ses_user == 0 ) {
 				$ses_user = USER_GUEST;
 			}
 
 			$order->SetDBField('PortalUserId', $ses_user);
 			// since CheckUser is called in OnBeforeItemUpdate, we don't need to call udpate here, just set the field
 		}
 	}
 
 	/* ======================== ADMIN ONLY ======================== */
 
 	/**
 	 * Prepare temp tables for creating new item
 	 * but does not create it. Actual create is
 	 * done in OnPreSaveCreated
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$this->setNextOrderNumber($event);
 
 		$object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']);
 
 		$order_type = $this->getTypeBySpecial( $this->Application->GetVar('order_type') );
 		$object->SetDBField('Status', $order_type);
 	}
 
 	/**
 	 * When cloning orders set new order number to them
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		if ( substr($event->Special, 0, 9) == 'recurring' ) {
 			$object->SetDBField('SubNumber', $object->getNextSubNumber());
 			$object->SetDBField('OriginalAmount', 0); // needed in this case ?
 		}
 		else {
 			$this->setNextOrderNumber($event);
 			$object->SetDBField('OriginalAmount', 0);
 		}
 		$object->SetDBField('OrderDate', adodb_mktime());
 		$object->UpdateFormattersSubFields();
 		$object->SetDBField('GWResult1', '');
 		$object->SetDBField('GWResult2', '');
 	}
 
 	function OnReserveItems($event)
 	{
 		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
 
 		$order_items->linkToParent('-inv');
 		// force re-query, since we are updateing through orditem ITEM, not the list, and
 		// OnReserveItems may be called 2 times when fullfilling backorders through product edit - first time
 		// from FullFillBackorders and second time from OnOrderProcess
 		$order_items->Query(true);
 		$order_items->GoFirst();
 
 		// query all combinations used in this order
 
 
 		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
 		/* @var $product_object kCatDBItem */
 
 		$product_object->SwitchToLive();
 
 		$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
 		/* @var $order_item kDBItem */
 
 		$combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
 		/* @var $combination_item kDBItem */
 
 		$combinations = $this->queryCombinations($order_items);
 
 		$event->status = kEvent::erSUCCESS;
 		while (!$order_items->EOL()) {
 			$rec = $order_items->getCurrentRecord();
 			$product_object->Load( $rec['ProductId'] );
 			if (!$product_object->GetDBField('InventoryStatus')) {
 				$order_items->GoNext();
 				continue;
 			}
 
 			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
 
 			$lack = $rec['Quantity'] - $rec['QuantityReserved'];
 			if ($lack > 0) {
 				// reserve lack or what is available (in case if we need to reserve anything, by Alex)
 				$to_reserve = min($lack, $inv_object->GetDBField('QtyInStock') - $product_object->GetDBField('QtyInStockMin'));
 
 			if ($to_reserve < $lack) $event->status = kEvent::erFAIL; // if we can't reserve the full lack
 
 			//reserve in order
 			$order_item->SetDBFieldsFromHash($rec);
 			$order_item->SetDBField('QuantityReserved', $rec['QuantityReserved'] + $to_reserve);
 			$order_item->SetId($rec['OrderItemId']);
 			$order_item->Update();
 
 			//update product - increase reserved, decrease in stock
 				$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') + $to_reserve);
 				$inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') - $to_reserve);
 				$inv_object->SetDBField('QtyBackOrdered', $inv_object->GetDBField('QtyBackOrdered') - $to_reserve);
 				$inv_object->Update();
 
 				if ($product_object->GetDBField('InventoryStatus') == 2) {
 					// inventory by options, then restore changed combination values back to common $combinations array !!!
 					$combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ] = $inv_object->GetFieldValues();
 				}
 			}
 			$order_items->GoNext();
 		}
 		return true;
 	}
 
 	function OnOrderPrint($event)
 	{
 		$event->SetRedirectParam('opener', 's');
 	}
 
 	/**
 	 * Processes order each tab info resetting to other tab info / to user info
 	 *
 	 * @param kEvent $event
 	 * @access public
 	 */
 	function OnResetAddress($event)
 	{
 		$to_tab = $this->Application->GetVar('to_tab');
 		$from_tab = substr($event->Name, strlen('OnResetTo'));
 
 		// load values from db
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		// update values from submit
 		$field_values = $this->getSubmittedFields($event);
 		$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 
 		$this->DoResetAddress($object, $from_tab, $to_tab);
 
 		$object->Update();
 		$event->redirect = false;
 	}
 
 	/**
 	 * Processes item selection from popup item selector
 	 *
 	 * @todo Is this called ? (by Alex)
 	 * @param kEvent $event
 	 */
 	function OnProcessSelected($event)
 	{
 		$selected_ids = $this->Application->GetVar('selected_ids');
 		$product_ids = $selected_ids['p'];
 
 		if ($product_ids) {
 			$product_ids = explode(',', $product_ids);
 
 			// !!! LOOK OUT - Adding items to Order in admin is handled in order_ITEMS_event_handler !!!
 			foreach ($product_ids as $product_id) {
 				$this->AddItemToOrder($event, $product_id);
 			}
 		}
 
 		$event->SetRedirectParam('opener', 'u');
 	}
 
 	function OnMassPlaceOrder($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$ids = $this->StoreSelectedIDs($event);
 
 		if($ids)
 		{
 			foreach($ids as $id)
 			{
 				$object->Load($id);
 				$this->DoPlaceOrder($event);
 			}
 		}
 		$event->status = kEvent::erSUCCESS;
 
 	}
 
 
 
 	/**
 	 * Universal
 	 * Checks if QtyInStock is enough to fullfill backorder (Qty - QtyReserved in order)
 	 *
 	 * @param int $ord_id
 	 * @return bool
 	 */
 	function ReadyToProcess($ord_id)
 	{
 		$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 		$query = '	SELECT SUM(IF( IF('.TABLE_PREFIX.'Products.InventoryStatus = 2, '.$poc_table.'.QtyInStock, '.TABLE_PREFIX.'Products.QtyInStock) - '.TABLE_PREFIX.'Products.QtyInStockMin >= ('.TABLE_PREFIX.'OrderItems.Quantity - '.TABLE_PREFIX.'OrderItems.QuantityReserved), 0, 1))
 							FROM '.TABLE_PREFIX.'OrderItems
 					LEFT JOIN '.TABLE_PREFIX.'Products ON '.TABLE_PREFIX.'Products.ProductId = '.TABLE_PREFIX.'OrderItems.ProductId
 					LEFT JOIN '.$poc_table.' ON ('.$poc_table.'.CombinationCRC = '.TABLE_PREFIX.'OrderItems.OptionsSalt) AND ('.$poc_table.'.ProductId = '.TABLE_PREFIX.'OrderItems.ProductId)
 							WHERE OrderId = '.$ord_id.'
 							GROUP BY OrderId';
 
 		// IF (IF(InventoryStatus = 2, poc.QtyInStock, p.QtyInStock) - QtyInStockMin >= (Quantity - QuantityReserved), 0, 1
 		return ($this->Conn->GetOne($query) == 0);
 	}
 
 	/**
 	 * Return all option combinations used in order
 	 *
 	 * @param kDBList $order_items
 	 * @return Array
 	 */
 	function queryCombinations(&$order_items)
 	{
 		// 1. collect combination crc used in order
 		$combinations = Array();
 		while (!$order_items->EOL()) {
 			$row = $order_items->getCurrentRecord();
 			if ($row['OptionsSalt'] == 0) {
 				$order_items->GoNext();
 				continue;
 			}
 			$combinations[] = '(poc.ProductId = '.$row['ProductId'].') AND (poc.CombinationCRC = '.$row['OptionsSalt'].')';
 			$order_items->GoNext();
 		}
 		$order_items->GoFirst();
 		$combinations = array_unique($combinations); // if same combination+product found as backorder & normal order item
 
 		if ($combinations) {
 			// 2. query data about combinations
 			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 			$sql = 'SELECT CONCAT(poc.ProductId, "_", poc.CombinationCRC) AS CombinationKey, poc.*
 					FROM '.$poc_table.' poc
 					WHERE ('.implode(') OR (', $combinations).')';
 
 			return $this->Conn->Query($sql, 'CombinationKey');
 		}
 
 		return Array();
 	}
 
 	/**
 	 * Returns object to perform inventory actions on
 	 *
 	 * @param ProductsItem $product current product object in order
 	 * @param kDBItem $combination combination dummy object
 	 * @param Array $combination_data pre-queried combination data
 	 * @return kDBItem
 	 */
 	function &getInventoryObject(&$product, &$combination, $combination_data)
 	{
 		if ($product->GetDBField('InventoryStatus') == 2) {
 			// inventory by option combinations
 			$combination->SetDBFieldsFromHash($combination_data);
 			$combination->setID($combination_data['CombinationId']);
 			$change_item =& $combination;
 		}
 		else {
 			// inventory by product ifself
 			$change_item =& $product;
 		}
 
 		return $change_item;
 	}
 
 	/**
 	 * Approve order ("Pending" tab)
 	 *
 	 * @param kDBList $order_items
 	 * @return int new status of order if any
 	 */
 	function approveOrder(&$order_items)
 	{
 		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
 		$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
 		$combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
 
 		$combinations = $this->queryCombinations($order_items);
 
 		while (!$order_items->EOL()) {
 			$rec = $order_items->getCurrentRecord();
 
 			$order_item->SetDBFieldsFromHash($rec);
 			$order_item->SetId($rec['OrderItemId']);
 			$order_item->SetDBField('QuantityReserved', 0);
 			$order_item->Update();
 
 			$product_object->Load( $rec['ProductId'] );
 			if (!$product_object->GetDBField('InventoryStatus')) {
 				// if no inventory info is collected, then skip this order item
 				$order_items->GoNext();
 				continue;
 			}
 
 			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
 
 			// decrease QtyReserved by amount of product used in order
 			$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') - $rec['Quantity']);
 			$inv_object->Update();
 
 			if ($product_object->GetDBField('InventoryStatus') == 2) {
 				// inventory by options, then restore changed combination values back to common $combinations array !!!
 				$combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ] = $inv_object->GetFieldValues();
 			}
 
 			$order_items->GoNext();
 		}
 		return true;
 	}
 
 	/**
 	 * Restores reserved items in the order
 	 *
 	 * @param kDBList $order_items
 	 * @return bool
 	 */
 	function restoreOrder(&$order_items)
 	{
 		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
 		/* @var $product_object kCatDBItem */
 
 		$product_object->SwitchToLive();
 
 		$order_item = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
 		/* @var $order_item kDBItem */
 
 		$combination_item = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
 		/* @var $combination_item kDBItem */
 
 		$combinations = $this->queryCombinations($order_items);
 
 		while( !$order_items->EOL() )
 		{
 			$rec = $order_items->getCurrentRecord();
 
 			$product_object->Load( $rec['ProductId'] );
 			if (!$product_object->GetDBField('InventoryStatus')) {
 				// if no inventory info is collected, then skip this order item
 				$order_items->GoNext();
 				continue;
 			}
 
 			$inv_object =& $this->getInventoryObject($product_object, $combination_item, $combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ]);
 
 			// cancelling backorderd qty if any
 			$lack = $rec['Quantity'] - $rec['QuantityReserved'];
 			if ($lack > 0 && $rec['BackOrderFlag'] > 0) { // lack should have been recorded as QtyBackOrdered
 				$inv_object->SetDBField('QtyBackOrdered', $inv_object->GetDBField('QtyBackOrdered') - $lack);
 			}
 
 			// canceling reservation in stock
 			$inv_object->SetDBField('QtyReserved', $inv_object->GetDBField('QtyReserved') - $rec['QuantityReserved']);
 			// putting remaining freed qty back to stock
 			$inv_object->SetDBField('QtyInStock', $inv_object->GetDBField('QtyInStock') + $rec['QuantityReserved']);
 			$inv_object->Update();
 
 			$product_h = $this->Application->recallObject('p_EventHandler');
 			/* @var $product_h ProductsEventHandler */
 
 			if ($product_object->GetDBField('InventoryStatus') == 2) {
 				// inventory by options, then restore changed combination values back to common $combinations array !!!
 				$combinations[ $rec['ProductId'].'_'.$rec['OptionsSalt'] ] = $inv_object->GetFieldValues();
 
 				// using freed qty to fulfill possible backorders
 				$product_h->FullfillBackOrders($product_object, $inv_object->GetID());
 			}
 			else {
 				// using freed qty to fulfill possible backorders
 				$product_h->FullfillBackOrders($product_object, 0);
 			}
 
 			$order_item->SetDBFieldsFromHash($rec);
 			$order_item->SetId($rec['OrderItemId']);
 			$order_item->SetDBField('QuantityReserved', 0);
 			$order_item->Update();
 
 			$order_items->GoNext();
 		}
 
 		return true;
 	}
 
 	/**
 	 * Approve order + special processing
 	 *
 	 * @param kEvent $event
 	 */
 	function MassInventoryAction($event)
 	{
 		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		// process order products
 		$object = $this->Application->recallObject($event->Prefix . '.-inv', null, Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
 
 		$ids = $this->StoreSelectedIDs($event);
 
 		if ( $ids ) {
 			foreach ($ids as $id) {
 				$object->Load($id);
 				$this->InventoryAction($event);
 			}
 		}
 	}
 
 	function InventoryAction($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
 			return;
 		}
 
 		$event_status_map = Array(
 			'OnMassOrderApprove'	=> ORDER_STATUS_TOSHIP,
 			'OnOrderApprove' 		=> ORDER_STATUS_TOSHIP,
 			'OnMassOrderDeny'		=> ORDER_STATUS_DENIED,
 			'OnOrderDeny'			=> ORDER_STATUS_DENIED,
 			'OnMassOrderArchive'	=> ORDER_STATUS_ARCHIVED,
 			'OnOrderArchive'		=> ORDER_STATUS_ARCHIVED,
 			'OnMassOrderShip' 		=> ORDER_STATUS_PROCESSED,
 			'OnOrderShip' 			=> ORDER_STATUS_PROCESSED,
 			'OnMassOrderProcess' 	=> ORDER_STATUS_TOSHIP,
 			'OnOrderProcess' 		=> ORDER_STATUS_TOSHIP,
 		);
 
 		$order_items = $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
 
 		$order_items->linkToParent('-inv');
 		$order_items->Query();
 		$order_items->GoFirst();
 
 		$object = $this->Application->recallObject($event->Prefix.'.-inv');
 		/* @var $object OrdersItem */
 
 		if ($object->GetDBField('OnHold')) {
 			// any actions have no effect while on hold
 			return ;
 		}
 
 		// save original order status
 		$original_order_status = $object->GetDBField('Status');
 
 		// preparing new status, but not setting it yet
 		$object->SetDBField('Status', $event_status_map[$event->Name]);
 
 		$set_new_status = false;
 		$event->status = kEvent::erSUCCESS;
 
 		$email_params = $this->OrderEmailParams($object);
 
 		switch ($event->Name) {
 			case 'OnMassOrderApprove':
 			case 'OnOrderApprove':
 				$set_new_status = false; //on successful approve order will be split and new orders will have new statuses
 
 				if ($object->GetDBField('ChargeOnNextApprove')) {
 					$charge_info = $this->ChargeOrder($object);
 					if (!$charge_info['result']) {
 						break;
 					}
 
 					// removing ChargeOnNextApprove
 					$object->SetDBField('ChargeOnNextApprove', 0);
 					$sql = 'UPDATE '.$object->TableName.' SET ChargeOnNextApprove = 0 WHERE '.$object->IDField.' = '.$object->GetID();
 					$this->Conn->Query($sql);
 				}
 
 				// charge user for order in case if we user 2step charging (e.g. AUTH_ONLY + PRIOR_AUTH_CAPTURE)
 				$gw_data = $object->getGatewayData();
 
 				$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
 				$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
 				/* @var $gateway_object kGWBase */
 
 				$charge_result = $gateway_object->Charge($object->GetFieldValues(), $gw_data['gw_params']);
 				$sql = 'UPDATE %s SET GWResult2 = %s WHERE %s = %s';
 				$sql = sprintf($sql, $object->TableName, $this->Conn->qstr($gateway_object->getGWResponce()), $object->IDField, $object->GetID() );
 				$this->Conn->Query($sql);
 				$object->SetDBField('GWResult2', $gateway_object->getGWResponce() );
 
 				if ($charge_result) {
 					$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
 					/* @var $product_object ProductsItem */
 
 					foreach ($order_items->Records as $product_item) {
 						if (!$product_item['ProductId']) {
 							 // product may have been deleted
 							continue;
 						}
 						$product_object->Load($product_item['ProductId']);
 						$hits = floor( $product_object->GetDBField('Hits') ) + 1;
 						$sql = 'SELECT MAX(Hits) FROM '.$this->Application->getUnitOption('p', 'TableName').'
 								WHERE FLOOR(Hits) = '.$hits;
 						$hits = ( $res = $this->Conn->GetOne($sql) ) ? $res + 0.000001 : $hits;
 						$product_object->SetDBField('Hits', $hits);
 						$product_object->Update();
 
 						/*$sql = 'UPDATE '.$this->Application->getUnitOption('p', 'TableName').'
 								SET Hits = Hits + '.$product_item['Quantity'].'
 								WHERE ProductId = '.$product_item['ProductId'];
 						$this->Conn->Query($sql);*/
 					}
 
 					$this->PrepareCoupons($event, $object);
 					$this->SplitOrder($event, $object);
 					if ($object->GetDBField('IsRecurringBilling') != 1) {
 						$this->Application->EmailEventUser('ORDER.APPROVE', $object->GetDBField('PortalUserId'), $email_params);
 
 						// Mask credit card with XXXX
 						if ($this->Application->ConfigValue('Comm_MaskProcessedCreditCards')) {
 							$this->maskCreditCard($object, 'PaymentAccount');
 							$set_new_status = 1;
 						}
 					}
 				}
 
 				break;
 
 			case 'OnMassOrderDeny':
 			case 'OnOrderDeny':
 				foreach ($order_items->Records as $product_item) {
 					if (!$product_item['ProductId']) {
 						 // product may have been deleted
 						continue;
 					}
 					$this->raiseProductEvent('Deny', $product_item['ProductId'], $product_item);
 				}
 
 				if ( ($original_order_status != ORDER_STATUS_INCOMPLETE ) && ($event->Name == 'OnMassOrderDeny' || $event->Name == 'OnOrderDeny') ) {
 					$this->Application->EmailEventUser('ORDER.DENY', $object->GetDBField('PortalUserId'), $email_params);
 
 					// inform payment gateway that order was declined
 					$gw_data = $object->getGatewayData();
 
 					if ( $gw_data ) {
 						$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH . '/' . $gw_data['ClassFile'] );
 						$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
 
 						$gateway_object->OrderDeclined($object->GetFieldValues(), $gw_data['gw_params']);
 					}
 				}
 
 				// !!! LOOK HERE !!!
 				// !!!! no break !!!! here on purpose!!!
 			case 'OnMassOrderArchive':
 			case 'OnOrderArchive':
 				// it's critical to update status BEFORE processing items because
 				// FullfillBackorders could be called during processing and in case
 				// of order denial/archive fullfill could reserve the qtys back for current backorder
 				$object->Update();
 				$this->restoreOrder($order_items);
 				$set_new_status = false; // already set
 				break;
 
 			case 'OnMassOrderShip':
 			case 'OnOrderShip':
 				$ret = Array ();
 				$shipping_info = $object->GetDBField('ShippingInfo');
 
 				if ($shipping_info) {
 					$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
 					/* @var $quote_engine_collector ShippingQuoteCollector */
 
 					$shipping_info = unserialize($shipping_info);
 					$sqe_class_name = $quote_engine_collector->GetClassByType($shipping_info, 1);
 				}
 
 				// try to create usps order
 				if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false)) {
 					$shipping_quote_engine = $this->Application->recallObject($sqe_class_name);
 					/* @var $shipping_quote_engine ShippingQuoteEngine */
 
 					$ret = $shipping_quote_engine->MakeOrder($object);
 				}
 
 				if ( !array_key_exists('error_number', $ret) ) {
 					$set_new_status = $this->approveOrder($order_items);
 
 	//				$set_new_status = $this->shipOrder($order_items);
 					$object->SetDBField('ShippingDate', adodb_mktime());
 					$object->UpdateFormattersSubFields();
 
 					$shipping_email = $object->GetDBField('ShippingEmail');
 					$email_params['to_email'] = $shipping_email ? $shipping_email : $email_params['_user_email'];
 					$this->Application->EmailEventUser('ORDER.SHIP', $object->GetDBField('PortalUserId'), $email_params);
 
 					// inform payment gateway that order was shipped
 					$gw_data = $object->getGatewayData();
 
 					$this->Application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] );
 					$gateway_object = $this->Application->recallObject( $gw_data['ClassName'] );
 
 					$gateway_object->OrderShipped($object->GetFieldValues(), $gw_data['gw_params']);
 				}
 				else {
 					$sqe_errors = $this->Application->RecallVar('sqe_errors');
 					$sqe_errors = $sqe_errors ? unserialize($sqe_errors) : Array ();
 					$sqe_errors[ $object->GetField('OrderNumber') ] = $ret['error_description'];
 
 					$this->Application->StoreVar('sqe_errors', serialize($sqe_errors));
 				}
 				break;
 
 			case 'OnMassOrderProcess':
 			case 'OnOrderProcess':
 				if ($this->ReadyToProcess($object->GetID())) {
 					$event->CallSubEvent('OnReserveItems');
 					if ($event->status == kEvent::erSUCCESS) $set_new_status = true;
 					$this->Application->EmailEventUser('BACKORDER.PROCESS', $object->GetDBField('PortalUserId'), $email_params);
 				} else {
 					$event->status = kEvent::erFAIL;
 				}
 				break;
 		}
 
 		if ($set_new_status) {
 			$object->Update();
 		}
 	}
 
 	/**
 	 * Hides last 4 digits from credit card number
 	 *
 	 * @param OrdersItem $object
 	 * @param string $field
 	 */
 	function maskCreditCard(&$object, $field)
 	{
 		$value = $object->GetDBField($field);
 		$value = preg_replace('/'.substr($value, -4).'$/', str_repeat('X', 4), $value);
 		$object->SetDBField($field, $value);
 	}
 
 	/**
 	 * Set next available order number
 	 *
 	 * @param kEvent $event
 	 */
 	function setNextOrderNumber($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$sql = 'SELECT MAX(Number)
 				FROM ' . $this->Application->GetLiveName($object->TableName);
 		$next_order_number = $this->Conn->GetOne($sql) + 1;
 
 		$next_order_number = max($next_order_number, $this->Application->ConfigValue('Comm_Next_Order_Number'));
 		$this->Application->SetConfigValue('Comm_Next_Order_Number', $next_order_number + 1);
 
 		$object->SetDBField('Number', $next_order_number);
 		$object->SetDBField('SubNumber', 0);
 
 		// set virtual field too
 		$number_format = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_P');
 		$sub_number_format = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_S');
 		$order_number = sprintf('%0' . $number_format . 'd', $next_order_number) . '-' . str_repeat('0', $sub_number_format);
 
 		$object->SetDBField('OrderNumber', $order_number);
 	}
 
 	/**
 	 * Set's new order address based on another address from order (e.g. billing from shipping)
 	 *
 	 * @param unknown_type $object
 	 * @param unknown_type $from
 	 * @param unknown_type $to
 	 */
 	function DoResetAddress(&$object, $from, $to)
 	{
 		$fields = Array('To','Company','Phone','Fax','Email','Address1','Address2','City','State','Zip','Country');
 
 		if ($from == 'User') {
 			// skip these fields when coping from user, because they are not present in user profile
 			$tmp_fields = array_flip($fields);
 //			unset($tmp_fields['Company'], $tmp_fields['Fax'], $tmp_fields['Address2']);
 			$fields = array_flip($tmp_fields);
 		}
 
 		// apply modification
 		foreach ($fields as $field_name) {
 			$object->SetDBField($to.$field_name, $object->GetDBField($from.$field_name));
 		}
 	}
 
 	/**
 	 * Set's status incomplete to all cloned orders
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterClone(kEvent $event)
 	{
 		parent::OnAfterClone($event);
 
 		$id = $event->getEventParam('id');
 		$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 
 		// set cloned order status to Incomplete
 		$sql = 'UPDATE ' . $table . '
 				SET Status = 0
 				WHERE ' . $id_field . ' = ' . $id;
 		$this->Conn->Query($sql);
 	}
 
 
 	/* ======================== COMMON CODE ======================== */
 
 	/**
 	 * Split one timestamp field into 2 virtual fields
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		// get user fields
 		$user_id = $object->GetDBField('PortalUserId');
 
 		if ( $user_id ) {
 			$sql = 'SELECT *, CONCAT(FirstName,\' \',LastName) AS UserTo
 					FROM ' . TABLE_PREFIX . 'Users
 					WHERE PortalUserId = ' . $user_id;
 			$user_info = $this->Conn->GetRow($sql);
 
 			$fields = Array(
 				'UserTo'=>'UserTo','UserPhone'=>'Phone','UserFax'=>'Fax','UserEmail'=>'Email',
 				'UserAddress1'=>'Street','UserAddress2'=>'Street2','UserCity'=>'City','UserState'=>'State',
 				'UserZip'=>'Zip','UserCountry'=>'Country','UserCompany'=>'Company'
 			);
 
 			foreach ($fields as $object_field => $user_field) {
 				$object->SetDBField($object_field, $user_info[$user_field]);
 			}
 		}
 
 		$object->SetDBField('PaymentCVV2', $this->Application->RecallVar('CVV2Code'));
 
 		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
 		/* @var $cs_helper kCountryStatesHelper */
 
 		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
 		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
 
 		$this->SetStepRequiredFields($event);
 
 		// needed in OnAfterItemUpdate
 		$this->Application->SetVar('OriginalShippingOption', $object->GetDBField('ShippingOption'));
 	}
 
 	/**
 	 * Processes states
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
 		/* @var $cs_helper kCountryStatesHelper */
 
 		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
 		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
 	}
 
 	/**
 	 * Processes states
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$old_payment_type = $object->GetOriginalField('PaymentType');
 		$new_payment_type = $object->GetDBField('PaymentType');
 
 		if ( $new_payment_type != $old_payment_type ) {
 			// payment type changed -> check that it's allowed
 			$available_payment_types = $this->Application->siteDomainField('PaymentTypes');
 
 			if ( $available_payment_types ) {
 				if ( strpos($available_payment_types, '|' . $new_payment_type . '|') === false ) {
 					// payment type isn't allowed in site domain
 					$object->SetDBField('PaymentType', $old_payment_type);
 				}
 			}
 		}
 
 		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
 		/* @var $cs_helper kCountryStatesHelper */
 
 		$cs_helper->PopulateStates($event, 'ShippingState', 'ShippingCountry');
 		$cs_helper->PopulateStates($event, 'BillingState', 'BillingCountry');
 
 		if ( $object->HasTangibleItems() ) {
 			$cs_helper->CheckStateField($event, 'ShippingState', 'ShippingCountry', false);
 		}
 
 		$cs_helper->CheckStateField($event, 'BillingState', 'BillingCountry', false);
 
 		if ( $object->GetDBField('Status') > ORDER_STATUS_PENDING ) {
 			return ;
 		}
 
 		$this->CheckUser($event);
 
 		if ( !$object->GetDBField('OrderIP') ) {
 			$object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']);
 		}
 
 		$shipping_option = $this->Application->GetVar('OriginalShippingOption');
 		$new_shipping_option = $object->GetDBField('ShippingOption');
 
 		if ( $shipping_option != $new_shipping_option ) {
 			$this->UpdateShippingOption($event);
 		}
 		else {
 			$this->UpdateShippingTypes($event);
 		}
 		$this->RecalculateProcessingFee($event);
 		$this->UpdateShippingTotal($event);
 		$this->RecalculateGift($event);
 
 		// guess fields from "One Step Checkout" form
 		if ( $object->GetDBField('PaymentAccount') ) {
 			$order_helper = $this->Application->recallObject('OrderHelper');
 			/* @var $order_helper OrderHelper */
 
 			$object->SetDBField('PaymentCardType', $order_helper->getCreditCartType($object->GetDBField('PaymentAccount')));
 		}
 		else {
 			$object->SetDBField('PaymentCardType', '');
 		}
 
 		if ( !$object->GetDBField('PaymentNameOnCard') ) {
 			$object->SetDBField('PaymentNameOnCard', $object->GetDBField('BillingTo'));
 		}
 
 		if ( is_object($event->MasterEvent) && $event->MasterEvent->Name == 'OnUpdateAjax' && $this->Application->GetVar('create_account') && $object->Validate() ) {
 			$this->createAccountFromOrder($event);
 		}
 	}
 
 	/**
 	 * Creates user account
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function createAccountFromOrder($event)
 	{
 		$order = $event->getObject();
 		/* @var $order OrdersItem */
 
 		$order_helper = $this->Application->recallObject('OrderHelper');
 		/* @var $order_helper OrderHelper */
 
 		$user_fields = $order_helper->getUserFields($order);
 		$user_fields['Password'] = $order->GetDBField('UserPassword_plain');
 		$user_fields['VerifyPassword'] = $order->GetDBField('VerifyUserPassword_plain');
 
 		if ( $order->GetDBField('PortalUserId') == USER_GUEST ) {
 			// will also auto-login user when created
 			$this->Application->SetVar('u_register', Array (USER_GUEST => $user_fields));
 			$this->Application->HandleEvent(new kEvent('u.register:OnCreate'));
 		}
 		else {
 			$user = $this->Application->recallObject('u.current');
 			/* @var $user UsersItem */
 
 			$user->SetFieldsFromHash($user_fields);
 			if ( !$user->Update() ) {
 				$order->SetError('BillingEmail', $user->GetErrorPseudo('Email'));
 			}
 		}
 	}
 
 	/**
 	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
 	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBList */
 
 		$types = $event->getEventParam('types');
 		if ( $types == 'myorders' || $types == 'myrecentorders' ) {
 			$user_id = $this->Application->RecallVar('user_id');
 			$object->addFilter('myitems_user1', '%1$s.PortalUserId = ' . $user_id);
 			$object->addFilter('myitems_user2', '%1$s.PortalUserId > 0');
 			$object->addFilter('Status', '%1$s.Status != 0');
 		}
 		else if ($event->Special == 'returns') {
 //			$object->addFilter('returns_filter',TABLE_PREFIX.'Orders.Status = '.ORDER_STATUS_PROCESSED.' AND (
 //				SELECT SUM(ReturnType)
 //				FROM '.TABLE_PREFIX.'OrderItems oi
 //				WHERE oi.OrderId = '.TABLE_PREFIX.'Orders.OrderId
 //			) > 0');
 			$object->addFilter('returns_filter', TABLE_PREFIX . 'Orders.Status = ' . ORDER_STATUS_PROCESSED . ' AND ' . TABLE_PREFIX . 'Orders.ReturnTotal > 0');
 		}
 		else if ( $event->Special == 'user' ) {
 			$user_id = $this->Application->GetVar('u_id');
 			$object->addFilter('user_filter', '%1$s.PortalUserId = ' . $user_id);
 		}
 		else {
 			$special = $event->Special ? $event->Special : $this->Application->GetVar('order_type');
 			if ( $special != 'search' ) {
 				// don't filter out orders by special in case of search tab
 				$object->addFilter('status_filter', '%1$s.Status=' . $this->getTypeBySpecial($special));
 			}
 
 			if ( $event->getEventParam('selected_only') ) {
 				$ids = $this->StoreSelectedIDs($event);
 				$object->addFilter('selected_filter', '%1$s.OrderId IN (' . implode(',', $ids) . ')');
 			}
 		}
 	}
 
 	function getTypeBySpecial($special)
 	{
 		$special2type = Array('incomplete'=>0,'pending'=>1,'backorders'=>2,'toship'=>3,'processed'=>4,'denied'=>5,'archived'=>6);
 		return $special2type[$special];
 	}
 
 	function getSpecialByType($type)
 	{
 		$type2special = Array(0=>'incomplete',1=>'pending',2=>'backorders',3=>'toship',4=>'processed',5=>'denied',6=>'archived');
 		return $type2special[$type];
 	}
 
 	function LockTables($event)
 	{
 		$read = Array();
 		$write_lock = '';
 		$read_lock = '';
 		$write = Array('Orders','OrderItems','Products');
 		foreach ($write as $tbl) {
 			$write_lock .= TABLE_PREFIX.$tbl.' WRITE,';
 		}
 		foreach ($read as $tbl) {
 			$read_lock .= TABLE_PREFIX.$tbl.' READ,';
 		}
 		$write_lock = rtrim($write_lock, ',');
 		$read_lock = rtrim($read_lock, ',');
 		$lock = trim($read_lock.','.$write_lock, ',');
 		//$this->Conn->Query('LOCK TABLES '.$lock);
 	}
 
 	/**
 	 * Checks shopping cart products quantities
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 */
 	function CheckQuantites($event)
 	{
 		if ( $this->OnRecalculateItems($event) ) { // if something has changed in the order
 			if ( $this->Application->isAdminUser ) {
 				if ( $this->UseTempTables($event) ) {
 					$event->redirect = 'in-commerce/orders/orders_edit_items';
 				}
 			}
 			else {
 				$event->redirect = $this->Application->GetVar('viewcart_template');
 			}
 
 			return false;
 		}
 
 		return true;
 	}
 
 	function DoPlaceOrder($event)
 	{
 		$order = $event->getObject();
 
 		$table_prefix = $this->TablePrefix($event);
 
 		$this->LockTables($event);
 
 		if (!$this->CheckQuantites($event)) return false;
 
 		//everything is fine - we could reserve items
 		$this->ReserveItems($event);
 		$this->SplitOrder($event, $order);
 		return true;
 	}
 
 	function &queryOrderItems($event, $table_prefix)
 	{
 		$order = $event->getObject();
 		$ord_id = $order->GetId();
 
 		// TABLE_PREFIX and $table_prefix are NOT the same !!!
 		$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 		$query = '	SELECT
 							 BackOrderFlag, '.
 							 $table_prefix.'OrderItems.OrderItemId, '.
 							 $table_prefix.'OrderItems.Quantity, '.
 							 $table_prefix.'OrderItems.QuantityReserved,
 							 IF('.TABLE_PREFIX.'Products.InventoryStatus = 2, '.$poc_table.'.QtyInStock, '.TABLE_PREFIX.'Products.QtyInStock) AS QtyInStock, '.
 							 TABLE_PREFIX.'Products.QtyInStockMin, '.
 							 $table_prefix.'OrderItems.ProductId, '.
 							 TABLE_PREFIX.'Products.InventoryStatus,'.
 							 $table_prefix.'OrderItems.OptionsSalt AS CombinationCRC
 					FROM '.$table_prefix.'OrderItems
 					LEFT JOIN '.TABLE_PREFIX.'Products ON '.TABLE_PREFIX.'Products.ProductId = '.$table_prefix.'OrderItems.ProductId
 					LEFT JOIN '.$poc_table.' ON ('.$poc_table.'.CombinationCRC = '.$table_prefix.'OrderItems.OptionsSalt) AND ('.$poc_table.'.ProductId = '.$table_prefix.'OrderItems.ProductId)
 					WHERE OrderId = '.$ord_id.' AND '.TABLE_PREFIX.'Products.Type = 1
 					ORDER BY BackOrderFlag ASC';
 
 		$items = $this->Conn->Query($query);
 		return $items;
 	}
 
 	function ReserveItems($event)
 	{
 		$table_prefix = $this->TablePrefix($event);
 		$items =& $this->queryOrderItems($event, $table_prefix);
 
 		foreach ($items as $an_item) {
 			if (!$an_item['InventoryStatus']) {
 				$to_reserve = $an_item['Quantity'] - $an_item['QuantityReserved'];
 			}
 			else {
 				if ($an_item['BackOrderFlag'] > 0) { // we don't need to reserve if it's backordered item
 					$to_reserve = 0;
 				}
 				else {
 					$to_reserve = min($an_item['Quantity']-$an_item['QuantityReserved'], $an_item['QtyInStock']-$an_item['QtyInStockMin']); //it should be equal, but just in case
 				}
 
 				$to_backorder = $an_item['BackOrderFlag'] > 0 ? $an_item['Quantity']-$an_item['QuantityReserved'] : 0;
 			}
 
 			if ($to_backorder < 0) $to_backorder = 0; //just in case
 			$query = '	UPDATE '.$table_prefix.'OrderItems
 						SET QuantityReserved = IF(QuantityReserved IS NULL, '.$to_reserve.', QuantityReserved + '.$to_reserve.')
 						WHERE OrderItemId = '.$an_item['OrderItemId'];
 			$this->Conn->Query($query);
 
 			if (!$an_item['InventoryStatus']) continue;
 
 			$update_clause = '	QtyInStock = QtyInStock - '.$to_reserve.',
 							  	QtyReserved = QtyReserved + '.$to_reserve.',
 								QtyBackOrdered = QtyBackOrdered + '.$to_backorder;
 
 			if ($an_item['InventoryStatus'] == 1) {
 				// inventory by product, then update it's quantities
 				$query = '	UPDATE '.TABLE_PREFIX.'Products
 							SET '.$update_clause.'
 								WHERE ProductId = '.$an_item['ProductId'];
 			}
 			else {
 				// inventory = 2 -> by product option combinations
 				$poc_idfield = $this->Application->getUnitOption('poc', 'IDField');
 				$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 				$query = '	UPDATE '.$poc_table.'
 							SET '.$update_clause.'
 							WHERE (ProductId = '.$an_item['ProductId'].') AND (CombinationCRC = '.$an_item['CombinationCRC'].')';
 			}
 			$this->Conn->Query($query);
 		}
 	}
 
 	function FreeItems($event)
 	{
 		$table_prefix = $this->TablePrefix($event);
 		$items =& $this->queryOrderItems($event, $table_prefix);
 
 		foreach ($items as $an_item) {
 				$to_free = $an_item['QuantityReserved'];
 
 				if ($an_item['InventoryStatus']) {
 				if ($an_item['BackOrderFlag'] > 0) { // we don't need to free if it's backordered item
 					$to_free = 0;
 				}
 
 				// what's not reserved goes to backorder in stock for orderitems marked with BackOrderFlag
 				$to_backorder_free = $an_item['BackOrderFlag'] > 0 ? $an_item['Quantity'] - $an_item['QuantityReserved'] : 0;
 				if ($to_backorder_free < 0) $to_backorder_free = 0; //just in case
 
 				$update_clause = '	QtyInStock = QtyInStock + '.$to_free.',
 								  	QtyReserved = QtyReserved - '.$to_free.',
 							  		QtyBackOrdered = QtyBackOrdered - '.$to_backorder_free;
 
 				if ($an_item['InventoryStatus'] == 1) {
 					// inventory by product
 					$query = '	UPDATE '.TABLE_PREFIX.'Products
 								SET '.$update_clause.'
 									WHERE ProductId = '.$an_item['ProductId'];
 				}
 				else {
 					// inventory by option combinations
 					$poc_idfield = $this->Application->getUnitOption('poc', 'IDField');
 					$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 					$query = '	UPDATE '.$poc_table.'
 								SET '.$update_clause.'
 								WHERE (ProductId = '.$an_item['ProductId'].') AND (CombinationCRC = '.$an_item['CombinationCRC'].')';
 				}
 
 					$this->Conn->Query($query);
 				}
 
 			$query = '	UPDATE '.$table_prefix.'OrderItems
 						SET QuantityReserved = IF(QuantityReserved IS NULL, 0, QuantityReserved - '.$to_free.')
 									WHERE OrderItemId = '.$an_item['OrderItemId'];
 				$this->Conn->Query($query);
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 * @param OrdersItem $object
 	 */
 	function SplitOrder($event, &$object)
 	{
 		$affiliate_event = new kEvent('affil:OnOrderApprove');
 		$affiliate_event->setEventParam('Order_PrefixSpecial', $object->getPrefixSpecial() );
 		$this->Application->HandleEvent($affiliate_event);
 
 		$table_prefix = $this->TablePrefix($event);
 		$order =& $object;
 		$ord_id = $order->GetId();
 
 		$shipping_option = $order->GetDBField('ShippingOption');
 		$backorder_select = $shipping_option == 0 ? '0' : 'oi.BackOrderFlag';
 
 
 		// setting PackageNum to 0 for Non-tangible items, for tangibles first package num is always 1
 		$query = '	SELECT oi.OrderItemId
 					FROM ' . $table_prefix . 'OrderItems oi
 					LEFT JOIN ' . TABLE_PREFIX . 'Products p ON p.ProductId = oi.ProductId
 					WHERE p.Type > 1 AND oi.OrderId = ' . $ord_id;
 		$non_tangibles = $this->Conn->GetCol($query);
 
 		if ($non_tangibles) {
 			$query = '	UPDATE ' . $table_prefix . 'OrderItems
 						SET PackageNum = 0
 						WHERE OrderItemId IN (' . implode(',', $non_tangibles) . ')';
 			$this->Conn->Query($query);
 		}
 
 		// grouping_data:
 		// 0 => Product Type
 		// 1 => if NOT tangibale and NOT downloadable - OrderItemId,
 		//			2 => ProductId
 		// 3 => Shipping PackageNum
 		$query = 'SELECT
 					'.$backorder_select.' AS BackOrderFlagCalc,
 					PackageNum,
 					ProductName,
 					ShippingTypeId,
 					CONCAT('.TABLE_PREFIX.'Products.Type,
 						"_",
 						IF ('.TABLE_PREFIX.'Products.Type NOT IN ('.PRODUCT_TYPE_DOWNLOADABLE.','.PRODUCT_TYPE_TANGIBLE.'),
 							CONCAT(OrderItemId, "_", '.TABLE_PREFIX.'Products.ProductId),
 							""),
 						"_",
 						PackageNum
 						) AS Grouping,
 					SUM(Quantity) AS TotalItems,
 					SUM('.$table_prefix.'OrderItems.Weight*Quantity) AS TotalWeight,
 					SUM(Price * Quantity) AS TotalAmount,
 					SUM(QuantityReserved) AS TotalReserved,
 					'.TABLE_PREFIX.'Products.Type AS ProductType
 				FROM '.$table_prefix.'OrderItems
 				LEFT JOIN '.TABLE_PREFIX.'Products
 					ON '.TABLE_PREFIX.'Products.ProductId = '.$table_prefix.'OrderItems.ProductId
 				WHERE OrderId = '.$ord_id.'
 				GROUP BY BackOrderFlagCalc, Grouping
 				ORDER BY BackOrderFlagCalc ASC, PackageNum ASC, ProductType ASC';
 
 		$sub_orders = $this->Conn->Query($query);
 
 		$processed_sub_orders = Array();
 
 		// in case of recurring billing this will not be 0 as usual
 		//$first_sub_number = ($event->Special == 'recurring') ? $object->getNextSubNumber() - 1 : 0;
 		$first_sub_number = $object->GetDBField('SubNumber');
 
 		$next_sub_number = $first_sub_number;
 		$group = 1;
 
 		$order_has_gift = $order->GetDBField('GiftCertificateDiscount') > 0 ? 1 : 0;
 
 		$skip_types = Array (PRODUCT_TYPE_TANGIBLE, PRODUCT_TYPE_DOWNLOADABLE);
 		foreach ($sub_orders as $sub_order_data) {
 			$sub_order = $this->Application->recallObject('ord.-sub'.$next_sub_number, 'ord');
 			/* @var $sub_order OrdersItem */
 
 			if ($this->UseTempTables($event) && $next_sub_number == 0) {
 				$sub_order =& $order;
 			}
 			$sub_order->SetDBFieldsFromHash($order->GetFieldValues());
 			$sub_order->SetDBField('SubNumber', $next_sub_number);
 			$sub_order->SetDBField('SubTotal', $sub_order_data['TotalAmount']);
 
 			$grouping_data = explode('_', $sub_order_data['Grouping']);
 			$named_grouping_data['Type'] = $grouping_data[0];
 
 			if (!in_array($named_grouping_data['Type'], $skip_types)) {
 				$named_grouping_data['OrderItemId'] = $grouping_data[1];
 				$named_grouping_data['ProductId'] = $grouping_data[2];
 				$named_grouping_data['PackageNum'] = $grouping_data[3];
 			}
 			else {
 				$named_grouping_data['PackageNum'] = $grouping_data[2];
 			}
 
 			if ($named_grouping_data['Type'] == PRODUCT_TYPE_TANGIBLE) {
 				$sub_order->SetDBField('ShippingCost', getArrayValue( unserialize($order->GetDBField('ShippingInfo')), $sub_order_data['PackageNum'], 'TotalCost') );
 				$sub_order->SetDBField('InsuranceFee', getArrayValue( unserialize($order->GetDBField('ShippingInfo')), $sub_order_data['PackageNum'], 'InsuranceFee') );
 				$sub_order->SetDBField('ShippingInfo', serialize(Array(1 => getArrayValue( unserialize($order->GetDBField('ShippingInfo')), $sub_order_data['PackageNum']))));
 			}
 			else {
 				$sub_order->SetDBField('ShippingCost', 0);
 				$sub_order->SetDBField('InsuranceFee', 0);
 				$sub_order->SetDBField('ShippingInfo', ''); //otherwise orders w/o shipping wills still have shipping info!
 			}
 
 			$amount_percent = $sub_order->getTotalAmount() * 100 / $order->getTotalAmount();
 			// proportional affiliate commission splitting
 			if ($order->GetDBField('AffiliateCommission') > 0) {
 				$sub_order->SetDBField('AffiliateCommission', $order->GetDBField('AffiliateCommission') * $amount_percent / 100 );
 			}
 
 			$amount_percent = ($sub_order->GetDBField('SubTotal') + $sub_order->GetDBField('ShippingCost')) * 100 / ($order->GetDBField('SubTotal') + $order->GetDBField('ShippingCost'));
 			if ($order->GetDBField('ProcessingFee') > 0) {
 				$sub_order->SetDBField('ProcessingFee', round($order->GetDBField('ProcessingFee') * $amount_percent / 100, 2));
 			}
 
 			$sub_order->RecalculateTax();
 
 			$original_amount = $sub_order->GetDBField('SubTotal') + $sub_order->GetDBField('ShippingCost') + $sub_order->GetDBField('VAT') + $sub_order->GetDBField('ProcessingFee') + $sub_order->GetDBField('InsuranceFee') - $sub_order->GetDBField('GiftCertificateDiscount');
 			$sub_order->SetDBField('OriginalAmount', $original_amount);
 
 			if ($named_grouping_data['Type'] == 1 && ($sub_order_data['BackOrderFlagCalc'] > 0
 					||
 					($sub_order_data['TotalItems'] != $sub_order_data['TotalReserved'])) ) {
 				$sub_order->SetDBField('Status', ORDER_STATUS_BACKORDERS);
 
 				if ($event->Special != 'recurring') { // just in case if admin uses tangible backordered products in recurring orders
 					$this->Application->EmailEventUser('BACKORDER.ADD', $sub_order->GetDBField('PortalUserId'), $this->OrderEmailParams($sub_order));
 		    		$this->Application->EmailEventAdmin('BACKORDER.ADD');
 				}
 			}
 			else {
 				switch ($named_grouping_data['Type']) {
 					case PRODUCT_TYPE_DOWNLOADABLE:
 						$sql = 'SELECT oi.*
 								FROM '.TABLE_PREFIX.'OrderItems oi
 								LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
 								WHERE (OrderId = %s) AND (p.Type = '.PRODUCT_TYPE_DOWNLOADABLE.')';
 						$downl_products = $this->Conn->Query( sprintf($sql, $ord_id) );
 						$product_ids = Array();
 						foreach ($downl_products as $downl_product) {
 							$this->raiseProductEvent('Approve', $downl_product['ProductId'], $downl_product, $next_sub_number);
 							$product_ids[] = $downl_product['ProductId'];
 						}
 						break;
 
 					case PRODUCT_TYPE_TANGIBLE:
 						$sql = 'SELECT '.$backorder_select.' AS BackOrderFlagCalc, oi.*
 								FROM '.TABLE_PREFIX.'OrderItems oi
 								LEFT JOIN '.TABLE_PREFIX.'Products p ON p.ProductId = oi.ProductId
 								WHERE (OrderId = %s) AND (BackOrderFlagCalc = 0) AND (p.Type = '.PRODUCT_TYPE_TANGIBLE.')';
 
 							$products = $this->Conn->Query( sprintf($sql, $ord_id) );
 							foreach ($products as $product) {
 								$this->raiseProductEvent('Approve', $product['ProductId'], $product, $next_sub_number);
 							}
 						break;
 
 					default:
 						$order_item_fields = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'OrderItems WHERE OrderItemId = '.$named_grouping_data['OrderItemId']);
 						$this->raiseProductEvent('Approve', $named_grouping_data['ProductId'], $order_item_fields, $next_sub_number);
 						break;
 				}
 
 				$sub_order->SetDBField('Status', $named_grouping_data['Type'] == PRODUCT_TYPE_TANGIBLE ? ORDER_STATUS_TOSHIP : ORDER_STATUS_PROCESSED);
 			}
 
 			if ($next_sub_number == $first_sub_number) {
 				$sub_order->SetId($order->GetId());
 				$sub_order->Update();
 			}
 			else {
 				$sub_order->Create();
 			}
 
 			switch ($named_grouping_data['Type']) {
 				case PRODUCT_TYPE_TANGIBLE:
 					$query = 'UPDATE '.$table_prefix.'OrderItems SET OrderId = %s WHERE OrderId = %s AND PackageNum = %s';
 					$query = sprintf($query, $sub_order->GetId(), $ord_id, $sub_order_data['PackageNum']);
 					break;
 
 				case PRODUCT_TYPE_DOWNLOADABLE:
 					$query = 'UPDATE '.$table_prefix.'OrderItems SET OrderId = %s WHERE OrderId = %s AND ProductId IN (%s)';
 					$query = sprintf($query, $sub_order->GetId(), $ord_id, implode(',', $product_ids) );
 					break;
 
 				default:
 					$query = 'UPDATE '.$table_prefix.'OrderItems SET OrderId = %s WHERE OrderId = %s AND OrderItemId = %s';
 					$query = sprintf($query, $sub_order->GetId(), $ord_id, $named_grouping_data['OrderItemId']);
 					break;
 			}
 
 			$this->Conn->Query($query);
 
 			if ($order_has_gift) {
 				// gift certificate can be applied only after items are assigned to suborder
 				$sub_order->RecalculateGift($event);
 				$original_amount = $sub_order->GetDBField('SubTotal') + $sub_order->GetDBField('ShippingCost') + $sub_order->GetDBField('VAT') + $sub_order->GetDBField('ProcessingFee') + $sub_order->GetDBField('InsuranceFee') - $sub_order->GetDBField('GiftCertificateDiscount');
 				$sub_order->SetDBField('OriginalAmount', $original_amount);
 				$sub_order->Update();
 			}
 
 			$processed_sub_orders[] = $sub_order->GetID();
 
 			$next_sub_number++;
 			$group++;
 		}
 
 		foreach ($processed_sub_orders as $sub_id) {
 			// update DiscountTotal field
 			$sql = 'SELECT SUM(ROUND(FlatPrice-Price,2)*Quantity) FROM '.$table_prefix.'OrderItems WHERE OrderId = '.$sub_id;
 			$discount_total = $this->Conn->GetOne($sql);
 
 			$sql = 'UPDATE '.$sub_order->TableName.'
 					SET DiscountTotal = '.$this->Conn->qstr($discount_total).'
 					WHERE OrderId = '.$sub_id;
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
 	 * Call products linked event when spefcfic action is made to product in order
 	 *
 	 * @param string $event_type type of event to get from product ProcessingData = {Approve,Deny,CompleteOrder}
 	 * @param int $product_id ID of product to gather processing data from
 	 * @param Array $order_item_fields OrderItems table record fields (with needed product & order in it)
 	 */
 	function raiseProductEvent($event_type, $product_id, $order_item_fields, $next_sub_number=null)
 	{
 		$sql = 'SELECT ProcessingData
 				FROM '.TABLE_PREFIX.'Products
 				WHERE ProductId = '.$product_id;
 		$processing_data = $this->Conn->GetOne($sql);
 		if ($processing_data) {
 			$processing_data = unserialize($processing_data);
 			$event_key = getArrayValue($processing_data, $event_type.'Event');
 			// if requested type of event is defined for product, only then process it
 			if ($event_key) {
 				$event = new kEvent($event_key);
 				$event->setEventParam('field_values', $order_item_fields);
 				$event->setEventParam('next_sub_number', $next_sub_number);
 				$this->Application->HandleEvent($event);
 			}
 		}
 	}
 
 	function OptionsSalt($options, $comb_only=false)
 	{
 		$helper = $this->Application->recallObject('kProductOptionsHelper');
 		return $helper->OptionsSalt($options, $comb_only);
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 * @param int $item_id
 	 */
 	function AddItemToOrder($event, $item_id, $qty = null, $package_num = null)
 	{
 		if (!isset($qty)) {
 			$qty = 1;
 		}
 
 		// Loading product to add
 		$product = $this->Application->recallObject('p.toadd', null, Array('skip_autoload' => true));
 		/* @var $product kDBItem */
 
 		$product->Load($item_id);
 
 		$object = $this->Application->recallObject('orditems.-item', null, Array('skip_autoload' => true));
 		/* @var $object kDBItem */
 
 		$order = $this->Application->recallObject('ord');
 		/* @var $order kDBItem */
 
 		if (!$order->isLoaded() && !$this->Application->isAdmin) {
 			// no order was created before -> create one now
 			if ($this->_createNewCart($event)) {
 				$this->LoadItem($event);
 			}
 		}
 
 		if (!$order->isLoaded()) {
 			// was unable to create new order
 			return false;
 		}
 
 		$item_data = $event->getEventParam('ItemData');
 		$item_data = $item_data ? unserialize($item_data) : Array ();
 		$options = getArrayValue($item_data, 'Options');
 
 		if ( !$this->CheckOptions($event, $options, $item_id, $qty, $product->GetDBField('OptionsSelectionMode')) ) {
 			return;
 		}
 
 		$manager = $this->Application->recallObject('OrderManager');
 		/* @var $manager OrderManager */
 
 		$manager->setOrder($order);
 		$manager->addProduct($product, $event->getEventParam('ItemData'), $qty, $package_num);
 
 		$this->Application->HandleEvent(new kEvent('ord:OnRecalculateItems'));
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function UpdateShippingTotal($event)
 	{
 		if ( $this->Application->GetVar('ebay_notification') == 1 ) {
 			// TODO: get rid of this "if"
 			return;
 		}
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$shipping_total = $insurance_fee = 0;
 		$shipping_info = $object->GetDBField('ShippingInfo') ? unserialize($object->GetDBField('ShippingInfo')) : false;
 
 		if ( is_array($shipping_info) ) {
 			foreach ($shipping_info as $a_shipping) {
 //				$id_elements = explode('_', $a_shipping['ShippingTypeId']);
 				$shipping_total += $a_shipping['TotalCost'];
 				$insurance_fee += $a_shipping['InsuranceFee'];
 			}
 		}
 
 		$object->SetDBField('ShippingCost', $shipping_total);
 		$object->SetDBField('InsuranceFee', $insurance_fee);
 		// no need to update, it will be called in calling method
 
 		$this->RecalculateTax($event);
 	}
 
 	/**
 	 * Recompile shopping cart, splitting or grouping orders and backorders depending on total quantities.
 	 * First it counts total qty for each ProductId, and then creates order for available items
 	 * and backorder for others. It also updates the sub-total for the order
 	 *
 	 * @param kEvent $event
 	 * @return bool Returns true if items splitting/grouping were changed
 	 */
 	function OnRecalculateItems($event)
 	{
 		if (is_object($event->MasterEvent) && ($event->MasterEvent->status != kEvent::erSUCCESS)) {
 			// e.g. master order update failed, don't recalculate order products
 			return ;
 		}
 
 		$order = $event->getObject();
 		/* @var $order OrdersItem */
 
 		if ( !$order->isLoaded() ) {
 			$this->LoadItem($event); // try to load
 		}
 
 		$ord_id = (int)$order->GetID();
 
 		if ( !$order->isLoaded() ) return; //order has not been created yet
 
 		if( $order->GetDBField('Status') != ORDER_STATUS_INCOMPLETE )
 		{
 			return;
 		}
 
 		$manager = $this->Application->recallObject('OrderManager');
 		/* @var $manager OrderManager */
 
 		$manager->setOrder($order);
 		$result = $manager->calculate();
 
 		if ( $order->GetDBField('CouponId') && $order->GetDBField('CouponDiscount') == 0 ) {
 			$this->RemoveCoupon($order);
 			$order->setCheckoutError(OrderCheckoutErrorType::COUPON, OrderCheckoutError::COUPON_REMOVED_AUTOMATICALLY);
 		}
 
 		if ( $result ) {
 			$this->UpdateShippingOption($event);
 		}
 
 		$this->UpdateShippingTotal($event);
 
 		$this->RecalculateProcessingFee($event);
 		$this->RecalculateTax($event);
 		$this->RecalculateGift($event);
 
 		if ( $event->Name != 'OnAfterItemUpdate' ) {
 			$order->Update();
 		}
 
 		$event->setEventParam('RecalculateChangedCart', $result);
 
 		if ( is_object($event->MasterEvent) ) {
 			$event->MasterEvent->setEventParam('RecalculateChangedCart', $result);
 		}
 
 		/*if ( $result && !getArrayValue($event->redirect_params, 'checkout_error') ) {
 			$event->SetRedirectParam('checkout_error', OrderCheckoutError::STATE_CHANGED);
 		}*/
 
 		if ( $result && is_object($event->MasterEvent) && $event->MasterEvent->Name == 'OnUserLogin' ) {
 			$shop_cart_template = $this->Application->GetVar('shop_cart_template');
 
 			if ( $shop_cart_template && is_object($event->MasterEvent->MasterEvent) ) {
 //				$event->MasterEvent->MasterEvent->SetRedirectParam('checkout_error', OrderCheckoutError::CHANGED_AFTER_LOGIN);
 				$event->MasterEvent->MasterEvent->redirect = $shop_cart_template;
 			}
 		}
 
 		return $result;
 	}
 
 /*	function GetShippingCost($user_country_id, $user_state_id, $user_zip, $weight, $items, $amount, $shipping_type)
 	{
 		$this->Application->recallObject('ShippingQuoteEngine');
 		$shipping_h = $this->Application->recallObject('CustomShippingQuoteEngine');
 		$query = $shipping_h->QueryShippingCost($user_country_id, $user_state_id, $user_zip, $weight, $items, $amount, $shipping_type);
 		$cost = $this->Conn->GetRow($query);
 		return $cost['TotalCost'];
 	}*/
 
 	/**
 	 * Return product pricing id for given product, if not passed - return primary pricing ID
 	 *
 	 * @param int $product_id ProductId
 	 * @return float
 	 */
 	function GetPricingId($product_id, $item_data)	{
 
 		if (!is_array($item_data)) {
 			$item_data = unserialize($item_data);
 		}
 		$price_id = getArrayValue($item_data, 'PricingId');
 		if (!$price_id) {
 		$price_id = $this->Application->GetVar('pr_id');
 		}
 		if (!$price_id){
 			$price_id = $this->Conn->GetOne('SELECT PriceId FROM '.TABLE_PREFIX.'ProductsPricing WHERE ProductId='.$product_id.' AND IsPrimary=1');
 		}
 		return $price_id;
 	}
 
 	function UpdateShippingOption($event)
 	{
 		$object = $event->getObject();
 		$shipping_option = $object->GetDBField('ShippingOption');
 
 		if($shipping_option == '') return;
 
 		$table_prefix = $this->TablePrefix($event);
 
 		if ($shipping_option == 1 || $shipping_option == 0) { // backorder separately
 			$query = 'UPDATE '.$table_prefix.'OrderItems SET BackOrderFlag = 1 WHERE OrderId = '.$object->GetId().' AND BackOrderFlag > 1';
 			$this->Conn->Query($query);
 		}
 		if ($shipping_option == 2) {
 			$query = 'SELECT * FROM '.$table_prefix.'OrderItems WHERE OrderId = '.$object->GetId().' AND BackOrderFlag >= 1 ORDER By ProductName asc';
 			$items = $this->Conn->Query($query);
 			$backorder_flag = 2;
 			foreach ($items as $an_item) {
 				$query = 'UPDATE '.$table_prefix.'OrderItems SET BackOrderFlag = '.$backorder_flag.' WHERE OrderItemId = '.$an_item['OrderItemId'];
 				$this->Conn->Query($query);
 				$backorder_flag++;
 			}
 		}
 	}
 
 	/**
 	 * Updates shipping types
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 */
 	function UpdateShippingTypes($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$ord_id = $object->GetID();
 
 		$order_info = $this->Application->GetVar('ord');
 		$shipping_ids = getArrayValue($order_info, $ord_id, 'ShippingTypeId');
 
 		if (!$shipping_ids) {
 			return;
 		}
 
 		$ret = true;
 		$shipping_types = Array();
 		$last_shippings = unserialize( $this->Application->RecallVar('LastShippings') );
 
 		$template = $this->Application->GetVar('t');
 		$shipping_templates = Array ('in-commerce/checkout/shipping', 'in-commerce/orders/orders_edit_shipping');
 
 		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
 		/* @var $quote_engine_collector ShippingQuoteCollector */
 
 		foreach ($shipping_ids as $package => $id) {
 			// try to validate
 			$shipping_types[$package] = $last_shippings[$package][$id];
 			$sqe_class_name = $quote_engine_collector->GetClassByType($shipping_types, $package);
 
 			if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false) && in_array($template, $shipping_templates)) {
 				$shipping_quote_engine = $this->Application->recallObject($sqe_class_name);
 				/* @var $shipping_quote_engine ShippingQuoteEngine */
 
 				// USPS related part
 				// TODO: remove USPS condition from here
 				// set first of found shippings just to check if any errors are returned
 				$current_usps_shipping_types = unserialize($this->Application->RecallVar('current_usps_shipping_types'));
 				$object->SetDBField('ShippingInfo', serialize( Array($package => $current_usps_shipping_types[$id])) );
 
 				$sqe_data = $shipping_quote_engine->MakeOrder($object, true);
 
 				if ( $sqe_data ) {
 					if ( !isset($sqe_data['error_number']) ) {
 						// update only international shipping
 						if ( $object->GetDBField('ShippingCountry') != 'USA') {
 							$shipping_types[$package]['TotalCost'] = $sqe_data['Postage'];
 						}
 					}
 					else {
 						$ret = false;
 						$this->Application->StoreVar('sqe_error', $sqe_data['error_description']);
 					}
 				}
 
 				$object->SetDBField('ShippingInfo', '');
 			}
 		}
 
 		$object->SetDBField('ShippingInfo', serialize($shipping_types));
 
 		return $ret;
 	}
 
 	/*function shipOrder(&$order_items)
 	{
 		$product_object = $this->Application->recallObject('p', null, Array('skip_autoload' => true));
 		$order_item = $this->Application->recallObject('orditems.-item');
 
 		while( !$order_items->EOL() )
 		{
 			$rec = $order_items->getCurrentRecord();
 
 			$order_item->SetDBFieldsFromHash($rec);
 			$order_item->SetId($rec['OrderItemId']);
 			$order_item->SetDBField('QuantityReserved', 0);
 			$order_item->Update();
 
 			$order_items->GoNext();
 		}
 		return true;
 	}*/
 
 	function RecalculateTax($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) {
 			return;
 		}
 
 		$object->RecalculateTax();
 	}
 
 	function RecalculateProcessingFee($event)
 	{
 		$object = $event->getObject();
 
 		// Do not reset processing fee while orders are being split (see SplitOrder)
 		if (preg_match("/^-sub/", $object->Special)) return;
 		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) return; //no changes for orders other than incomple or pending
 
 		$pt = $object->GetDBField('PaymentType');
 		$processing_fee = $this->Conn->GetOne('SELECT ProcessingFee FROM '.$this->Application->getUnitOption('pt', 'TableName').' WHERE PaymentTypeId = '.$pt);
 		$object->SetDBField( 'ProcessingFee', $processing_fee );
 		$this->UpdateTotals($event);
 	}
 
 	function UpdateTotals($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$object->UpdateTotals();
 	}
 
 	/*function CalculateDiscount($event)
 	{
 		$object = $event->getObject();
 
 		$coupon = $this->Application->recallObject('coup', null, Array('skip_autoload' => true));
 		if(!$coupon->Load( $object->GetDBField('CouponId'), 'CouponId' ))
 		{
 			return false;
 		}
 
 		$sql = 'SELECT Price * Quantity AS Amount, ProductId FROM '.$this->Application->getUnitOption('orditems', 'TableName').'
 				WHERE OrderId = '.$object->GetDBField('OrderId');
 		$orditems = $this->Conn->GetCol($sql, 'ProductId');
 
 		$sql = 'SELECT coupi.ItemType, p.ProductId FROM '.$this->Application->getUnitOption('coupi', 'TableName').' coupi
 				LEFT JOIN '.$this->Application->getUnitOption('p', 'TableName').' p
 				ON coupi.ItemResourceId = p.ResourceId
 				WHERE CouponId = '.$object->GetDBField('CouponId');
 		$discounts = $this->Conn->GetCol($sql, 'ProductId');
 
 		$discount_amount = 0;
 
 		foreach($orditems as $product_id => $amount)
 		{
 			if(isset($discounts[$product_id]) || array_search('0', $discounts, true) !== false)
 			{
 				switch($coupon->GetDBField('Type'))
 				{
 					case 1:
 						$discount_amount += $coupon->GetDBField('Amount') < $amount ? $coupon->GetDBField('Amount') : $amount;
 					break;
 					case 2:
 						$discount_amount += $amount * $coupon->GetDBField('Amount') / 100;
 					break;
 					default:
 				}
 				break;
 			}
 		}
 
 		$object->SetDBField('CouponDiscount', $discount_amount);
 		return $discount_amount;
 	}*/
 
 	/**
 	 * Jumps to selected order in order's list from search tab
 	 *
 	 * @param kEvent $event
 	 */
 	function OnGoToOrder($event)
 	{
-		$id = array_shift( $this->StoreSelectedIDs($event) );
+		$id = current($this->StoreSelectedIDs($event));
 
 		$id_field = $this->Application->getUnitOption($event->Prefix,'IDField');
 		$table = $this->Application->getUnitOption($event->Prefix,'TableName');
 
 		$sql = 'SELECT Status FROM %s WHERE %s = %s';
 
 		$order_status = $this->Conn->GetOne( sprintf($sql, $table, $id_field, $id) );
 
 		$prefix_special = $event->Prefix.'.'.$this->getSpecialByType($order_status);
 
 		$orders_list = $this->Application->recallObject($prefix_special, $event->Prefix.'_List', Array('per_page'=>-1) );
 		/* @var $orders_list kDBList */
 
 		$orders_list->Query();
 
 		foreach ($orders_list->Records as $row_num => $record) {
 			if ( $record[$id_field] == $id ) {
 				break;
 			}
 		}
 
 		$per_page = $this->getPerPage( new kEvent($prefix_special.':OnDummy') );
 		$page = ceil( ($row_num+1) / $per_page );
 
 		$this->Application->StoreVar($prefix_special.'_Page', $page);
 		$event->redirect = 'in-commerce/orders/orders_'.$this->getSpecialByType($order_status).'_list';
 	}
 
 	/**
 	 * Reset's any selected order state to pending
 	 *
 	 * @param kEvent $event
 	 */
 	function OnResetToPending($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
 
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 		if ( $items_info ) {
 			foreach ($items_info as $id => $field_values) {
 				$object->Load($id);
 				$object->SetDBField('Status', ORDER_STATUS_PENDING);
 
 				if ( $object->Update() ) {
 					$event->status = kEvent::erSUCCESS;
 				}
 				else {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					break;
 				}
 			}
 		}
 	}
 
 	/**
 	 * Creates list from items selected in grid
 	 *
 	 * @param kEvent $event
 	 */
 	function OnLoadSelected($event)
 	{
 		$event->setPseudoClass('_List');
 		$object = $event->getObject( Array('selected_only' => true) );
 		$event->redirect = false;
 	}
 
 	/**
 	 * Return orders list, that will expire in time specified
 	 *
 	 * @param int $pre_expiration timestamp
 	 * @return Array
 	 */
 	function getRecurringOrders($pre_expiration)
 	{
 		$ord_table = $this->Application->getUnitOption('ord', 'TableName');
 		$ord_idfield = $this->Application->getUnitOption('ord', 'IDField');
 
 		$processing_allowed = Array(ORDER_STATUS_PROCESSED, ORDER_STATUS_ARCHIVED);
 		$sql = 'SELECT '.$ord_idfield.', PortalUserId, GroupId, NextCharge
 				FROM '.$ord_table.'
 				WHERE (IsRecurringBilling = 1) AND (NextCharge < '.$pre_expiration.') AND Status IN ('.implode(',', $processing_allowed).')';
 		return $this->Conn->Query($sql, $ord_idfield);
 	}
 
 	/**
 	 * [SCHEDULED TASK] Checks what orders should expire and renew automatically (if such flag set)
 	 *
 	 * @param kEvent $event
 	 */
 	function OnCheckRecurringOrders($event)
 	{
 		$skip_clause = Array();
 		$ord_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 		$ord_idfield = $this->Application->getUnitOption($event->Prefix, 'IDField');
 
 		$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('Comm_RecurringChargeInverval') * 3600 * 24;
 		$to_charge = $this->getRecurringOrders($pre_expiration);
 		if ($to_charge) {
 			$order_ids = Array();
 			foreach ($to_charge as $order_id => $record) {
 				// skip virtual users (e.g. root, guest, etc.) & invalid subscriptions (with no group specified, no next charge, but Recurring flag set)
 				if (!$record['PortalUserId'] || !$record['GroupId'] || !$record['NextCharge']) continue;
 
 				$order_ids[] = $order_id;
 				// prevent duplicate user+group pairs
 				$skip_clause[ 'PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'] ] = $order_id;
 			}
 
 			// process only valid orders
 			$temp_handler = $this->Application->recallObject($event->Prefix.'_TempHandler', 'kTempTablesHandler');
 			$cloned_order_ids = $temp_handler->CloneItems($event->Prefix, 'recurring', $order_ids);
 			$order =&  $this->Application->recallObject($event->Prefix.'.recurring', null, Array('skip_autoload' => true));
 			foreach ($cloned_order_ids as $order_id) {
 				$order->Load($order_id);
 				$this->Application->HandleEvent($complete_event, $event->Prefix.'.recurring:OnCompleteOrder' );
 
 				if ($complete_event->status == kEvent::erSUCCESS) {
 					//send recurring ok email
 					$this->Application->EmailEventUser('ORDER.RECURRING.PROCESSED', $order->GetDBField('PortalUserId'), $this->OrderEmailParams($order));
 					$this->Application->EmailEventAdmin('ORDER.RECURRING.PROCESSED');
 				}
 				else {
 					//send Recurring failed event
 					$order->SetDBField('Status', ORDER_STATUS_DENIED);
 					$order->Update();
 					$this->Application->EmailEventUser('ORDER.RECURRING.DENIED', $order->GetDBField('PortalUserId'), $this->OrderEmailParams($order));
 					$this->Application->EmailEventAdmin('ORDER.RECURRING.DENIED');
 				}
 			}
 
 			// remove recurring flag from all orders found, not to select them next time script runs
 			$sql = 'UPDATE '.$ord_table.'
 					SET IsRecurringBilling = 0
 					WHERE '.$ord_idfield.' IN ('.implode(',', array_keys($to_charge)).')';
 			$this->Conn->Query($sql);
 		}
 
 		if ( !is_object($event->MasterEvent) ) {
 			// not called as hook
 			return ;
 		}
 
 		$pre_expiration = adodb_mktime() + $this->Application->ConfigValue('User_MembershipExpirationReminder') * 3600 * 24;
 		$to_charge = $this->getRecurringOrders($pre_expiration);
 
 		foreach ($to_charge as $order_id => $record) {
 			// skip virtual users (e.g. root, guest, etc.) & invalid subscriptions (with no group specified, no next charge, but Recurring flag set)
 			if (!$record['PortalUserId'] || !$record['GroupId'] || !$record['NextCharge']) continue;
 
 			// prevent duplicate user+group pairs
 			$skip_clause[ 'PortalUserId = '.$record['PortalUserId'].' AND GroupId = '.$record['GroupId'] ] = $order_id;
 		}
 		$skip_clause = array_flip($skip_clause);
 
 		$event->MasterEvent->setEventParam('skip_clause', $skip_clause);
 	}
 
 
 	function OnGeneratePDF($event)
 	{
 		$this->OnLoadSelected($event);
 
 		$this->Application->InitParser();
 		$o = $this->Application->ParseBlock(array('name'=>'in-commerce/orders/orders_pdf'));
 
 		$file_helper = $this->Application->recallObject('FileHelper');
 		/* @var $file_helper FileHelper */
 
 		$file_helper->CheckFolder(EXPORT_PATH);
 
 		$htmlFile = EXPORT_PATH . '/tmp.html';
 		$fh = fopen($htmlFile, 'w');
 		fwrite($fh, $o);
 		fclose($fh);
 //		return;
 
 
 //		require_once (FULL_PATH.'html2pdf/PDFEncryptor.php');
 
 		// Full path to the file to be converted
 //		$htmlFile = dirname(__FILE__) . '/test.html';
 
 		// The default domain for images that use a relative path
 		// (you'll need to change the paths in the test.html page
 		// to an image on your server)
 		$defaultDomain = DOMAIN;
 		// Full path to the PDF we are creating
 		$pdfFile = EXPORT_PATH . '/tmp.pdf';
 		// Remove old one, just to make sure we are making it afresh
 		@unlink($pdfFile);
 
 
 		$pdf_helper = $this->Application->recallObject('kPDFHelper');
 		$pdf_helper->FileToFile($htmlFile, $pdfFile);
 		return ;
 
 		// DOM PDF VERSION
 		/*require_once(FULL_PATH.'/dompdf/dompdf_config.inc.php');
 		$dompdf = new DOMPDF();
 		$dompdf->load_html_file($htmlFile);
 		if ( isset($base_path) ) {
 		  $dompdf->set_base_path($base_path);
 		}
 		$dompdf->set_paper($paper, $orientation);
 		$dompdf->render();
 		file_put_contents($pdfFile, $dompdf->output());
 		return ;*/
 
 		// Instnatiate the class with our variables
 		require_once (FULL_PATH.'/html2pdf/HTML_ToPDF.php');
 		$pdf = new HTML_ToPDF($htmlFile, $defaultDomain, $pdfFile);
 		$pdf->setHtml2Ps('/usr/bin/html2ps');
 		$pdf->setPs2Pdf('/usr/bin/ps2pdf');
 		$pdf->setGetUrl('/usr/local/bin/curl -i');
 		// Set headers/footers
 		$pdf->setHeader('color', 'black');
 		$pdf->setFooter('left', '');
 		$pdf->setFooter('right', '$D');
 
 		$pdf->setDefaultPath(BASE_PATH.'/kernel/admin_templates/');
 
 		$result = $pdf->convert();
 
 		// Check if the result was an error
 		if (PEAR::isError($result)) {
 		    $this->Application->ApplicationDie($result->getMessage());
 		}
 		else {
 			$download_url = rtrim($this->Application->BaseURL(), '/') . EXPORT_BASE_PATH . '/tmp.pdf';
 		    echo "PDF file created successfully: $result";
 		    echo '<br />Click <a href="' . $download_url . '">here</a> to view the PDF file.';
 		}
 	}
 
 	/**
 	 * Occurs, when config was parsed, allows to change config data dynamically
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		if (defined('IS_INSTALL') && IS_INSTALL) {
 			return ;
 		}
 
 		$order_number = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_P');
 		$order_sub_number = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_S');
 
 		$calc_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
 		foreach ($calc_fields as $special => $fields) {
 			$calc_fields[$special]['OrderNumber'] = str_replace('6', $order_number, $calc_fields[$special]['OrderNumber']);
 			$calc_fields[$special]['OrderNumber'] = str_replace('3', $order_sub_number, $calc_fields[$special]['OrderNumber']);
 		}
 		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calc_fields);
 
 		$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
 		$fields['Number']['format'] = str_replace('%06d', '%0'.$order_number.'d', $fields['Number']['format']);
 		$fields['SubNumber']['format'] = str_replace('%03d', '%0'.$order_sub_number.'d', $fields['SubNumber']['format']);
 
 		$site_helper = $this->Application->recallObject('SiteHelper');
 		/* @var $site_helper SiteHelper */
 
 		$fields['BillingCountry']['default'] = $site_helper->getDefaultCountry('Billing');
 		$fields['ShippingCountry']['default'] = $site_helper->getDefaultCountry('Shipping');
 
 		if (!$this->Application->isAdminUser) {
 			$user_groups = explode(',', $this->Application->RecallVar('UserGroups'));
 			$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
 			if (!in_array($default_group, $user_groups)){
 				$user_groups[] = $default_group;
 			}
 
 			$sql_part = '';
 
 			// limit payment types by domain
 			$payment_types = $this->Application->siteDomainField('PaymentTypes');
 
 			if (strlen($payment_types)) {
 				$payment_types = explode('|', substr($payment_types, 1, -1));
 				$sql_part .= ' AND PaymentTypeId IN (' . implode(',', $payment_types) . ')';
 			}
 
 			// limit payment types by user group
 			$sql_part .= ' AND (PortalGroups LIKE "%%,'.implode(',%%" OR PortalGroups LIKE "%%,', $user_groups).',%%")';
 
 			$fields['PaymentType']['options_sql'] = str_replace(
 				'ORDER BY ',
 				$sql_part . ' ORDER BY ',
 				$fields['PaymentType']['options_sql']
 			);
 		}
 
 		$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 	}
 
 	/**
 	 * Allows configuring export options
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeExportBegin(kEvent $event)
 	{
 		parent::OnBeforeExportBegin($event);
 
 		$options = $event->getEventParam('options');
 
 		$items_list = $this->Application->recallObject($event->Prefix . '.' . $this->Application->RecallVar('export_oroginal_special'), $event->Prefix . '_List');
 		/* @var $items_list kDBList */
 
 		$items_list->SetPerPage(-1);
 
 		if ( $options['export_ids'] != '' ) {
 			$items_list->AddFilter('export_ids', $items_list->TableName . '.' . $items_list->IDField . ' IN (' . implode(',', $options['export_ids']) . ')');
 		}
 
 		$options['ForceCountSQL'] = $items_list->getCountSQL($items_list->GetSelectSQL(true, false));
 		$options['ForceSelectSQL'] = $items_list->GetSelectSQL();
 
 		$event->setEventParam('options', $options);
 
 		$object = $this->Application->recallObject($event->Prefix . '.export');
 		/* @var $object kDBItem */
 
 		$object->SetField('Number', 999999);
 		$object->SetField('SubNumber', 999);
 	}
 
 	/**
 	 * Returns specific to each item type columns only
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 * @access protected
 	 */
 	public function getCustomExportColumns(kEvent $event)
 	{
 		$columns = parent::getCustomExportColumns($event);
 
 		$new_columns = Array (
 			'__VIRTUAL__CustomerName' => 'CustomerName',
 			'__VIRTUAL__TotalAmount' => 'TotalAmount',
 			'__VIRTUAL__AmountWithoutVAT' =>	'AmountWithoutVAT',
 			'__VIRTUAL__SubtotalWithDiscount' =>	'SubtotalWithDiscount',
 			'__VIRTUAL__SubtotalWithoutDiscount' =>	'SubtotalWithoutDiscount',
 			'__VIRTUAL__OrderNumber' => 'OrderNumber',
 		);
 
 		return array_merge($columns, $new_columns);
 	}
 
 	/**
 	 * Saves content of temp table into live and
 	 * redirects to event' default redirect (normally grid template)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
 		if ( $event->status != kEvent::erSUCCESS ) {
 			return ;
 		}
 
 		$copied_ids = unserialize($this->Application->RecallVar($event->Prefix . '_copied_ids' . $this->Application->GetVar('wid'), serialize(Array ())));
 
 		foreach ($copied_ids as $id) {
 			$an_event = new kEvent($this->Prefix . ':Dummy');
 			$this->Application->SetVar($this->Prefix . '_id', $id);
 			$this->Application->SetVar($this->Prefix . '_mode', ''); // this is to fool ReserveItems to use live table
 			$this->ReserveItems($an_event);
 		}
 	}
 
 	/**
 	 * Occurs before an item is copied to live table (after all foreign keys have been updated)
 	 * Id of item being copied is passed as event' 'id' param
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeCopyToLive(kEvent $event)
 	{
 		parent::OnBeforeCopyToLive($event);
 
 		$id = $event->getEventParam('id');
 		$copied_ids = unserialize($this->Application->RecallVar($event->Prefix . '_copied_ids' . $this->Application->GetVar('wid'), serialize(array ())));
 		array_push($copied_ids, $id);
 
 		$this->Application->StoreVar($event->Prefix . '_copied_ids' . $this->Application->GetVar('wid'), serialize($copied_ids));
 	}
 
 	/**
 	 * Checks, that currently loaded item is allowed for viewing (non permission-based)
 	 *
 	 * @param kEvent $event
 	 * @return bool
 	 * @access protected
 	 */
 	protected function checkItemStatus(kEvent $event)
 	{
 		if ( $this->Application->isAdminUser ) {
 			return true;
 		}
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		if ( !$object->isLoaded() ) {
 			return true;
 		}
 
 		return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');
 	}
 
 	// ===== Gift Certificates Related =====
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnApplyGiftCertificate($event)
 	{
 		$code = $this->Application->GetVar('giftcert_code');
 
 		if ( $code == '' ) {
 			return;
 		}
 
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$gift_certificate = $this->Application->recallObject('gc', null, Array ('skip_autoload' => true));
 		/* @var $gift_certificate kDBItem */
 
 		$gift_certificate->Load($code, 'Code');
 
 		if ( !$gift_certificate->isLoaded() ) {
 			$event->status = kEvent::erFAIL;
 			$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_CODE_INVALID);
 			$event->redirect = false; // check!!!
 
 			return;
 		}
 
 		$debit = $gift_certificate->GetDBField('Debit');
 		$expire_date = $gift_certificate->GetDBField('Expiration');
 
 		if ( $gift_certificate->GetDBField('Status') != 1 || ($expire_date && $expire_date < adodb_mktime()) || ($debit <= 0) ) {
 			$event->status = kEvent::erFAIL;
 			$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_CODE_EXPIRED);
 			$event->redirect = false;
 
 			return;
 		}
 
 		$object->SetDBField('GiftCertificateId', $gift_certificate->GetDBField('GiftCertificateId'));
 		$object->Update();
 
 		$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_APPLIED);
 	}
 
 	/**
 	 * Removes gift certificate from order
 	 *
 	 * @param kEvent $event
 	 * @deprecated
 	 */
 	function OnRemoveGiftCertificate($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		$this->RemoveGiftCertificate($object);
 		$object->setCheckoutError(OrderCheckoutErrorType::GIFT_CERTIFICATE, OrderCheckoutError::GC_REMOVED);
 
 		$event->CallSubEvent('OnRecalculateItems');
 	}
 
 	function RemoveGiftCertificate(&$object)
 	{
 		$object->RemoveGiftCertificate();
 	}
 
 	function RecalculateGift($event)
 	{
 		$object = $event->getObject();
 		/* @var $object OrdersItem */
 
 		if ($object->GetDBField('Status') > ORDER_STATUS_PENDING) {
 			return ;
 		}
 		$object->RecalculateGift($event);
 	}
 
 	function GetWholeOrderGiftCertificateDiscount($gift_certificate_id)
 	{
 		if (!$gift_certificate_id) {
 			return 0;
 		}
 
 		$sql = 'SELECT Debit
 				FROM '.TABLE_PREFIX.'GiftCertificates
 				WHERE GiftCertificateId = '.$gift_certificate_id;
 		return $this->Conn->GetOne($sql);
 	}
 
 	/**
 	 * Downloads shipping tracking bar code, that was already generated by USPS service
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDownloadLabel($event)
 	{
 		$event->status = kEvent::erSTOP;
 		ini_set('memory_limit', '300M');
 		ini_set('max_execution_time', '0');
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$file = $object->GetDBField('ShippingTracking') . '.pdf';
 		$full_path = USPS_LABEL_FOLDER . $file;
 
 		if ( !file_exists($full_path) || !is_file($full_path) ) {
 			return;
 		}
 
 		$this->Application->setContentType(kUtil::mimeContentType($full_path), false);
 		header('Content-Disposition: attachment; filename="' . $file . '"');
 		readfile($full_path);
 	}
 
 	/**
 	 * Occurs before validation attempt
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemValidate(kEvent $event)
 	{
 		parent::OnBeforeItemValidate($event);
 
 		$create_account = $this->Application->GetVar('create_account');
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$required_fields = Array ('UserPassword', 'UserPassword_plain', 'VerifyUserPassword', 'VerifyUserPassword_plain');
 		$object->setRequired($required_fields, $create_account);
 
 		$billing_email = $object->GetDBField('BillingEmail');
 
 		if ( $create_account && $object->GetDBField('PortalUserId') == USER_GUEST && $billing_email ) {
 			// check that e-mail available
 			$sql = 'SELECT PortalUserId
 					FROM ' . TABLE_PREFIX . 'Users
 					WHERE Email = ' . $this->Conn->qstr($billing_email);
 			$user_id = $this->Conn->GetOne($sql);
 
 			if ( $user_id ) {
 				$object->SetError('BillingEmail', 'unique');
 			}
 		}
 	}
 
 	/**
 	 * Performs order update and returns results in format, needed by FormManager
 	 *
 	 * @param kEvent $event
 	 */
 	function OnUpdateAjax($event)
 	{
 		$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
 		/* @var $ajax_form_helper AjaxFormHelper */
 
 		$ajax_form_helper->transitEvent($event, 'OnUpdate');
 	}
 }
\ No newline at end of file
Index: branches/5.2.x/units/products/products_tag_processor.php
===================================================================
--- branches/5.2.x/units/products/products_tag_processor.php	(revision 15539)
+++ branches/5.2.x/units/products/products_tag_processor.php	(revision 15540)
@@ -1,856 +1,861 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ProductsTagProcessor extends kCatDBTagProcessor {
 
 	function Rating($params)
 	{
 		$object = $this->getObject($params);
 		$rating = round($object->GetDBField('CachedRating') );
 
 		$o = '';
 		for ($i = 0; $i < $rating; $i++) {
 			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'star_on_render_as,block_star_on')) );
 		}
 
 		for ($i = 0; $i < 5 - $rating; $i++) {
 			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'star_off_render_as,block_star_off')) );
 		}
 
 		return $o;
 	}
 
 	function NewMark($params)
 	{
 		$object = $this->getObject($params);
 		$o = '';
 		if($object->GetDBField('IsNew'))
 		{
 			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
 		}
 		return $o;
 	}
 
 	function HotMark($params)
 	{
 		$object = $this->getObject($params);
 		$o = '';
 		if($object->GetDBField('IsHot'))
 		{
 			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
 		}
 		return $o;
 	}
 
 	function TopSellerMark($params)
 	{
 		return $this->HotMark($params);
 	}
 
 	function PopMark($params)
 	{
 		$object = $this->getObject($params);
 		$o = '';
 		if($object->GetDBField('IsPop'))
 		{
 			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
 		}
 		return $o;
 	}
 
 	function EdPickMark($params)
 	{
 		$object = $this->getObject($params);
 		$o = '';
 		if($object->GetDBField('EditorsPick'))
 		{
 			$o .= $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
 		}
 		return $o;
 	}
 
 	/**
 	 * Parses block only if item is favorite
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @deprecated used only in default,onlinestore
 	 */
 	function FavoriteMark($params)
 	{
 		if ($this->IsFavorite($params)) {
 			return $this->Application->ParseBlock( Array( 'name' => $this->SelectParam($params, 'render_as,block') ) );
 		}
 
 		return '';
 	}
 
 	function CurrentCategory($params)
 	{
 		$sql = "SELECT Name
 				FROM " . TABLE_PREFIX . "Categories
 				WHERE CategoryId=" . $this->Application->GetVar("m_cat_id");
 
 		return $this->Conn->GetOne($sql);
 	}
 
 	function RateForm($params)
 	{
 		$params['name'] = $this->SelectParam($params, 'render_as,block');
 		$labels = explode(',', $params['labels']);
 		$o = '';
 		$star_block = $this->SelectParam($params, 'star_render_as,star_block');
 		for($i = 5; $i >= 0; $i--)
 		{
 			$params['rating'] = $i;
 			$params['label'] = $this->Application->Phrase($labels[5 - $i]);
 			$params['stars'] = '';
 			for($j = $i; $j > 0; $j--)
 			{
 				$params['stars'] .= $this->Application->ParseBlock(Array('name' => $star_block));
 			}
 			$o .= $this->Application->ParseBlock($params);
 		}
 		return $o;
 	}
 
 	/**
 	 * Parses block for changing favorite status
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @deprecated used only in default,onlinestore
 	 */
 	function FavoriteToggle($params)
 	{
 		$block_params = Array ();
 		$block_names = $this->IsFavorite($params) ? 'remove_favorite_render_as,block_remove_favorite' : 'add_favorite_render_as,block_add_favorite';
 		$block_params['name'] = $this->SelectParam($params, $block_names);
 		$params['template'] = $params[$this->IsFavorite($params) ? 'template_on_remove' : 'template_on_add'];
 
 		$remove_params = Array (
 			'remove_favorite_render_as', 'block_remove_favorite', 'add_to_wish_list_render_as', 'block_add_to_wish_list',
 			'add_favorite_render_as', 'block_add_favorite', 'remove_from_wish_list_render_as', 'block_remove_from_wish_list',
 			'template_on_remove', 'template_on_add'
 		);
 
 		foreach ($params as $param_name => $param_value) {
 			if (in_array($param_name, $remove_params)) {
 				unset($params[$param_name]);
 			}
 		}
 
 		$block_params['wish_list_toggle_link'] = $this->FavoriteToggleLink($params);
 		return $this->Application->ParseBlock($block_params);
 	}
 
 	function WishListToggleLink($params)
 	{
 		$params['block_add_favorite'] = $this->SelectParam($params, 'add_to_wish_list_render_as,block_add_to_wish_list');
 		$params['block_remove_favorite'] = $this->SelectParam($params, 'remove_from_wish_list_render_as,block_remove_from_wish_list');
 
 		return $this->FavoriteToggle($params);
 	}
 
 	function AddReviewLink($params)
 	{
 		$o = $this->Application->ParseBlock( Array('name' => $this->SelectParam($params, 'render_as,block')) );
 		return $o;
 	}
 
 	function ListProducts($params)
 	{
 		return $this->PrintList2($params);
 	}
 
 	function ListRelatedProducts($params)
 	{
-//		$related = &$this->Application->recallObject('rel');
+//		$related = $this->Application->recallObject('rel');
+
 		return $this->PrintList2($params);
 	}
 
 	function BuildListSpecial($params)
 	{
 		if ($this->Special != '') return $this->Special;
 		if ( isset($params['parent_cat_id']) ) {
 			$parent_cat_id = $params['parent_cat_id'];
 		}
 		else {
 			$parent_cat_id = $this->Application->GetVar('c_id');
 			if (!$parent_cat_id) {
 				$parent_cat_id = $this->Application->GetVar('m_cat_id');
 			}
 		}
 
 		if ( isset($params['manufacturer']) ) {
 			$manufacturer = $params['manufacturer'];
 		}
 		else {
 			$manufacturer = $this->Application->GetVar('manuf_id');
 		}
 
 		$recursive = isset($params['recursive']);
 
 		$list_unique_key = $this->getUniqueListKey($params).$recursive;
 		if ($list_unique_key == '') {
 			return parent::BuildListSpecial($params);
 		}
 
 		return crc32($parent_cat_id.$list_unique_key.$manufacturer);
 	}
 
 	function ProductList($params)
 	{
 		if($params['shortlist'])
 		{
 			$params['per_page'] = $this->Application->ConfigValue('Comm_Perpage_Products_Short');
 		}
 		$object = $this->Application->recallObject( $this->getPrefixSpecial() , $this->Prefix.'_List', $params );
 
 		switch($params['ListType'])
 		{
 			case 'favorites':
 				return $this->PrintList($params);
 				break;
 			case 'search':
 
 			default:
 				if(isset($params['block']))
 				{
 					return $this->PrintList($params);
 				}
 				else
 				{
 					$params['block'] = $params['block_main'];
 					$params['row_start_block'] = $params['block_row_start'];
 					$params['row_end_block'] = $params['block_row_end'];
 					return $this->PrintList2($params);
 				}
 		}
 	}
 
 	/**
 	 * Adds product to recently viewed list (only in case, when not already there)
 	 *
 	 * @param Array $params
 	 */
 	function AddToRecent($params)
 	{
 		$recent_products = $this->Application->RecallVar('recent_products');
 		if (!$recent_products) {
 			$recent_products = Array();
 		}
 		else {
 			$recent_products = unserialize($recent_products);
 		}
 
 		$product_id = $this->Application->GetVar('p_id');
 		if (!in_array($product_id, $recent_products)) {
 			array_push($recent_products, $product_id);
 			$this->Application->StoreVar('recent_products', serialize($recent_products));
 		}
 	}
 
 	function SearchMoreLink($params)
 	{
 		$object =& $this->GetList($params);
 		$o = '';
 		if($object->GetPerPage() < $this->SearchResultsCount())
 		{
 			$o = $this->Application->ParseBlock( Array('name' => $params['block']) );
 		}
 		return $o;
 	}
 
 	function AddToCartLink($params)
 	{
 		$object = $this->getObject($params);
 
 		if ($object->GetDBField('HasRequiredOptions')) {
 			$t = $params['product_template'];
 			if (!$t) {
 				$theme = $this->Application->recallObject('theme.current');
 				if ($theme->GetDBField('Name') == 'onlinestore') {
 					$t = 'in-commerce/product/details';
 				}
 				elseif ($theme->GetDBField('Name') == 'default') {
 					$t = 'in-commerce/product';
 				}
 			}
 			$link_params = Array('m_cat_id' => $object->GetDBField('CategoryId'), 'pass' => 'm,p');
 		}
 		else {
 			$t = $params['template'];
 			$link_params = Array('m_cat_id' => $object->GetDBField('CategoryId'), 'pass' => 'm,p,ord', 'ord_event' => 'OnAddToCart');
 		}
 
 		$this->Application->SetVar('p_id', $this->Application->GetVar($this->getPrefixSpecial().'_id'));
 		return $this->Application->HREF($t, '', $link_params);
 	}
 
 	function SearchResultsCount($params)
 	{
 		$search_results_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 		$sql = '	SELECT COUNT(ResourceId)
 					FROM '.$search_results_table.'
 					WHERE ItemType=11';
 		return $this->Conn->GetOne($sql);
 	}
 
 	function DetailsLink($params)
 	{
 		$this->Application->SetVar( $this->Prefix.'_id', $this->Application->GetVar($this->getPrefixSpecial().'_id') );
 		$ret = $this->Application->HREF('in-commerce/details', '', Array('pass' => 'all,p'));
 		return $ret;
 	}
 
 	function ProductLink($params)
 	{
 		return $this->ItemLink($params, 'product');
 	}
 
 	function ProductFileLink($params)
 	{
 		// 'p_id'=>'0',  ??
 		$params = array_merge($params,  Array('pass'=>'all,m,p,file.downl'));
 		$product_id = getArrayValue($params,'product_id');
 		if (!$product_id) {
 			$product_id = $this->Application->GetVar($this->Prefix.'_id');
 		}
 		$params['p_id'] = $product_id;
 
 		$product = $this->Application->recallObject($this->getPrefixSpecial());
 		$params['m_cat_id'] = $product->GetDBField('CategoryId');
 
 		$main_processor = $this->Application->recallObject('m_TagProcessor');
 		return $main_processor->T($params);
 	}
 
 	function GetMarkedVal($params)
 	{
 		$list =& $this->GetList($params);
 
 		return $this->Application->RecallVar($list->getPrefixSpecial().$params['name']);
 	}
 
 	function SortingOptions($params)
 	{
 		$list =& $this->GetList($params);
 
 		$sorting_field_selected = $this->Application->RecallVar($list->getPrefixSpecial() . $params['sorting_select_name']);
 
 		if ( !$sorting_field_selected ) {
 			$sorting_field_selected = $this->Application->ConfigValue('product_OrderProductsBy');
 		}
 
 		$sql = 'SELECT ValueList
 				FROM ' . TABLE_PREFIX . 'SystemSettings
 				WHERE VariableName = "product_OrderProductsBy"';
 		$field_list_plain = $this->Conn->GetOne($sql);
 
 		$field_list = explode(',', $field_list_plain);
 
 		$o = '';
 		$option_params = $this->prepareTagParams($params);
 
 		foreach ($field_list as $field) {
 			list($fieldname, $fieldlabel) = explode('=', $field);
 
 			$option_params['fieldname'] = $fieldname;
 			$option_params['fieldlabel'] = $this->Application->Phrase($fieldlabel);
 			$option_params['name'] = $params['block_options'];
 			$option_params['selected'] = $fieldname == $sorting_field_selected ? 'selected' : '';
 
 			$o .= $this->Application->ParseBlock($option_params);
 		}
 
 		return $o;
 	}
 
 	function SortingDirectionOptions($params)
 	{
 		$list =& $this->GetList($params);
 
 		$sorting_dir_selected = $this->Application->RecallVar($list->getPrefixSpecial() . $params['sorting_select_name']);
 
 		if ( !$sorting_dir_selected ) {
 			$sorting_dir_selected = $this->Application->ConfigValue('product_OrderProductsByDir');
 		}
 
 		$o = '';
 
 		$field_list = array ('asc' => 'lu_Ascending', 'desc' => 'lu_Descending');
 		$option_params = $this->prepareTagParams($params);
 
 		foreach ($field_list as $fieldname => $fieldlabel) {
 			$option_params['fieldname'] = $fieldname;
 			$option_params['fieldlabel'] = $this->Application->Phrase($fieldlabel);
 			$option_params['name'] = $params['block_options'];
 			$option_params['selected'] = $fieldname == $sorting_dir_selected ? 'selected' : '';
 
 			$o .= $this->Application->ParseBlock($option_params);
 		}
 
 		return $o;
 	}
 
 	function ErrorMessage($params)
 	{
 		if( $this->Application->GetVar('keywords_too_short') )
 		{
 			$ret = $this->Application->ParseBlock(Array('name' => $this->SelectParam($params, 'keywords_too_short_render_as,block_keywords_too_short')));
 		}
 		elseif( $this->Application->GetVar('adv_search_error') )
 		{
 			$ret = $this->Application->ParseBlock(Array('name' => $this->SelectParam($params, 'adv_search_error_render_as,block_adv_search_error')));
 		}
 		else
 		{
 			$ret = $this->Application->ParseBlock(Array('name' => $this->SelectParam($params, 'no_found_render_as,block_no_found')));
 		}
 		return $ret;
 	}
 
 	function ListReviews($params)
 	{
 		$review_tag_processor = $this->Application->recallObject('rev.product_TagProcessor');
 		return $review_tag_processor->PrintList($params);
 	}
 
 	function ReviewCount($params)
 	{
 		$review_tag_processor = $this->Application->recallObject('rev.product_TagProcessor');
 		return $review_tag_processor->TotalRecords($params);
 	}
 
 	function InitList($params){
 
 		$passed_manuf_id = $this->Application->GetVar('manuf_id');
 		if ($passed_manuf_id && !isset($params['manufacturer'])){
 			$params['manufacturer'] = $passed_manuf_id;
 		}
 		parent::InitList($params);
 
 	}
 
 	/**
 	 * Builds link to manufacturer page
 	 *
 	 * @param Array $params
 	 * @return string
 	 */
 	function ManufacturerLink($params)
 	{
 		if ( array_key_exists('manufacturer_id', $params) ) {
 			// use direct manufacturer from tag
 			$params['manuf_id'] = $params['manufacturer_id'];
 			unset($params['manufacturer_id']);
 		}
 		else {
 			// use product's manufacturer
 			$object = $this->getObject($params);
 			$item_manufacturer_id = $object->GetDBField('ManufacturerId');
 
 			if ($item_manufacturer_id){
 				$params['manuf_id'] = $item_manufacturer_id;
 			}
 		}
 
 		$params['pass'] = 'm,manuf';
 		$params['m_cat_id'] = 0;
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 	}
 
 	function AlreadyReviewed($params)
 	{
 		$rev_tag_processor = $this->Application->recallObject('rev_TagProcessor');
 		return $rev_tag_processor->AlreadyReviewed($params);
 	}
 
 	function PrepareSearchResults($params)
 	{
 		$names_mapping = $this->Application->GetVar('NamesToSpecialMapping', Array ());
 
 		if($this->Application->GetVar('search_type') == 'advanced' || !getArrayValue($names_mapping, $this->Prefix, 'search_results'))
 		{
 			$params = Array('list_name'		=>	'search_results',
 							'types'			=>	'search',
 							'parent_cat_id'	=>	'any',
 							'recursive'		=>	'true',
 							'per_page'		=>	'short_list'
 						);
 			$this->InitList($params);
 		}
 		return '';
 	}
 
 	function Available($params)
 	{
 		$object = $this->getObject($params);
 		/* @var $object kDBItem */
 
 		if ( !$object->GetDBField('InventoryStatus') ) {
 			return true;
 		}
 
 		$backordering = $this->Application->ConfigValue('Comm_Enable_Backordering');
 
 		if ( $object->GetDBField('InventoryStatus') == 2 ) {
 			$poc_table = $this->Application->getUnitOption('poc', 'TableName');
 			$sql = 'SELECT SUM(IF(QtyInStock > ' . $object->GetDBField('QtyInStockMin') . ', 1, 0))
 					FROM ' . $poc_table . '
 					WHERE (ProductId = ' . $object->GetID() . ') AND (Availability = 1)';
 			$stock_available = $this->Conn->GetOne($sql) > 0; // at least one option combination present
 		}
 		else {
 			$stock_available = $object->GetDBField('QtyInStock') > $object->GetDBField('QtyInStockMin');
 		}
 
 		$prod_backordering = $object->GetDBField('BackOrder');
 
 		if ( $stock_available ) {
 			return true;
 		}
 
 		// stock is NOT available:
 		if ( !$backordering || $prod_backordering == 0 ) {
 			// if backordering is generaly disabled or disabled for product (Never)
 			return false;
 		}
 
 		// backordering enabled; (auto or always mode)
 		return true;
 	}
 
 	function IsSubscription($params)
 	{
-		$object = &$this->Application->recallObject($this->getPrefixSpecial());
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
 		return ($object->GetDBField('Type') == 2);
 	}
 
 	function IsTangible($params)
 	{
-		$object = &$this->Application->recallObject($this->getPrefixSpecial());
+		$object = $this->getObject($params);
+		/* @var $object kDBItem */
+
 		return ($object->GetDBField('Type') == 1);
 	}
 
 	function HasFiles($params)
 	{
 		$sql = 'SELECT COUNT(FileId) FROM '.$this->Application->getUnitOption('file', 'TableName').'
 				WHERE ProductId = '.$this->Application->GetVar('p_id').' AND Status = 1';
 		return $this->Conn->GetOne($sql) ? 1 : 0;
 	}
 
 	function UniqueFileName($params)
 	{
 		$file_object = $this->Application->recallObject('file.downl');
 		return ($file_object->GetDBField('Name') &&
 				$file_object->GetDBField('Name') != $file_object->GetDBField('FilePath'))
 			? 1 : 0;
 	}
 
 	function FileDownload($params)
 	{
 		$file_id = $this->Application->GetVar('file.downl_id');
 		$product_id =	$file_id ? $this->Conn->GetOne('SELECT ProductId
 														FROM '.$this->Application->getUnitOption('file', 'TableName').'
 														WHERE FileId = '.$file_id) :
 						$this->Application->GetVar($this->getPrefixSpecial().'_id');
 
 		$download_helper_class = $this->Application->getUnitOption($this->Prefix, 'DownloadHelperClass');
 
 		if (!$download_helper_class) {
 			$download_helper_class = 'DownloadHelper';
 		}
 		$download_helper = $this->Application->recallObject($download_helper_class);
 		if (!$download_helper->CheckAccess($file_id, $product_id)) {
 			$this->Application->ApplicationDie('File Access permission check failed!');
 		}
 		$file_info = $download_helper->SendFile($file_id, $product_id);
 		$download_helper->LogDownload($product_id, $file_info);
 
 		define('DBG_SKIP_REPORTING', 1);
 		$this->Application->ApplicationDie();
 	}
 
 	function PictureLink($params)
 	{
 		if (getArrayValue($params, 'picture_list')) {
 			$params['img_id'] = $this->Application->GetVar('img_id');
 			$params['pass'] = 'all,p,img';
 			unset($params['picture_list']);
 		}
 		else {
 			$params['pass'] = 'all,p';
 		}
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 	}
 
 	function ShouldListOptions($params)
 	{
 		$object = $this->getObject($params);
 
 		$req_filter = '';
 		if (getArrayValue($params, 'required_only')) {
 			$req_filter = ' AND Required = 1';
 		}
 
 		$query = 'SELECT COUNT(*) FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductId = '.$object->GetID().$req_filter;
 		$res = $this->Conn->GetOne($query);
 		return $res > 0;
 	}
 
 	function CountOptions($params)
 	{
 		$object = $this->getObject($params);
 
 		$query = 'SELECT COUNT(*) FROM '.TABLE_PREFIX.'ProductOptions WHERE ProductId = '.$object->GetID();
 		$res = $this->Conn->GetOne($query);
 
 		$max = $this->SelectParam($params, 'greater');
 		if (!$max) $max = 0;
 
 		return $res > $max;
 	}
 
 	function OptionsUpdateMode($params)
 	{
 		return $this->Application->GetVar('orditems_id') !== false;
 	}
 
 	function OptionsHaveError($params)
 	{
 		return $this->Application->GetVar('opt_error') > 0;
 	}
 
 	function OptionsError($params)
 	{
 		switch ($this->Application->GetVar('opt_error')) {
 			case 1:
 				return $this->Application->Phrase($params['required']);
 			case 2:
 				return $this->Application->Phrase($params['not_available']);
 		}
 	}
 
 	function ListShippingTypes($params)
 	{
 		$quote_engine_collector = $this->Application->recallObject('ShippingQuoteCollector');
 		/* @var $quote_engine_collector ShippingQuoteCollector */
 
 		$types = $quote_engine_collector->GetAvailableShippingTypes();
 
 		$object = $this->getObject($params);
 		$selected = $object->GetDBField('ShippingLimitation');
 		$selected = explode('|', substr($selected, 1, -1));
 
 		$o = '';
 		foreach ($types as $a_type)
 		{
 			$is_selected = in_array($a_type['_Id'], $selected);
 			$continue = $params['mode'] == 'selected' ? !$is_selected : $is_selected;
 			if ($continue) continue;
 			$block_params = $a_type;
 			$block_params['name']	= $params['render_as'];
 			$o .= $this->Application->ParseBlock($block_params);
 		}
 		return $o;
 	}
 
 	function PageLink($params)
 	{
 		$manufacturer_id = $this->Application->GetVar('manuf_id');
 		if ($manufacturer_id) {
 			$params['pass'] = 'm,'.$this->getPrefixSpecial().',manuf';
 		}
 
 		return parent::PageLink($params);
 	}
 
 	/**
 	 * Calculate savings based on price & market price relationship
 	 *
 	 * @param Array $params
 	 * @return int
 	 */
 	function Savings($params)
 	{
 		$object = $this->getObject($params);
 		/* @var $object kDBItem */
 
 		$price = $object->GetDBField('Price');
 		$msrp = $object->GetDBField('MSRP');
 
 		$value = 0;
 		if (isset($params['type']) && ($params['type'] == 'percent')) {
 			if ($msrp > 0) {
 				return 100 - round($price * 100 / $msrp);
 			}
 		}
 		else {
 			if ($msrp > $price) {
 				$value = $msrp - $price;
 			}
 		}
 
 		if (isset($params['currency'])) {
 			$lang = $this->Application->recallObject('lang.current');
 			/* @var $lang LanguagesItem */
 
 			$iso = $this->GetISO($params['currency']);
 			$value = $this->ConvertCurrency($value, $iso);
 			$value = $lang->formatNumber( sprintf('%.2f', $value) );
 			$value = $this->AddCurrencySymbol($value, $iso);
 		}
 
 		return $value;
 	}
 
 	/**
 	 * Hides permission tab, when it's not allowed by configuration settings
 	 *
 	 * @param Array $params
 	 */
 	function ModifyUnitConfig($params)
 	{
 		$edit_tab_presets = $this->Application->getUnitOption($this->Prefix, 'EditTabPresets');
 		$edit_tab_preset = $edit_tab_presets['Default'];
 
 		$object = $this->getObject($params);
 		/* @var $object kDBItem */
 
 		$product_type = $object->GetDBField('Type');
 
 		if ($product_type != PRODUCT_TYPE_TANGIBLE) {
 			unset($edit_tab_preset['inventory']);
 		}
 
 		if ($product_type == PRODUCT_TYPE_SUBSCRIPTION) {
 			unset($edit_tab_preset['options']);
 		}
 		else {
 			unset($edit_tab_preset['access_and_pricing']);
 		}
 
 		if ($product_type != PRODUCT_TYPE_TANGIBLE && $product_type != PRODUCT_TYPE_PACKAGE) {
 			unset($edit_tab_preset['pricing']);
 		}
 		else {
 			unset($edit_tab_preset['pricing2']);
 		}
 
 		if ($product_type != PRODUCT_TYPE_DOWNLOADABLE) {
 			unset($edit_tab_preset['files_and_pricing']);
 		}
 
 		if ($product_type != PRODUCT_TYPE_PACKAGE) {
 			unset($edit_tab_preset['package_content']);
 		}
 
 		$edit_tab_presets['Default'] = $edit_tab_preset;
 		$this->Application->setUnitOption($this->Prefix, 'EditTabPresets', $edit_tab_presets);
 	}
 
 	/**
 	 * Checks, that current product is in compare products list
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function InCompare($params)
 	{
 		$object = $this->getObject($params);
 		/* @var $object kDBItem */
 
 		$products = $this->Application->GetVarDirect('compare_products', 'Cookie');
 		$products = $products ? explode('|', $products) : Array ();
 
 		return in_array($object->GetID(), $products);
 	}
 
 	/**
 	 * Checks, that one more product can be added to comparison list
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ComparePossible($params)
 	{
 		$products = $this->Application->GetVarDirect('compare_products', 'Cookie');
 		$products = $products ? explode('|', $products) : Array ();
 
 		return count($products) < $this->Application->ConfigValue('MaxCompareProducts');
 	}
 
 	/**
 	 * Checks if given field is filled for at least one product in comparison page
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function HasCompareField($params)
 	{
 		$object =& $this->GetList($params);
 
 		$object->GoFirst();
 		$field = $this->SelectParam($params, 'name,field');
 
 		while ( !$object->EOL() ) {
 			if ( $object->GetField($field) ) {
 				// don't use GetCol, since it fails to process ML fields
 				return true;
 			}
 
 			$object->GoNext();
 		}
 
 		return false;
 	}
 
 	/**
 	 * Builds link to product compare page
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function CompareLink($params)
 	{
 		$params['continue'] = urlencode($this->Application->HREF('__default__', '', Array ('pass_category' => 1)));
 
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 	}
 
 	/**
 	 * Builds link to continue website browsing from compare products page
 	 *
 	 * @param Array $params
 	 * @return string
 	 * @access protected
 	 */
 	protected function ContinueLink($params)
 	{
 		$url = $this->Application->GetVar('continue');
 
 		if ( isset($params['redirect']) && $params['redirect'] ) {
 			$this->Application->Redirect('external:' . $url);
 		}
 
 		return $url;
 	}
 }
\ No newline at end of file
Index: branches/5.2.x/units/products/products_event_handler.php
===================================================================
--- branches/5.2.x/units/products/products_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/products/products_event_handler.php	(revision 15540)
@@ -1,1593 +1,1595 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class ProductsEventHandler extends kCatDBEventHandler {
 
 	/**
 	 * Allows to override standard permission mapping
 	 *
 	 * @return void
 	 * @access protected
 	 * @see kEventHandler::$permMapping
 	 */
 	protected function mapPermissions()
 	{
 		parent::mapPermissions();
 
 		$permissions = Array(
 			// front
 			'OnCancelAction'		=>	Array('self' => true),
 			'OnRateProduct'			=>	Array('self' => true),
 			'OnClearRecent'			=>	Array('self' => true),
 			'OnRecommendProduct'	=>	Array('self' => true),
 			'OnAddToCompare'		=>	Array('self' => true),
 			'OnRemoveFromCompare'	=>	Array('self' => true),
 			'OnCancelCompare'		=>	Array('self' => true),
 
 			// admin
 			'OnQtyAdd'			=>	Array('self' => 'add|edit'),
 			'OnQtyRemove'		=>	Array('self' => 'add|edit'),
 			'OnQtyOrder'		=>	Array('self' => 'add|edit'),
 			'OnQtyReceiveOrder'	=>	Array('self' => 'add|edit'),
 			'OnQtyCancelOrder'	=>	Array('self' => 'add|edit'),
 		);
 
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
 	/**
 	 * 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
 
 		$product_events = Array (
 			'OnQtyAdd'=>'InventoryAction',
 			'OnQtyRemove'=>'InventoryAction',
 			'OnQtyOrder'=>'InventoryAction',
 			'OnQtyReceiveOrder'=>'InventoryAction',
 			'OnQtyCancelOrder'=>'InventoryAction',
 		);
 
 		$this->eventMethods = array_merge($this->eventMethods, $product_events);
 	}
 
 	/**
 	 * Sets default processing data for subscriptions
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$product_approve_events = Array (
 			2 => 'p:OnSubscriptionApprove',
 			4 => 'p:OnDownloadableApprove',
 			5 => 'p:OnPackageApprove'
 		);
 
 		$product_type = $object->GetDBField('Type');
 
 		$type_found = in_array($product_type, array_keys($product_approve_events));
 
 		if ( $type_found && !$object->GetDBField('ProcessingData') ) {
 			$processing_data = Array ('ApproveEvent' => $product_approve_events[$product_type]);
 			$object->SetDBField('ProcessingData', serialize($processing_data));
 		}
 	}
 
 	/**
 	 * Process product count manipulations
 	 *
 	 * @param kEvent $event
 	 * @access private
 	 */
 	function InventoryAction($event)
 	{
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$field_values = $this->getSubmittedFields($event);
 		$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 
 		if ($object->GetDBField('InventoryStatus') == 2) {
 			// inventory by options (use first selected combination in grid)
-			$combination_id = array_shift( array_keys( $this->Application->GetVar('poc_grid') ) );
+			$combinations = $this->Application->GetVar('poc_grid');
+			list ($combination_id, ) = each($combinations);
 		}
 		else {
 			// inventory by product
 			$combination_id = 0;
 		}
 
 		// save id of selected option combination & preselect it in grid
 		$this->Application->SetVar('combination_id', $combination_id);
 
 		$this->ScheduleInventoryAction($event->Name, $object->GetId(), $object->GetDBField('Qty'), $combination_id);
 
 		$object->Validate();
 
 		if ( !$object->GetErrorPseudo('Qty') ){
 			// only update, when no error on that field
 			$this->modifyInventory($event->Name, $object, $object->GetDBField('Qty'), $combination_id);
 		}
 
 		$object->SetDBField('Qty', null);
 		$event->redirect = false;
 	}
 
 	/**
 	 * Perform inventory action on supplied object
 	 *
 	 * @param string $action event name which is actually called by user
 	 * @param ProductsItem $product
 	 * @param int $qty
 	 * @param int $combination_id
 	 */
 	function modifyInventory($action, &$product, $qty, $combination_id)
 	{
 		if ($product->GetDBField('InventoryStatus') == 2) {
 			// save inventory changes to option combination instead of product
 			$object = $this->Application->recallObject('poc.-item', null, Array('skip_autoload' => true));
 			$object->Load($combination_id);
 		}
 		elseif ($combination_id > 0) {
 			// combination id present, but not inventory by combinations => skip
 			return false;
 		}
 		elseif ($product->GetDBField('InventoryStatus') == 1) {
 			// save inventory changes to product
 			$object =& $product;
 		}
 		else {
 			// product has inventory actions, but don't use inventory => skip
 			return false;
 		}
 
 		if (!$object->isLoaded()) {
 			// product/combination in action doesn't exist in database by now
 			return false;
 		}
 
 		switch ($action) {
 			case 'OnQtyAdd':
 				$object->SetDBField('QtyInStock', $object->GetDBField('QtyInStock') + $qty);
 				break;
 
 			case 'OnQtyRemove':
 				if ($object->GetDBField('QtyInStock') < $qty) {
 					$qty = $object->GetDBField('QtyInStock');
 				}
 				$object->SetDBField('QtyInStock', $object->GetDBField('QtyInStock') - $qty);
 				break;
 
 			case 'OnQtyOrder':
 				$object->SetDBField('QtyOnOrder', $object->GetDBField('QtyOnOrder') + $qty);
 				break;
 
 			case 'OnQtyReceiveOrder':
 				$object->SetDBField('QtyOnOrder', $object->GetDBField('QtyOnOrder') - $qty);
 				$object->SetDBField('QtyInStock', $object->GetDBField('QtyInStock') + $qty);
 				break;
 
 			case 'OnQtyCancelOrder':
 				$object->SetDBField('QtyOnOrder', $object->GetDBField('QtyOnOrder') - $qty);
 				break;
 		}
 
 		return $object->Update();
 	}
 
 	function ScheduleInventoryAction($action, $prod_id, $qty, $combination_id = 0)
 	{
 		$inv_actions = $this->Application->RecallVar('inventory_actions');
 		if (!$inv_actions) {
 			$inv_actions = Array();
 		}
 		else {
 			$inv_actions = unserialize($inv_actions);
 		}
 
 		array_push($inv_actions, Array('action' => $action, 'product_id' => $prod_id, 'combination_id' => $combination_id, 'qty' => $qty));
 
 		$this->Application->StoreVar('inventory_actions', serialize($inv_actions));
 	}
 
 	function RealInventoryAction($action, $prod_id, $qty, $combination_id)
 	{
 		$product = $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
 		$product->SwitchToLive();
 		$product->Load($prod_id);
 
 		$this->modifyInventory($action, $product, $qty, $combination_id);
 	}
 
 	function RunScheduledInventoryActions($event)
 	{
 		$inv_actions = $this->Application->GetVar('inventory_actions');
 		if (!$inv_actions) {
 			return;
 		}
 		$inv_actions = unserialize($inv_actions);
 
 		$products = array();
 		foreach($inv_actions as $an_action) {
 			$this->RealInventoryAction($an_action['action'], $an_action['product_id'], $an_action['qty'], $an_action['combination_id']);
 			array_push($products, $an_action['product_id'].'_'.$an_action['combination_id']);
 		}
 
 		$products = array_unique($products);
 		if ($products) {
 			$product_obj = $this->Application->recallObject('p.liveitem', null, Array('skip_autoload' => true));
 			$product_obj->SwitchToLive();
 			foreach ($products as $product_key) {
 				list($prod_id, $combination_id) = explode('_', $product_key);
 			$product_obj->Load($prod_id);
 				$this->FullfillBackOrders($product_obj, $combination_id);
 			}
 		}
 	}
 
 	/**
 	 * In case if products arrived into inventory and they are required by old (non processed) orders, then use them (products) in that orders
 	 *
 	 * @param ProductsItem $product
 	 * @param int $combination_id
 	 */
 	function FullfillBackOrders(&$product, $combination_id)
 	{
 		if ( !$this->Application->ConfigValue('Comm_Process_Backorders_Auto') ) return;
 
 		if ($combination_id && ($product->GetDBField('InventoryStatus') == 2)) {
 			// if combination id present and inventory by combinations
 			$poc_idfield = $this->Application->getUnitOption('poc', 'IDField');
 			$poc_tablename = $this->Application->getUnitOption('poc', 'TableName');
 			$sql = 'SELECT QtyInStock
 					FROM '.$poc_tablename.'
 					WHERE '.$poc_idfield.' = '.$combination_id;
 			$stock_qty = $this->Conn->GetOne($sql);
 		}
 		else {
 			// inventory by product
 			$stock_qty = $product->GetDBField('QtyInStock');
 		}
 
 		$qty = (int) $stock_qty - $product->GetDBField('QtyInStockMin');
 		$prod_id = $product->GetID();
 		if ($prod_id <= 0 || !$prod_id || $qty <= 0) return;
 
 		//selecting up to $qty backorders with $prod_id where full qty is not reserved
 		$query = 'SELECT '.TABLE_PREFIX.'Orders.OrderId
 							FROM '.TABLE_PREFIX.'OrderItems
 					LEFT JOIN '.TABLE_PREFIX.'Orders ON '.TABLE_PREFIX.'Orders.OrderId = '.TABLE_PREFIX.'OrderItems.OrderId
 					WHERE (ProductId = '.$prod_id.') AND (Quantity > QuantityReserved) AND (Status = '.ORDER_STATUS_BACKORDERS.')
 							GROUP BY '.TABLE_PREFIX.'Orders.OrderId
 							ORDER BY OrderDate ASC
 							LIMIT 0,'.$qty; //assuming 1 item per order - minimum possible
 
 		$orders = $this->Conn->GetCol($query);
 
 		if (!$orders) return;
 
 		$order = $this->Application->recallObject('ord.-inv', null, Array('skip_autoload' => true));
 		foreach ($orders as $ord_id) {
 			$order->Load($ord_id);
 
 			$this->Application->EmailEventAdmin('BACKORDER.FULLFILL');
 
 			//reserve what's possible in any case
 			$event = new kEvent('ord:OnReserveItems');
 			$this->Application->HandleEvent($event);
 
 			if ( $event->status == kEvent::erSUCCESS ) { //
 				//in case the order is ready to process - process it
 				$this->Application->HandleEvent($event, 'ord:OnOrderProcess');
 			}
 		}
 	}
 
 	/**
 	 * Occurs before an item is deleted from live table when copying from temp
 	 * (temp handler deleted all items from live and then copy over all items from temp)
 	 * Id of item being deleted is passed as event' 'id' param
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeDeleteFromLive(kEvent $event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
 		$product = $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
 		/* @var $product kCatDBItem */
 
 		$product->SwitchToLive();
 		$id = $event->getEventParam('id');
 
 		if ( !$product->Load($id) ) {
 			// this will make sure New product will not be overwritten with empty data
 			return ;
 		}
 
 		$temp = $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
 		/* @var $temp kCatDBItem */
 
 		$temp->SwitchToTemp();
 		$temp->Load($id);
 
 		$temp->SetDBFieldsFromHash($product->GetFieldValues(), null, Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
 		$temp->Update();
 	}
 
 	/**
 	 * Removes any information about current/selected ids
 	 * from Application variables and Session
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function clearSelectedIDs(kEvent $event)
 	{
 		parent::clearSelectedIDs($event);
 
 		$this->Application->SetVar('inventory_actions', $this->Application->RecallVar('inventory_actions'));
 		$this->Application->RemoveVar('inventory_actions');
 	}
 
 	/**
 	 * Saves content of temp table into live and
 	 * redirects to event' default redirect (normally grid template)
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
 		if ( $event->status == kEvent::erSUCCESS ) {
 			$this->RunScheduledInventoryActions($event);
 		}
 	}
 
 	/**
 	 * Prepare temp tables for creating new item
 	 * but does not create it. Actual create is
 	 * done in OnPreSaveCreated
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreCreate(kEvent $event)
 	{
 		parent::onPreCreate($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$object->SetDBField('Type', $this->Application->GetVar($event->getPrefixSpecial(true) . '_new_type'));
 	}
 
 	/**
 	 * Saves edited item in temp table and loads
 	 * item with passed id in current template
 	 * Used in Prev/Next buttons
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreSaveAndGo(kEvent $event)
 	{
 		$event->CallSubEvent('OnPreSave');
 		$this->LoadItem($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$from_type = $object->GetDBField('Type');
 		if ( $event->status == kEvent::erSUCCESS ) {
 			$this->Application->SetVar($event->getPrefixSpecial() . '_id', $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoId'));
 			$this->LoadItem($event);
 			$to_type = $object->GetDBField('Type');
 
 			if ( $from_type != $to_type ) {
 				$from_tabs = $this->GetTabs($from_type);
 				$from_tab_i = array_search($this->Application->GetVar('t'), $from_tabs);
 
 				$to_tabs = $this->GetTabs($to_type);
 				$to_tab = $this->Application->GetVar('t');
 
 				$found = false;
 				while (!isset($to_tabs[$from_tab_i]) && $from_tab_i < count($to_tabs)) {
 					$from_tab_i++;
 				}
 
 				if ( !isset($to_tabs[$from_tab_i]) ) {
 					$from_tab_i = 0;
 				}
 
 				$to_tab = $to_tabs[$from_tab_i];
 
 				$event->redirect = $to_tab;
 			}
 		}
 	}
 
 	function GetTabs($type)
 	{
 		switch($type)
 		{
 			case 1:
 				return Array(
 					0 => 'in-commerce/products/products_edit',
 					1 => 'in-commerce/products/products_inventory',
 					2 => 'in-commerce/products/products_pricing',
 					3 => 'in-commerce/products/products_categories',
 					4 => 'in-commerce/products/products_images',
 					5 => 'in-commerce/products/products_reviews',
 					6 => 'in-commerce/products/products_custom',
 				);
 
 			case 2:
 				return Array(
 					0 => 'in-commerce/products/products_edit',
 					1 => 'in-commerce/products/products_access',
 					/*2 => 'in-commerce/products/products_access_pricing',*/
 					3 => 'in-commerce/products/products_categories',
 					4 => 'in-commerce/products/products_images',
 					5 => 'in-commerce/products/products_reviews',
 					6 => 'in-commerce/products/products_custom',
 				);
 
 			case 3:
 				return Array(
 					0 => 'in-commerce/products/products_edit',
 
 					2 => 'in-commerce/products/products_access_pricing',
 					3 => 'in-commerce/products/products_categories',
 					4 => 'in-commerce/products/products_images',
 					5 => 'in-commerce/products/products_reviews',
 					6 => 'in-commerce/products/products_custom',
 				);
 
 			case 4:
 				return Array(
 					0 => 'in-commerce/products/products_edit',
 
 					2 => 'in-commerce/products/products_files',
 					3 => 'in-commerce/products/products_categories',
 					4 => 'in-commerce/products/products_images',
 					5 => 'in-commerce/products/products_reviews',
 					6 => 'in-commerce/products/products_custom',
 				);
 		}
 	}
 
 	/**
 	 * Return type clauses for list bulding on front
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 */
 	function getTypeClauses($event)
 	{
 		$types = $event->getEventParam('types');
 		$types = $types ? explode(',', $types) : Array ();
 
 		$except_types = $event->getEventParam('except');
 		$except_types = $except_types ? explode(',', $except_types) : Array ();
 
 		$object = $event->getObject();
 		/* @var $object kDBList */
 
 		$type_clauses = parent::getTypeClauses($event);
 
 		$type_clauses['featured']['include'] = '%1$s.Featured = 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
 		$type_clauses['featured']['except'] = '%1$s.Featured != 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
 		$type_clauses['featured']['having_filter'] = false;
 
 		$type_clauses['onsale']['include'] = '%1$s.OnSale = 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
 		$type_clauses['onsale']['except'] = '%1$s.OnSale != 1 AND ' . TABLE_PREFIX . 'CategoryItems.PrimaryCat = 1';
 		$type_clauses['onsale']['having_filter'] = false;
 
 		// products from selected manufacturer: begin
 		$manufacturer = $event->getEventParam('manufacturer');
 		if ( !$manufacturer ) {
 			$manufacturer = $this->Application->GetVar('manuf_id');
 		}
 
 		if ( $manufacturer ) {
 			$type_clauses['manufacturer']['include'] = '%1$s.ManufacturerId = ' . $manufacturer . ' AND PrimaryCat = 1';
 			$type_clauses['manufacturer']['except'] = '%1$s.ManufacturerId != ' . $manufacturer . ' AND PrimaryCat = 1';
 			$type_clauses['manufacturer']['having_filter'] = false;
 		}
 		// products from selected manufacturer: end
 
 		// recent products: begin
 		$recent = $this->Application->RecallVar('recent_products');
 		if ( $recent ) {
 			$recent = unserialize($recent);
 			$type_clauses['recent']['include'] = '%1$s.ProductId IN (' . implode(',', $recent) . ') AND PrimaryCat = 1';
 			$type_clauses['recent']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $recent) . ') AND PrimaryCat = 1';
 		}
 		else {
 			$type_clauses['recent']['include'] = '0';
 			$type_clauses['recent']['except'] = '1';
 		}
 		$type_clauses['recent']['having_filter'] = false;
 		// recent products: end
 
 		// compare products: begin
 		if ( in_array('compare', $types) || in_array('compare', $except_types) ) {
 			$compare_products = $this->getCompareProducts();
 
 			if ( $compare_products ) {
 				$compare_products = $this->Conn->qstrArray($compare_products);
 				$type_clauses['compare']['include'] = '%1$s.ProductId IN (' . implode(',', $compare_products) . ') AND PrimaryCat = 1';
 				$type_clauses['compare']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $compare_products) . ') AND PrimaryCat = 1';
 			}
 			else {
 				$type_clauses['compare']['include'] = '0';
 				$type_clauses['compare']['except'] = '1';
 			}
 
 			$type_clauses['compare']['having_filter'] = false;
 
 			if ( $event->getEventParam('per_page') === false ) {
 				$event->setEventParam('per_page', $this->Application->ConfigValue('MaxCompareProducts'));
 			}
 		}
 		// compare products: end
 
 		// products already in shopping cart: begin
 		if ( in_array('in_cart', $types) || in_array('in_cart', $except_types) ) {
 			$order_id = $this->Application->RecallVar('ord_id');
 
 			if ( $order_id ) {
 				$sql = 'SELECT ProductId
 						FROM ' . TABLE_PREFIX . 'OrderItems
 						WHERE OrderId = ' . $order_id;
 				$in_cart = $this->Conn->GetCol($sql);
 
 				if ( $in_cart ) {
 					$type_clauses['in_cart']['include'] = '%1$s.ProductId IN (' . implode(',', $in_cart) . ') AND PrimaryCat = 1';
 					$type_clauses['in_cart']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $in_cart) . ') AND PrimaryCat = 1';
 				}
 				else {
 					$type_clauses['in_cart']['include'] = '0';
 					$type_clauses['in_cart']['except'] = '1';
 				}
 			}
 			else {
 				$type_clauses['in_cart']['include'] = '0';
 				$type_clauses['in_cart']['except'] = '1';
 			}
 
 			$type_clauses['in_cart']['having_filter'] = false;
 		}
 		// products already in shopping cart: end
 
 		// my downloadable products: begin
 		if ( in_array('my_downloads', $types) || in_array('my_downloads', $except_types) ) {
 			$user_id = $this->Application->RecallVar('user_id');
 
 			$sql = 'SELECT ProductId
 					FROM ' . TABLE_PREFIX . 'UserFileAccess
 					WHERE PortalUserId = ' . $user_id;
 			$my_downloads = $user_id > 0 ? $this->Conn->GetCol($sql) : false;
 
 			if ( $my_downloads ) {
 				$type_clauses['my_downloads']['include'] = '%1$s.ProductId IN (' . implode(',', $my_downloads) . ') AND PrimaryCat = 1';
 				$type_clauses['my_downloads']['except'] = '%1$s.ProductId NOT IN (' . implode(',', $my_downloads) . ') AND PrimaryCat = 1';
 			}
 			else {
 				$type_clauses['my_downloads']['include'] = '0';
 				$type_clauses['my_downloads']['except'] = '1';
 			}
 
 			$type_clauses['my_downloads']['having_filter'] = false;
 		}
 		// my downloadable products: end
 
 		// my favorite products: begin
 		if ( in_array('wish_list', $types) || in_array('wish_list', $except_types) ) {
 			$sql = 'SELECT ResourceId
 					FROM ' . $this->Application->getUnitOption('fav', 'TableName') . '
 					WHERE PortalUserId = ' . (int)$this->Application->RecallVar('user_id');
 			$wishlist_ids = $this->Conn->GetCol($sql);
 
 			if ( $wishlist_ids ) {
 				$type_clauses['wish_list']['include'] = '%1$s.ResourceId IN (' . implode(',', $wishlist_ids) . ') AND PrimaryCat = 1';
 				$type_clauses['wish_list']['except'] = '%1$s.ResourceId NOT IN (' . implode(',', $wishlist_ids) . ') AND PrimaryCat = 1';
 			}
 			else {
 				$type_clauses['wish_list']['include'] = '0';
 				$type_clauses['wish_list']['except'] = '1';
 			}
 
 			$type_clauses['wish_list']['having_filter'] = false;
 		}
 		// my favorite products: end
 
 		// products from package: begin
 		if ( in_array('content', $types) || in_array('content', $except_types) ) {
 			$object->removeFilter('category_filter');
 			$object->AddGroupByField('%1$s.ProductId');
 
 			$object_product = $this->Application->recallObject($event->Prefix);
 			/* @var $object_product ProductsItem */
 
 			$content_ids_array = $object_product->GetPackageContentIds();
 
 			if ( sizeof($content_ids_array) == 0 ) {
 				$content_ids_array = array ('-1');
 			}
 
 			if ( sizeof($content_ids_array) > 0 ) {
 				$type_clauses['content']['include'] = '%1$s.ProductId IN (' . implode(',', $content_ids_array) . ')';
 			}
 			else {
 				$type_clauses['content']['include'] = '0';
 			}
 
 			$type_clauses['related']['having_filter'] = false;
 		}
 		// products from package: end
 
 		$object->addFilter('not_virtual', '%1$s.Virtual = 0');
 
 		if ( !$this->Application->isAdminUser ) {
 			$object->addFilter('expire_filter', '%1$s.Expire IS NULL OR %1$s.Expire > ' . adodb_mktime());
 		}
 
 		return $type_clauses;
 	}
 
 	function OnClearRecent($event)
 	{
 		$this->Application->RemoveVar('recent_products');
 	}
 
 	/**
 	 * Occurs, when user rates a product
 	 *
 	 * @param kEvent $event
 	 */
 	function OnRateProduct($event)
 	{
 		$event->SetRedirectParam('pass', 'all,p');
 		$event->redirect = $this->Application->GetVar('success_template');
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$user_id = $this->Application->RecallVar('user_id');
 
 		$sql = '	SELECT * FROM ' . TABLE_PREFIX . 'SpamControl
 					WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
 					AND IPaddress="' . $_SERVER['REMOTE_ADDR'] . '"
 					AND PortalUserId=' . $user_id . '
 					AND DataType="Rating"';
 		$res = $this->Conn->GetRow($sql);
 
 		if ( $res && $res['Expire'] < adodb_mktime() ) {
 			$sql = '	DELETE FROM ' . TABLE_PREFIX . 'SpamControl
 						WHERE ItemResourceId=' . $object->GetDBField('ResourceId') . '
 						AND IPaddress="' . $_SERVER['REMOTE_ADDR'] . '"
 						AND PortalUserId=' . $user_id . '
 						AND DataType="Rating"';
 			$this->Conn->Query($sql);
 			unset($res);
 		}
 
 		$new_rating = $this->Application->GetVar('rating');
 
 		if ( $new_rating !== false && !$res ) {
 			$rating = $object->GetDBField('CachedRating');
 			$votes = $object->GetDBField('CachedVotesQty');
 			$new_votes = $votes + 1;
 
 			$rating = (($rating * $votes) + $new_rating) / $new_votes;
 			$object->SetDBField('CachedRating', $rating);
 			$object->SetDBField('CachedVotesQty', $new_votes);
 			$object->Update();
 
 			$expire = adodb_mktime() + $this->Application->ConfigValue('product_ReviewDelay_Value') * $this->Application->ConfigValue('product_ReviewDelay_Interval');
 			$sql = '	INSERT INTO ' . TABLE_PREFIX . 'SpamControl
 							(ItemResourceId, IPaddress, PortalUserId, DataType, Expire)
 						VALUES (' . $object->GetDBField('ResourceId') . ',
 								"' . $_SERVER['REMOTE_ADDR'] . '",
 								' . $user_id . ',
 								"Rating",
 								' . $expire . ')';
 			$this->Conn->Query($sql);
 		}
 		else {
 			$event->status == kEvent::erFAIL;
 			$event->redirect = false;
 			$object->SetError('CachedRating', 'too_frequent', 'lu_ferror_rate_duplicate');
 		}
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnCancelAction($event)
 	{
 		$event->SetRedirectParam('pass', 'all,p');
 		$event->redirect = $this->Application->GetVar('cancel_template');
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 	function OnRecommendProduct($event)
 	{
 		// used for error reporting only -> rewrite code + theme (by Alex)
 		$object = $this->Application->recallObject('u', null, Array('skip_autoload' => true)); // TODO: change theme too
 		/* @var $object kDBItem */
 
 		$friend_email = $this->Application->GetVar('friend_email');
 		$friend_name = $this->Application->GetVar('friend_name');
 		$my_email = $this->Application->GetVar('your_email');
 		$my_name = $this->Application->GetVar('your_name');
 		$my_message = $this->Application->GetVar('your_message');
 
 		$send_params = array();
 		$send_params['to_email']=$friend_email;
 		$send_params['to_name']=$friend_name;
 		$send_params['from_email']=$my_email;
 		$send_params['from_name']=$my_name;
 		$send_params['message']=$my_message;
 
 		if ( preg_match('/' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . '/', $friend_email) ) {
 			$user_id = $this->Application->RecallVar('user_id');
 			$email_sent = $this->Application->EmailEventUser('PRODUCT.SUGGEST', $user_id, $send_params);
 			$this->Application->EmailEventAdmin('PRODUCT.SUGGEST');
 
 			if ( $email_sent ) {
 				$event->setRedirectParams(Array ('opener' => 's', 'pass' => 'all'));
 				$event->redirect = $this->Application->GetVar('template_success');
 			}
 			else {
 //				$event->setRedirectParams(Array('opener' => 's', 'pass' => 'all'));
 //				$event->redirect = $this->Application->GetVar('template_fail');
 
 				$object->SetError('Email', 'send_error', 'lu_email_send_error');
 				$event->status = kEvent::erFAIL;
 			}
 		}
 		else {
 			$object->SetError('Email', 'invalid_email', 'lu_InvalidEmail');
 			$event->status = kEvent::erFAIL;
 		}
 	}
 
 	/**
 	 * Creates/updates virtual product based on listing type data
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSaveVirtualProduct($event)
 	{
 		$object = $event->getObject( Array('skip_autoload' => true) );
 		$listing_type = $this->Application->recallObject('lst', null, Array('skip_autoload' => true));
 		$listing_type->Load($event->MasterEvent->getEventParam('id'));
 
 		$product_id = $listing_type->GetDBField('VirtualProductId');
 
 		if ($product_id) {
 			$object->Load($product_id);
 		}
 
 		if (!$listing_type->GetDBField('EnableBuying')) {
 			if ($product_id) {
 				// delete virtual product here
 				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, Array($product_id));
 
 				$listing_type->SetDBField('VirtualProductId', 0);
 				$listing_type->Update();
 			}
 			return true;
 		}
 
 		$ml_formatter = $this->Application->recallObject('kMultiLanguage');
 		$object->SetDBField($ml_formatter->LangFieldName('Name'), $listing_type->GetDBField('ShopCartName') );
 		$object->SetDBField($ml_formatter->LangFieldName('Description'), $listing_type->GetDBField('Description'));
 		$object->SetDBField('SKU', 'ENHANCE_LINK_'.abs( crc32( $listing_type->GetDBField('Name') ) ) );
 
 		if ($product_id) {
 			$object->Update();
 		}
 		else {
 			$object->SetDBField('Type', 2);
 			$object->SetDBField('Status', 1);
 			$object->SetDBField('HotItem', 0);
 			$object->SetDBField('PopItem', 0);
 			$object->SetDBField('NewItem', 0);
 			$object->SetDBField('Virtual', 1);
 
 //			$processing_data = Array('ApproveEvent' => 'ls:EnhanceLinkAfterOrderApprove', 'ExpireEvent' => 'ls:ExpireLink');
 			$processing_data = Array(	'ApproveEvent'			=>	'ls:EnhanceLinkAfterOrderApprove',
 										'DenyEvent'				=>	'ls:EnhanceLinkAfterOrderDeny',
 										'CompleteOrderEvent'	=>	'ls:EnhancedLinkOnCompleteOrder',
 										'ExpireEvent'			=>	'ls:ExpireLink',
 										'HasNewProcessing'		=>	1);
 			$object->SetDBField('ProcessingData', serialize($processing_data));
 			$object->Create();
 
 			$listing_type->SetDBField('VirtualProductId', $object->GetID());
 			$listing_type->Update();
 		}
 
 		$additiona_fields = Array(	'AccessDuration'	=>	$listing_type->GetDBField('Duration'),
 									'AccessUnit'		=>	$listing_type->GetDBField('DurationType'),
 							);
 		$this->setPrimaryPrice($object->GetID(), (double)$listing_type->GetDBField('Price'), $additiona_fields);
 	}
 
 	/**
 	 * [HOOK] Deletes virtual product when listing type is deleted
 	 *
 	 * @param kEvent $event
 	 */
 	function OnDeleteListingType($event)
 	{
 		$listing_type = $event->MasterEvent->getObject();
 		/* @var $listing_type kDBItem */
 
 		$product_id = $listing_type->GetDBField('VirtualProductId');
 
 		if ( $product_id ) {
 			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($product_id));
 		}
 	}
 
 	/**
 	 * Extends user membership in group when his order is approved
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSubscriptionApprove($event)
 	{
 		$field_values = $event->getEventParam('field_values');
 		$item_data = unserialize($field_values['ItemData']);
 
 		if ( !getArrayValue($item_data,'PortalGroupId') ) {
 			// is subscription product, but no group defined in it's properties
 			trigger_error('Invalid product <b>'.$field_values['ProductName'].'</b> (id: '.$field_values['ProductId'].')', E_USER_WARNING);
 			return false;
 		}
 
 		$sql = 'SELECT PortalUserId
 				FROM ' . $this->Application->getUnitOption('ord', 'TableName') . '
 				WHERE ' . $this->Application->getUnitOption('ord', 'IDField') . ' = ' . $field_values['OrderId'];
 		$user_id = $this->Conn->GetOne($sql);
 
 		$group_id = $item_data['PortalGroupId'];
 		$duration = $item_data['Duration'];
 
 		$sql = 'SELECT *
 				FROM ' . TABLE_PREFIX . 'UserGroupRelations
 				WHERE PortalUserId = ' . $user_id;
 		$user_groups = $this->Conn->Query($sql, 'GroupId');
 
 		if ( !isset($user_groups[$group_id]) ) {
 			$expire = adodb_mktime() + $duration;
 		}
 		else {
 			$expire = $user_groups[$group_id]['MembershipExpires'];
 			$expire = $expire < adodb_mktime() ? adodb_mktime() + $duration : $expire + $duration;
 		}
 
 		/*// Customization healtheconomics.org
 		if ($item_data['DurationType'] == 2) {
 			$expire = $item_data['AccessExpiration'];
 		}
 		// Customization healtheconomics.org --*/
 
 		$fields_hash = Array (
 			'PortalUserId' => $user_id,
 			'GroupId' => $group_id,
 			'MembershipExpires' => $expire,
 		);
 
 		$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'UserGroupRelations', 'REPLACE');
 
 		$sub_order = $this->Application->recallObject('ord.-sub'.$event->getEventParam('next_sub_number'), 'ord');
 		$sub_order->SetDBField('IsRecurringBilling', getArrayValue($item_data, 'IsRecurringBilling') ? 1 : 0);
 		$sub_order->SetDBField('GroupId', $group_id);
 		$sub_order->SetDBField('NextCharge_date', $expire);
 		$sub_order->SetDBField('NextCharge_time', $expire);
 	}
 
 	function OnDownloadableApprove($event)
 	{
 		$field_values = $event->getEventParam('field_values');
 		$product_id = $field_values['ProductId'];
 		$sql = 'SELECT PortalUserId FROM '.$this->Application->getUnitOption('ord', 'TableName').'
 				WHERE OrderId = '.$field_values['OrderId'];
 		$user_id = $this->Conn->GetOne($sql);
 		$sql = 'INSERT INTO '.TABLE_PREFIX.'UserFileAccess VALUES("", '.$product_id.', '.$user_id.')';
 		$this->Conn->Query($sql);
 	}
 
-	function OnPackageApprove($event){
+	protected function OnPackageApprove(kEvent $event)
+	{
 		$field_values = $event->getEventParam('field_values');
 		$item_data = unserialize($field_values['ItemData']);
 		$package_content_ids = $item_data['PackageContent'];
 
+		$object_item = $this->Application->recallObject('p.packageitem', null, array ('skip_autoload' => true));
+		/* @var $object_item ProductsItem */
 
-
-		$object_item = &$this->Application->recallObject('p.packageitem', null, array('skip_autoload'=>true));
 		foreach ($package_content_ids as $package_item_id) {
-			$object_field_values = array();
-					// query processing data from product and run approve event
-			$sql = 'SELECT ProcessingData FROM '.TABLE_PREFIX.'Products WHERE ProductId = '.$package_item_id;
+			$object_field_values = array ();
+
+			// query processing data from product and run approve event
+			$sql = 'SELECT ProcessingData
+					FROM ' . TABLE_PREFIX . 'Products
+					WHERE ProductId = ' . $package_item_id;
 			$processing_data = $this->Conn->GetOne($sql);
-			if($processing_data)
-			{
+
+			if ( $processing_data ) {
 				$processing_data = unserialize($processing_data);
 				$approve_event = new kEvent($processing_data['ApproveEvent']);
 
 				//$order_item_fields = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'OrderItems WHERE OrderItemId = '.$grouping_data[1]);
 				$object_item->Load($package_item_id);
 
 				$object_field_values['OrderId'] = $field_values['OrderId'];
 				$object_field_values['ProductId'] = $package_item_id;
 
 				$object_field_values['ItemData'] = serialize($item_data['PackageItemsItemData'][$package_item_id]);
 
 				$approve_event->setEventParam('field_values', $object_field_values);
 				$this->Application->HandleEvent($approve_event);
 			}
-
-
 		}
-
 	}
 
 	/**
 	 * Saves edited item into temp table
 	 * If there is no id, new item is created in temp table
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnPreSave(kEvent $event)
 	{
 		$this->CheckRequiredOptions($event);
 
 		parent::OnPreSave($event);
 	}
 
 	/**
 	 * Set new price to ProductsPricing
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
 		$this->_updateProductPrice($event);
 	}
 
 	/**
 	 * Set new price to ProductsPricing
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
 		$this->_updateProductPrice($event);
 	}
 
 	/**
 	 * Updates product's primary price based on Price virtual field value
 	 *
 	 * @param kEvent $event
 	 */
 	function _updateProductPrice($event)
 	{
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$price = $object->GetDBField('Price');
 
 		// always create primary pricing, to show on Pricing tab (in admin) for tangible products
 		$force_create = ($object->GetDBField('Type') == PRODUCT_TYPE_TANGIBLE) && is_null($price);
 
 		if ($force_create || ($price != $object->GetOriginalField('Price'))) {
 			// new product OR price was changed in virtual field
 			$this->setPrimaryPrice($object->GetID(), (float)$price);
 		}
 	}
 
 	function CheckRequiredOptions($event)
 	{
 		$object = $event->getObject();
 		if ($object->GetDBField('ProductId') == '') return ; // if product does not have ID - it's not yet created
 		$opt_object = $this->Application->recallObject('po', null, Array('skip_autoload' => true) );
 		$has_required = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$opt_object->TableName.' WHERE Required = 1 AND ProductId = '.$object->GetDBField('ProductId'));
 		//we need to imitate data sumbit, as parent' PreSave sets object values from $items_info
 		$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 		$items_info[$object->GetDBField('ProductId')]['HasRequiredOptions'] = $has_required ? '1' : '0';
 		$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
 		$object->SetDBField('HasRequiredOptions', $has_required ? 1 : 0);
 	}
 
 	/**
 	 * Sets required price in primary price backed, if it's missing, then create it
 	 *
 	 * @param int $product_id
 	 * @param double $price
 	 * @param Array $additional_fields
 	 * @return bool
 	 */
 	function setPrimaryPrice($product_id, $price, $additional_fields = Array())
 	{
 		$pr_object = $this->Application->recallObject('pr.-item', null, Array('skip_autoload' => true) );
 		/* @var $pr_object kDBItem */
 
 		$pr_object->Load( Array('ProductId' => $product_id, 'IsPrimary' => 1) );
 
 		$sql = 'SELECT COUNT(*) FROM '.$pr_object->TableName.' WHERE ProductId = '.$product_id;
 		$has_pricings = $this->Conn->GetOne($sql);
 
 		if ($additional_fields) {
 			$pr_object->SetDBFieldsFromHash($additional_fields);
 		}
 
 		if( ($price === false) && $has_pricings ) return false;
 
 		if( $pr_object->isLoaded() )
 		{
 			$pr_object->SetField('Price', $price);
 			return $pr_object->Update();
 		}
 		else
 		{
 			$group_id = $this->Application->ConfigValue('User_LoggedInGroup');
 			$field_values = Array('ProductId' => $product_id, 'IsPrimary' => 1, 'MinQty' => 1, 'MaxQty' => -1, 'GroupId'=>$group_id);
 			$pr_object->SetDBFieldsFromHash($field_values);
 			$pr_object->SetField('Price', $price);
 
 			return $pr_object->Create();
 		}
 	}
 
 	/**
 	 * Occurs after deleting item, id of deleted item
 	 * is stored as 'id' param of event
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
 		$product_id = $event->getEventParam('id');
 		if ( !$product_id ) {
 			return;
 		}
 
 		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserFileAccess
 				WHERE ProductId = ' . $product_id;
 		$this->Conn->Query($sql);
 	}
 
 	/**
 	 * Load price from temp table if product mode is temp table
 	 *
 	 * @param kEvent $event
 	 */
 
 	/**
 	 * Load price from temp table if product mode is temp table
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
 		$object = $event->getObject();
 		/* @var $object ProductsItem */
 
 		$a_pricing = $object->getPrimaryPricing();
 		if ( !$a_pricing ) {
 			// pricing doesn't exist for new products
 			$price = $cost = null;
 		}
 		else {
 			$price = (float)$a_pricing['Price'];
 			$cost = (float)$a_pricing['Cost'];
 		}
 
 		// set original fields to use them in OnAfterItemCreate/OnAfterItemUpdate later
 		$object->SetDBField('Price', $price);
 		$object->SetOriginalField('Price', $price);
 
 		$object->SetDBField('Cost', $cost);
 		$object->SetOriginalField('Cost', $cost);
 	}
 
 	/**
 	 * Allows to add products to package besides all that parent method does
 	 *
 	 * @param kEvent $event
 	 */
 	function OnProcessSelected($event)
 	{
 		$dst_field = $this->Application->RecallVar('dst_field');
 
 		if ($dst_field == 'PackageContent') {
 			$this->OnAddToPackage($event);
 		}
 		elseif ($dst_field == 'AssignedCoupon') {
 			$coupon_id = $this->Application->GetVar('selected_ids');
 			$object = $event->getObject();
 			$object->SetDBField('AssignedCoupon', $coupon_id);
 			$this->RemoveRequiredFields($object);
 			$object->Update();
 		}
 		else {
 			parent::OnProcessSelected($event);
 		}
 		$this->finalizePopup($event);
 	}
 
 	/**
 	 * Called when some products are selected in products selector for this prefix
 	 *
 	 * @param kEvent $event
 	 */
 	function OnAddToPackage($event)
 	{
 		$selected_ids = $this->Application->GetVar('selected_ids');
 
 		// update current package content with selected products
 
 		$object = $event->getObject();
 		/* @var $object ProductsItem */
 
 		$product_ids = $selected_ids['p'] ? explode(',', $selected_ids['p']) : Array();
 
 		if ($product_ids) {
 			$current_ids = $object->GetPackageContentIds();
 			$current_ids = array_unique(array_merge($current_ids, $product_ids));
 
 			// remove package product from selected list
 			$this_product = array_search($object->GetID(), $current_ids);
 			if ($this_product !== false) {
 				unset($current_ids[$this_product]);
 			}
 
 			$dst_field = $this->Application->RecallVar('dst_field');
 			$object->SetDBField($dst_field, '|'.implode('|', $current_ids).'|');
 
 			$object->Update();
 			$this->ProcessPackageItems($event);
 		}
 
 		$this->finalizePopup($event);
 	}
 
 
-	function ProcessPackageItems($event)
+	function ProcessPackageItems(kEvent $event)
 	{
 		//$this->Application->SetVar('p_mode', 't');
 
 		$object = $event->getObject();
 		/* @var $object ProductsItem */
 
 		$content_ids = $object->GetPackageContentIds();
 
 		if (sizeof($content_ids) > 0) {
 			$total_weight = $this->Conn->GetOne('SELECT SUM(Weight) FROM '.TABLE_PREFIX.'Products WHERE ProductId IN ('.implode(', ', $content_ids).') AND Type=1');
 
 			if (!$total_weight) $total_weight = 0;
 
 			$this->Conn->Query('UPDATE '.$object->TableName.' SET Weight='.$total_weight.' WHERE ProductId='.$object->GetID());
 		}
 
 		/*
 		$this->Application->SetVar('p_mode', false);
 
-		$list = &$this->Application->recallObject('p.content', 'p_List', array('types'=>'content'));
+		$list = $this->Application->recallObject('p.content', 'p_List', array('types'=>'content'));
 
 		$this->Application->SetVar('p_mode', 't');
 
 		$list->Query();
 
 		$total_weight_a = 0;
 		$total_weight_b = 0;
 
 		$list->GoFirst();
 
 		while (!$list->EOL())
 		{
 			if ($list->GetDBField('Type')==1){
 				$total_weight_a += $list->GetField('Weight_a');
 				$total_weight_b += $list->GetField('Weight_b');
 			}
 			$list->GoNext();
 		}
 
 		$object->SetField('Weight_a', $total_weight_a);
 		$object->SetField('Weight_b', $total_weight_b);
 		*/
 		//$object->Update();
 
 
 	}
 
 	/**
 	 * Enter description here...
 	 *
 	 * @param kEvent $event
 	 */
 
 	function OnSaveItems($event)
 	{
 		//$event->CallSubEvent('OnUpdate');
 		$event->redirect = false;
 		//$event->setRedirectParams(Array ('opener' => 's', 'pass' => 'all,p'));
 	}
 
 	/**
 	 * Removes product from package
 	 *
 	 * @param kEvent $event
 	 */
 	function OnRemovePackageItem($event) {
 
 		$this->Application->SetVar('p_mode', 't');
 
 		$object = $event->getObject();
 
 		$items_info = $this->Application->GetVar('p_content');
 
 		if($items_info)
 		{
 			$product_ids = array_keys($items_info);
 
 			$current_ids = $object->GetPackageContentIds();
 
 			$current_ids_flip = array_flip($current_ids);
 			foreach($product_ids as $key=>$val){
 				unset($current_ids_flip[$val]);
 			}
 			$current_ids = array_keys($current_ids_flip);
 			$current_ids_str = '|'.implode('|', array_unique($current_ids)).'|';
 			$object->SetDBField('PackageContent', $current_ids_str);
 		}
 
 		$object->Update();
 		$this->ProcessPackageItems($event);
 	}
 
 	/**
 	 * Occurs before deleting item, id of item being
 	 * deleted is stored as 'id' event param
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnBeforeItemDelete(kEvent $event)
 	{
 		parent::OnBeforeItemDelete($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$sql = 'SELECT COUNT(*)
 				FROM ' . TABLE_PREFIX . 'Products
 				WHERE PackageContent LIKE "%|' . $object->GetID() . '%"';
 		$product_includes_in = $this->Conn->GetOne($sql);
 
 		if ( $product_includes_in > 0 ) {
 			$event->status = kEvent::erFAIL;
 		}
 	}
 
 	/**
 	 * Returns specific to each item type columns only
 	 *
 	 * @param kEvent $event
 	 * @return Array
 	 * @access protected
 	 */
 	public function getCustomExportColumns(kEvent $event)
 	{
 		$columns = parent::getCustomExportColumns($event);
 
 		$new_columns = Array (
 			'__VIRTUAL__Price' => 'Price',
 			'__VIRTUAL__Cost' => 'Cost',
 		);
 
 		return array_merge($columns, $new_columns);
 	}
 
 /**
 	 * Sets non standart virtual fields (e.g. to other tables)
 	 *
 	 * @param kEvent $event
 	 */
 	function setCustomExportColumns($event)
 	{
 		parent::setCustomExportColumns($event);
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$this->setPrimaryPrice($object->GetID(), (double)$object->GetDBField('Price'), Array ('Cost' => (double)$object->GetDBField('Cost')));
 	}
 
 	function OnPreSaveAndOpenPopup($event)
 	{
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
 		$this->RemoveRequiredFields($object);
 		$event->CallSubEvent('OnPreSave');
 
 		$event->redirect = $this->Application->GetVar('t');
 		// pass ID too, in case if product is created by OnPreSave call to ensure proper editing
 		$event->SetRedirectParam('pass', 'all');
 		$event->SetRedirectParam($event->getPrefixSpecial(true) . '_id', $object->GetID());
 	}
 
 
 	/**
 	 * Returns ID of current item to be edited
 	 * by checking ID passed in get/post as prefix_id
 	 * or by looking at first from selected ids, stored.
 	 * Returned id is also stored in Session in case
 	 * it was explicitly passed as get/post
 	 *
 	 * @param kEvent $event
 	 * @return int
 	 * @access public
 	 */
 	public function getPassedID(kEvent $event)
 	{
 		if ( $this->Application->isAdminUser ) {
 			$event->setEventParam('raise_warnings', 0);
 		}
 
 		$passed = parent::getPassedID($event);
 
 		if ( $passed ) {
 			return $passed;
 		}
 
 		if ( $this->Application->isAdminUser ) {
 			// we may get product id out of OrderItem, if it exists
 			$ord_item = $this->Application->recallObject('orditems', null, Array ('raise_warnings' => 0));
 			/* @var $ord_item OrdersItem */
 
 			if ( $ord_item->GetDBField('ProductId') ) {
 				$passed = $ord_item->GetDBField('ProductId');
 			}
 		}
 
 		return $passed;
 	}
 
 	/**
 	 * Occurs, when config was parsed, allows to change config data dynamically
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
 		if (!$this->Application->LoggedIn()) {
 			return ;
 		}
 
 		$user_id = $this->Application->RecallVar('user_id');
 
 		$sql = 'SELECT PrimaryGroupId
 				FROM ' . TABLE_PREFIX . 'Users
 				WHERE PortalUserId = ' . $user_id;
 		$primary_group_id = $this->Conn->GetOne($sql);
 
 		if (!$primary_group_id) {
 			return;
 		}
 
 		$sub_select = '	SELECT pp.Price
 						FROM ' . TABLE_PREFIX . 'ProductsPricing AS pp
 			 			WHERE pp.ProductId = %1$s.ProductId AND GroupId = ' . $primary_group_id . '
 			 			ORDER BY MinQty
 			 			LIMIT 0,1';
 
 		$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');
 		$calculated_fields['']['Price'] = 'IFNULL((' . $sub_select . '), ' . $calculated_fields['']['Price'] . ')';
 		$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
 	}
 
 	/**
 	 * Starts product editing, remove any pending inventory actions
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnEdit(kEvent $event)
 	{
 		$this->Application->RemoveVar('inventory_actions');
 
 		parent::OnEdit($event);
 	}
 
 	/**
 	 * Adds "Shop Cart" tab on paid listing type editing tab
 	 *
 	 * @param kEvent $event
 	 */
 	function OnModifyPaidListingConfig($event)
 	{
 		$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
 		$edit_tab_presets['Default']['shopping_cart'] = Array ('title' => 'la_tab_ShopCartEntry', 't' => 'in-commerce/paid_listings/paid_listing_type_shopcart', 'priority' => 2);
 		$this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets);
 	}
 
 	/**
 	 * [HOOK] Allows to add cloned subitem to given prefix
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCloneSubItem(kEvent $event)
 	{
 		parent::OnCloneSubItem($event);
 
 		if ( $event->MasterEvent->Prefix == 'rev' ) {
 			$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
 			$subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
 
 			$clones[$subitem_prefix]['ConfigMapping'] = Array (
 				'PerPage'				=>	'Comm_Perpage_Reviews',
 
 				'ReviewDelayInterval'	=>	'product_ReviewDelay_Value',
 				'ReviewDelayValue'		=>	'product_ReviewDelay_Interval',
 			);
 
 			$this->Application->setUnitOption($event->MasterEvent->Prefix, 'Clones', $clones);
 		}
 	}
 
 	/**
 	 * Adds product to comparison list
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnAddToCompare(kEvent $event)
 	{
 		$products = $this->getCompareProducts();
 		$product_id = (int)$this->Application->GetVar($event->Prefix . '_id');
 
 		if ( $product_id ) {
 			$max_products = $this->Application->ConfigValue('MaxCompareProducts');
 
 			if ( count($products) < $max_products ) {
 				$products[] = $product_id;
 				$this->Application->Session->SetCookie('compare_products', implode('|', array_unique($products)));
 
 				$event->SetRedirectParam('result', 'added');
 			}
 			else {
 				$event->SetRedirectParam('result', 'error');
 			}
 		}
 
 		$event->SetRedirectParam('pass', 'm,p');
 	}
 
 	/**
 	 * Adds product to comparison list
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnRemoveFromCompare(kEvent $event)
 	{
 		$products = $this->getCompareProducts();
 
 		$product_id = (int)$this->Application->GetVar($event->Prefix . '_id');
 
 		if ( $product_id && in_array($product_id, $products) ) {
 			$products = array_diff($products, Array ($product_id));
 			$this->Application->Session->SetCookie('compare_products', implode('|', array_unique($products)));
 
 			$event->SetRedirectParam('result', 'removed');
 		}
 
 		$event->SetRedirectParam('pass', 'm,p');
 	}
 
 	/**
 	 * Cancels product compare
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCancelCompare(kEvent $event)
 	{
 		$this->Application->Session->SetCookie('compare_products', '', -1);
 
 		$event->SetRedirectParam('result', 'all_removed');
 	}
 
 	/**
 	 * Returns products, that needs to be compared with each other
 	 *
 	 * @return Array
 	 * @access protected
 	 */
 	protected function getCompareProducts()
 	{
 		$products = $this->Application->GetVarDirect('compare_products', 'Cookie');
 		$products = $products ? explode('|', $products) : Array ();
 
 		return $products;
 	}
 }
\ No newline at end of file
Index: branches/5.2.x/units/affiliates/affiliates_event_handler.php
===================================================================
--- branches/5.2.x/units/affiliates/affiliates_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/affiliates/affiliates_event_handler.php	(revision 15540)
@@ -1,663 +1,663 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 	defined('FULL_PATH') or die('restricted access!');
 
 	class AffiliatesEventHandler extends kDBEventHandler {
 
 		/**
 		 * Allows to override standard permission mapping
 		 *
 		 * @return void
 		 * @access protected
 		 * @see kEventHandler::$permMapping
 		 */
 		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
 			$permissions = Array (
 				'OnItemBuild' => Array ('self' => true),
 			);
 
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
 		/**
 		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access public
 		 */
 		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnBecomeAffiliate' || $event->Name == 'OnChangePaymentType' ) {
 				return $this->Application->LoggedIn() && $this->Application->ConfigValue('Comm_RegisterAsAffiliate');
 			}
 
 			return parent::CheckPermission($event);
 		}
 
 		/**
 		 * Allows to get ID of affiliate record, associated with currently logged-in user
 		 *
 		 * @param kEvent $event
 		 * @return int
 		 * @access public
 		 */
 		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'user' ) {
 				$event->setEventParam('raise_warnings', 0);
 
 				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
 						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 						WHERE PortalUserId = ' . (int)$this->Application->RecallVar('user_id');
 				$id = $this->Conn->GetOne($sql);
 
 				if ( $id ) {
 					return $id;
 				}
 			}
 
 			return parent::getPassedID($event);
 		}
 
 		/**
 		 * Generate new affiliate code
 		 *
 		 * @param kEvent $event
 		 * @return string
 		 */
 		function generateAffiliateCode($event)
 		{
 			// accepts 1 - 36
 			$number_length = 11;
 			$num_chars = Array(	'1'=>'a','2'=>'b','3'=>'c','4'=>'d','5'=>'e','6'=>'f',
 								'7'=>'g','8'=>'h','9'=>'i','10'=>'j','11'=>'k','12'=>'l',
 								'13'=>'m','14'=>'n','15'=>'o','16'=>'p','17'=>'q','18'=>'r',
 								'19'=>'s','20'=>'t','21'=>'u','22'=>'v','23'=>'w','24'=>'x',
 								'25'=>'y','26'=>'z','27'=>'0','28'=>'1','29'=>'2','30'=>'3',
 								'31'=>'4','32'=>'5','33'=>'6','34'=>'7','35'=>'8','36'=>'9');
 
 			$ret = '';
 			for($i=1; $i<=$number_length; $i++)
 			{
 				mt_srand((double)microtime() * 1000000);
 				$num = mt_rand(1,36);
 				$ret .= $num_chars[$num];
 			}
 			$ret = strtoupper($ret);
 
 			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
 			$sql = 'SELECT %s FROM %s WHERE AffiliateCode = %s';
 			$code_found = $this->Conn->GetOne( sprintf($sql, $id_field, $table, $this->Conn->qstr($ret) ) );
 			if($code_found) return $this->generateAffiliateCode($event);
 
 			return $ret;
 		}
 
 		/**
 		 * Creates new affiliate code when new affiliate is created
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$object->SetDBField('AffiliateCode', $this->generateAffiliateCode($event));
 
 			if ( $object->getFormName() == 'registration' ) {
 				if ( $this->Application->LoggedIn() ) {
 					$object->SetDBField('PortalUserId', $this->Application->RecallVar('user_id'));
 				}
 
 				$object->SetDBField('AffiliatePlanId', $this->_getPrimaryAffiliatePlan());
 			}
 		}
 
 		/**
 		 * Ensures, that user can only update his affiliate record
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
 			if ( !$this->Application->isAdmin ) {
 				$object = $event->getObject();
 				/* @var $object kDBItem */
 
 				$object->SetDBField('PortalUserId', $object->GetOriginalField('PortalUserId'));
 
 				if ( $object->GetDBField('PortalUserId') != $this->Application->RecallVar('user_id') ) {
 					$object->SetError('PortalUserId', 'not_owner');
 				}
 			}
 		}
 
 		/**
 		 * [HOOK] Stores affiliate id using method from Config (session or cookie) if correct code is present in url
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 */
 		function OnStoreAffiliate($event)
 		{
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				return;
 			}
 
 			$object = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
 			$affiliate_storage_method = $this->Application->ConfigValue('Comm_AffiliateStorageMethod');
 
 			$affiliate = $this->Application->GetVar('affiliate');
 			if ( $affiliate ) {
 				$object->Load($affiliate, 'AffiliateCode');
 			}
 			elseif ( $affiliate_storage_method == 2 ) {
 				$affiliate_id = $this->Application->GetVar('affiliate_id');
 				$object->Load($affiliate_id);
 			}
 
 			if ( $object->isLoaded() && ($object->GetDBField('Status') == 1) ) {
 				// user is found with such email
 				$affiliate_user = $this->Application->recallObject('u.affiliate', null, Array ('skip_autoload' => true));
 				/* @var $affiliate_user UsersItem */
 
 				$affiliate_user->Load($object->GetDBField('PortalUserId'));
 
 				if ( $affiliate_user->GetDBField('Status') == 1 ) {
 					$affiliate_id = $object->GetDBField('AffiliateId');
 					$this->Application->setVisitField('AffiliateId', $affiliate_id);
 
 					if ( $affiliate_storage_method == 1 ) {
 						$this->Application->StoreVar('affiliate_id', $affiliate_id); // per session
 					}
 					else {
 						// in cookie
 						$this->Application->Session->SetCookie('affiliate_id', $affiliate_id, $this->getCookieExpiration());
 					}
 				}
 			}
 		}
 
 		/**
 		 * Returns affiliate cookie expiration date
 		 *
 		 * @return int
 		 */
 		function getCookieExpiration()
 		{
 			$expire = $this->Application->ConfigValue('Comm_AffiliateCookieDuration'); // days
 			return adodb_mktime() + $expire * 24 * 60 * 60;
 		}
 
 		/**
 		 * Calculate what amount is earned by affiliate based on it's affiliate plan & store it
 		 *
 		 * @param kEvent $event
 		 * @author Alex
 		 */
 		function OnOrderApprove($event)
 		{
 			$order = $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial'));
 			/* @var $order OrdersItem */
 
 			$affiliate_id = $order->GetDBField('AffiliateId');
 			if ( !$affiliate_id ) {
 				return false;
 			}
 
 			$object = $event->getObject(Array ('ship_autoload' => true));
 			/* @var $object kDBItem */
 
 			if ( $object->Load($affiliate_id) ) {
 				$affiliate_plan = $this->Application->recallObject('ap', null, Array ('skip_autoload' => true));
 				/* @var $affiliate_plan kDBItem */
 
 				$affiliate_plan->Load($object->GetDBField('AffiliatePlanId'));
 
 				if ( $affiliate_plan->isLoaded() ) {
 					$sql = 'SELECT SUM(Quantity) FROM %s WHERE OrderId = %s';
 					$orderitems_table = $this->Application->getUnitOption('orditems', 'TableName');
 					$items_sold = $this->Conn->GetOne(sprintf($sql, $orderitems_table, $order->GetID()));
 
 					$object->SetDBField('AccumulatedAmount', $object->GetDBField('AccumulatedAmount') + $order->GetDBField('TotalAmount'));
 					$object->SetDBField('ItemsSold', $object->GetDBField('ItemsSold') + $items_sold);
 
 					switch ($affiliate_plan->GetDBField('PlanType')) {
 						case 1: // by amount
 							$value = $object->GetDBField('AccumulatedAmount');
 							break;
 
 						case 2: // by items sold (count)
 							$value = $object->GetDBField('ItemsSold');
 							break;
 					}
 
 					$apb_table = $this->Application->getUnitOption('apbrackets', 'TableName');
 					$sql = 'SELECT Percent FROM %1$s WHERE (%2$s >= FromAmount) AND ( (%2$s <= ToAmount) OR (ToAmount = -1) ) AND (AffiliatePlanId = %3$s)';
 					$commission_percent = $this->Conn->GetOne(sprintf($sql, $apb_table, $this->Conn->qstr($value), $affiliate_plan->GetID()));
 
 					// process only orders of current affiliate from period start to this order date
 					$period_ends = $order->GetDBField('OrderDate');
 					$period_starts = $this->getPeriodStartTS($period_ends, $affiliate_plan->GetDBField('ResetInterval'));
 
 					$sql = 'SELECT AffiliateCommission, (SubTotal+ShippingCost+VAT) AS TotalAmount, OrderId
 							FROM ' . $order->TableName . '
 							WHERE OrderDate >= %s AND OrderDate <= %s AND AffiliateId = ' . $affiliate_id;
 
 					$amount_to_pay_before = 0;
 					$amount_to_pay_after = 0;
 					$order_update_sql = 'UPDATE ' . $order->TableName . ' SET AffiliateCommission = %s WHERE ' . $order->IDField . ' = %s';
 					$orders = $this->Conn->Query(sprintf($sql, $period_starts, $period_ends), 'OrderId');
 					if ( $orders ) {
 						foreach ($orders as $order_id => $order_data) {
 							$amount_to_pay_before += $order_data['AffiliateCommission'];
 							$commission = $order_data['TotalAmount'] * ($commission_percent / 100);
 							$this->Conn->Query(sprintf($order_update_sql, $this->Conn->qstr($commission), $order_id));
 							$amount_to_pay_after += $commission;
 						}
 
 
 					}
 					$object->SetDBField('AmountToPay', $object->GetDBField('AmountToPay') - $amount_to_pay_before + $amount_to_pay_after);
 					$object->SetDBField('LastOrderDate_date', $order->GetDBField('OrderDate_date'));
 					$object->SetDBField('LastOrderDate_time', $order->GetDBField('OrderDate_time'));
 					$object->Update();
 
 					$order->SetDBField('AffiliateCommission', $commission); // set last commission to this order, because ApproveEvent was called for him
 				}
 			}
 		}
 
 		/**
 		 * [HOOK] Validates affiliate fields on user registration form
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnValidateAffiliate($event)
 		{
 			if ( $this->Application->GetVar('RegisterAsAffiliate') != 'on' || $event->MasterEvent->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
 			$object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
 			/* @var $object kDBItem */
 
 			$field_values = $this->getSubmittedFields($event);
 			$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 			$object->setID(0);
 
 			if ( !$object->Validate() ) {
 				$user = $event->MasterEvent->getObject();
 				/* @var $user kDBItem */
 
 				$user->Validate();
 
 				$event->MasterEvent->status = kEvent::erFAIL;
 			}
 		}
 
 		/**
 		 * [AFTER HOOK] to u:OnCreate
 		 *
 		 * @param kEvent $event
 		 */
 		function OnRegisterAffiliate($event)
 		{
 			if ( $this->Application->GetVar('RegisterAsAffiliate') != 'on' || $event->MasterEvent->status != kEvent::erSUCCESS ) {
 				return;
 			}
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$user = $event->MasterEvent->getObject();
 			/* @var $user UsersItem */
 
 			$object->SetDBField('PortalUserId', $user->GetID());
 
 			if ( $object->Create() ) {
 				$this->Application->EmailEventUser('AFFILIATE.REGISTER', $user->GetID());
 				$this->Application->EmailEventAdmin('AFFILIATE.REGISTER');
 			}
 		}
 
 		/**
 		 * Returns primary affiliate plan
 		 *
 		 * @return int
 		 * @access protected
 		 */
 		protected function _getPrimaryAffiliatePlan()
 		{
 			$sql = 'SELECT AffiliatePlanId
 					FROM ' . $this->Application->getUnitOption('ap', 'TableName') . '
 					WHERE IsPrimary = 1';
 
 			return (int)$this->Conn->GetOne($sql);
 		}
 
 		/**
 		 * Creates affiliate record for logged-in user
 		 *
 		 * @param kEvent $event
 		 */
 		function OnBecomeAffiliate($event)
 		{
 			$object = $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
 			/* @var $object UsersItem */
 
 			$event->CallSubEvent('OnCreate');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->SetRedirectParam('opener', 's');
 
 				$next_template = $this->Application->GetVar('next_template');
 
 				if ( $next_template ) {
 					$event->redirect = $next_template;
 				}
 			}
 		}
 
 		/**
 		 * Change affiliate payment type of affiliate record associated with logged-in user
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnChangePaymentType($event)
 		{
 			$event->CallSubEvent('OnUpdate');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
 				$object = $event->getObject();
 				/* @var $object kDBItem */
 
 				$this->Application->EmailEventUser('AFFILIATE.PAYMENT.TYPE.CHANGED', $object->GetDBField('PortalUserId'));
 				$this->Application->EmailEventAdmin('AFFILIATE.PAYMENT.TYPE.CHANGED');
 
 				$next_template = $this->Application->GetVar('next_template');
 
 				if ( $next_template ) {
 					$event->redirect = $this->Application->GetVar('next_template');
 				}
 
 				$event->SetRedirectParam('opener', 's');
 			}
 		}
 
 		/**
 		 * If new payments made, then send email about that
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
 		protected function OnBeforeDeleteFromLive(kEvent $event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
 			$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');
 
 			$sql = 'SELECT AffiliatePaymentId
 					FROM ' . $ap_table . '
 					WHERE AffiliateId = ' . $id;
 			$live_ids = $this->Conn->GetCol($sql);
 
 			$sql = 'SELECT AffiliatePaymentId
 					FROM ' . $payment_object->TableName . '
 					WHERE AffiliateId = ' . $id;
 			$temp_ids = $this->Conn->GetCol($sql);
 
 			$new_ids = array_diff($temp_ids, $live_ids);
 
 			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');
 			}
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			$passed_id = $event->getEventParam('id');
 
 			if ( $object->GetID() != $passed_id ) {
 				$object->Load($passed_id);
 			}
 
 			$sql = 'SELECT Status
 					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
 					WHERE ' . $object->IDField . ' = ' . $object->GetID();
 			$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');
 			}
 		}
 
 		/**
 		 * [HOOK] Resets statistics (accumulated amount & items sold) for affiliates based on ResetInterval in their plan
 		 *
 		 * @param kEvent $event
 		 * @author Alex
 		 */
 		function OnResetStatistics($event)
 		{
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				return;
 			}
 
 			$intervals = Array (86400 => 'la_day', 604800 => 'la_week', 2628000 => 'la_month', 7884000 => 'la_quartely', 31536000 => 'la_year');
 
 			$affiliates_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$affiliate_plan_table = $this->Application->getUnitOption('ap', 'TableName');
 
 			$base_time = adodb_mktime();
 			$where_clause = Array ();
 
 			foreach ($intervals as $interval_length => $interval_description) {
 				$start_timestamp = $this->getPeriodStartTS($base_time, $interval_length);
 				$where_clause[] = 'ap.ResetInterval = ' . $interval_length . ' AND LastOrderDate < ' . $start_timestamp;
 			}
 
 			$sql = 'SELECT AffiliateId
 					FROM ' . $affiliates_table . ' a
 					LEFT JOIN ' . $affiliate_plan_table . ' ap ON a.AffiliatePlanId = ap.AffiliatePlanId
 					WHERE (' . implode(') OR (', $where_clause) . ')';
 			$affiliate_ids = $this->Conn->GetCol($sql);
 
 			if ( !$affiliate_ids ) {
 				return;
 			}
 
 			if ( defined('DEBUG_MODE') && DEBUG_MODE && $this->Application->isDebugMode() ) {
 				$this->Application->Debugger->appendHTML('Affiliates Pending Totals Reset: ');
 				$this->Application->Debugger->dumpVars($affiliate_ids);
 			}
 
 			$fields_hash = Array (
 				'AccumulatedAmount' => 0,
 				'ItemsSold' => 0,
 				'LastOrderDate' => $base_time,
 			);
 
 			$this->Conn->doUpdate($fields_hash, $affiliates_table, 'AffiliateId IN (' . implode(',', $affiliate_ids) . ')');
 		}
 
 		/**
 		 * Returns calendar period start timestamp based on current timestamp ($base_time) and $period_length
 		 *
 		 * @param int $base_time
 		 * @param int $period_length
 		 * @return int
 		 * @author Alex
 		 */
 		function getPeriodStartTS($base_time, $period_length)
 		{
 			$start_timestamp = 0;
 
 			switch ($period_length) {
 				case 86400: // day
 					$start_timestamp = adodb_mktime(0, 0, 0, adodb_date('m', $base_time), adodb_date('d', $base_time), adodb_date('Y', $base_time));
 					break;
 
 				case 604800: // week
 					$day_seconds = 86400;
 					$first_week_day = $this->Application->ConfigValue('FirstDayOfWeek');
 					$morning = adodb_mktime(0, 0, 0, adodb_date('m', $base_time), adodb_date('d', $base_time), adodb_date('Y', $base_time));
 					$week_day = adodb_date('w', $morning);
 					if ( $week_day == $first_week_day ) {
 						// if it is already first week day, then don't search for previous week day
 						$day_diff = 0;
 					}
 					else {
 						// this way, because sunday is 0, but not 7 as it should be
 						$day_diff = $week_day != 0 ? $week_day - $first_week_day : 7 - $first_week_day;
 					}
 					$start_timestamp = $morning - $day_diff * $day_seconds;
 					break;
 
 				case 2628000: // month
 					$start_timestamp = adodb_mktime(0, 0, 0, adodb_date('m', $base_time), 1, adodb_date('Y', $base_time));
 					break;
 
 				case 7884000: // quartal
 					$first_quartal_month = (ceil(adodb_date('m', $base_time) / 3) - 1) * 3 + 1;
 					$start_timestamp = adodb_mktime(0, 0, 0, $first_quartal_month, 1, adodb_date('Y', $base_time));
 					break;
 
 				case 31536000:
 					$start_timestamp = adodb_mktime(0, 0, 0, 1, 1, adodb_date('Y', $base_time));
 					break;
 			}
 
 			return $start_timestamp;
 		}
 
 		/**
 		 * 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) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$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'));
+				$status_field = $object->getStatusField();
 
 				foreach ($ids as $id) {
 					$object->Load($id);
 
 					switch ($event->Name) {
 						case 'OnMassApprove':
 							$object->SetDBField($status_field, 1);
 							break;
 
 						case 'OnMassDecline':
 							$object->SetDBField($status_field, 0);
 							break;
 
 						case 'OnMassMoveUp':
 							$object->SetDBField('Priority', $object->GetDBField('Priority') + 1);
 							break;
 
 						case 'OnMassMoveDown':
 							$object->SetDBField('Priority', $object->GetDBField('Priority') - 1);
 							break;
 					}
 
 					if ( $object->Update() ) {
 						switch ($event->Name) {
 							case 'OnMassApprove':
 								$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.APPROVED', $object->GetDBField('PortalUserId'));
 								$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.APPROVED');
 								break;
 							case 'OnMassDecline':
 								$this->Application->EmailEventUser('AFFILIATE.REGISTRATION.DENIED', $object->GetDBField('PortalUserId'));
 								$this->Application->EmailEventAdmin('AFFILIATE.REGISTRATION.DENIED');
 								break;
 						}
 						$event->status = kEvent::erSUCCESS;
 						$event->SetRedirectParam('opener', 's'); //stay!
 					}
 					else {
 						$event->status = kEvent::erFAIL;
 						$event->redirect = false;
 						break;
 					}
 				}
 			}
 		}
 
 		/**
 		 * Checks that user in affiliate record matches current user
 		 * (non permission-based)
 		 *
 		 * @param kEvent $event
 		 * @return bool
 		 * @access protected
 		 */
 		protected function checkItemStatus(kEvent $event)
 		{
 			if ( $this->Application->isAdminUser ) {
 				return true;
 			}
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
 
 			if ( !$object->isLoaded() ) {
 				return true;
 			}
 
 			return $object->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id');
 		}
 	}
\ No newline at end of file
Index: branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
--- branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php	(revision 15539)
+++ branches/5.2.x/units/taxesdestinations/taxes_dst_event_handler.php	(revision 15540)
@@ -1,174 +1,176 @@
 <?php
 /**
 * @version	$Id$
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
 * This software is protected by copyright law and international treaties.
 * Unauthorized reproduction or unlicensed usage of the code of this program,
 * or any portion of it may result in severe civil and criminal penalties,
 * and will be prosecuted to the maximum extent possible under the law
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
 
 class TaxDstEventHandler extends kDBEventHandler {
 
 	/**
 	 * Saves items
 	 *
 	 * @param kEvent $event
 	 */
 	function OnSaveDestinations($event)
 	{
 		$object = $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
 
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 		$tax_object = $this->Application->recallObject('tax');
 		/* @var $tax_object kDBItem */
 
 		$std_dest_id = $this->Application->GetVar('StatesCountry');
 
 		if ( $items_info ) {
 			$taxdest = $this->Application->recallObject($event->getPrefixSpecial(true), null);
 			/* @var $taxdest kDBItem */
 
 			$parent_info =& $object->GetLinkedInfo();
 
 			$queryDel = "DELETE FROM " . $object->TableName . " WHERE TaxZoneId=" . $parent_info['ParentId'];
 			$this->Conn->Query($queryDel);
 
 			foreach ($items_info as $field_values) {
 				if ( $tax_object->GetDBField('Type') == 3 && (!$field_values['DestValue'] || $field_values['DestValue'] == '') ) {
 					continue;
 				}
 
 				if ( !$field_values['StdDestId'] ) {
 					$field_values['StdDestId'] = $std_dest_id;
 				}
 
 				$field_values['TaxZoneId'] = $parent_info['ParentId'];
 
 				if ( $taxdest->Load($field_values['TaxZoneDestId'], "TaxZoneDestId") ) {
 					$taxdest->SetFieldsFromHash($field_values);
 					$taxdest->Update($field_values['TaxZoneDestId']);
 				}
 				else {
 					$taxdest->SetFieldsFromHash($field_values);
 					$taxdest->Create($field_values['TaxZoneDestId']);
 				}
 			}
 		}
 	}
 
 	/**
 	 * Creates new kDBItem
 	 *
 	 * @param kEvent $event
 	 * @return void
 	 * @access protected
 	 */
 	protected function OnCreate(kEvent $event)
 	{
 		$object = $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
 
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ( !$items_info ) {
 			return;
 		}
 
 		foreach ($items_info as $field_values) {
 			$object->SetFieldsFromHash($field_values);
 			$this->customProcessing($event, 'before');
 
 			if ( $object->Create() ) {
 				$this->customProcessing($event, 'after');
 			}
 			else {
 				$event->status = kEvent::erFAIL;
 				$event->redirect = false;
 				$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 				$object->setID(0);
 			}
 		}
 	}
 
 	/**
 	 * Apply custom processing to item
 	 *
 	 * @param kEvent $event
 	 * @param string $type
 	 * @return void
 	 * @access protected
 	 */
 	protected function customProcessing(kEvent $event, $type)
 	{
 		switch ($type) {
 			case 'before':
 				$object = $event->getObject();
 				/* @var $object kDBItem */
 
 				$events = $this->Application->GetVar('events');
 
 				if ( $events['tax'] == 'OnUpdate' ) {
 					$object->SetDBField('TaxZoneId', $this->Application->GetVar('tax_id'));
 				}
 
 				$tax_object = $this->Application->recallObject('tax');
 				/* @var $tax_object kDBItem */
 
 				if ( $tax_object->GetDBField('Type') == 3 ) {
 					$tax_object->SetDBField('StdDestId', $this->Application->GetVar('StatesCountry'));
 				}
 				break;
 		}
 	}
 
 	 /**
 	 *
 	 *
 	 * @param kEvent $event
 	 */
 	function OnZoneUpdate($event) {
 
 		$object = $event->getObject();
 		/* @var $object kDBItem */
 
-		$zone_object = &$this->Application->recallObject('tax');
+		$zone_object = $this->Application->recallObject('tax');
+		/* @var $zone_object kDBItem */
+
 		$zone_id = (int)$this->Application->GetVar('tax_id');
 		$zone_type = $zone_object->GetDBField('Type');
 
 		$delete_zones_sql = 'DELETE FROM '.$object->TableName.' WHERE TaxZoneId = '.$zone_id;
 		$this->Conn->Query($delete_zones_sql);
 
 		$selected_destinations = $this->Application->GetVar('selected_destinations');
 		$selected_destinations_array = explode(',', $selected_destinations);
 		$selected_destinations_array = array_unique($selected_destinations_array);
 
 		foreach ($selected_destinations_array as $key => $dest_id) {
 
 					if ($zone_object->GetDBField('Type') == 3){
 						list ($tax_dest_id, $dest_value) = explode('|', $dest_id);
 						$dest_id = $this->Application->GetVar('CountrySelector');
 					}
 					else {
 						$dest_value = '';
 					}
 
 					if ($dest_id > 0){
 						$object->SetDBField('TaxZoneId', $zone_id);
 						$object->SetDBField('StdDestId', $dest_id);
 						$object->SetDBField('DestValue', $dest_value);
 						$object->Create();
 					}
 
 		}
 
 
 	}
 
 }
\ No newline at end of file