Index: branches/5.2.x/units/coupons/coupons_event_handler.php
===================================================================
diff -u -N -r14641 -r14677
--- branches/5.2.x/units/coupons/coupons_event_handler.php	(.../coupons_event_handler.php)	(revision 14641)
+++ branches/5.2.x/units/coupons/coupons_event_handler.php	(.../coupons_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupons_event_handler.php 14641 2011-10-05 15:31:23Z alex $
+* @version	$Id: coupons_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class CouponsEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/coupon_items/coupon_items_event_handler.php
===================================================================
diff -u -N -r14258 -r14677
--- branches/5.2.x/units/coupon_items/coupon_items_event_handler.php	(.../coupon_items_event_handler.php)	(revision 14258)
+++ branches/5.2.x/units/coupon_items/coupon_items_event_handler.php	(.../coupon_items_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: coupon_items_event_handler.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: coupon_items_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class CouponItemsEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/discount_items/discount_items_event_handler.php
===================================================================
diff -u -N -r14258 -r14677
--- branches/5.2.x/units/discount_items/discount_items_event_handler.php	(.../discount_items_event_handler.php)	(revision 14258)
+++ branches/5.2.x/units/discount_items/discount_items_event_handler.php	(.../discount_items_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: discount_items_event_handler.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: discount_items_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class DiscountItemsEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_costs_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: shipping_costs_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class ShippingCostsEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/brackets/brackets_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/brackets/brackets_event_handler.php	(.../brackets_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/brackets/brackets_event_handler.php	(.../brackets_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: brackets_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: brackets_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class BracketsEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/orders/orders_event_handler.php
===================================================================
diff -u -N -r14641 -r14677
--- branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14641)
+++ branches/5.2.x/units/orders/orders_event_handler.php	(.../orders_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: orders_event_handler.php 14641 2011-10-05 15:31:23Z alex $
+* @version	$Id: orders_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -85,7 +85,7 @@
 	}
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/payment_type/payment_type_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/payment_type/payment_type_event_handler.php	(.../payment_type_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/payment_type/payment_type_event_handler.php	(.../payment_type_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: payment_type_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: payment_type_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -29,7 +29,7 @@
 	}
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(.../affiliate_plans_brackets_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(.../affiliate_plans_brackets_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliate_plans_brackets_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: affiliate_plans_brackets_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 	class AffiliatePlansBracketsEventHandler extends kDBEventHandler {
 
 		/**
-		 * Allows to override standart permission mapping
+		 * Allows to override standard permission mapping
 		 *
 		 */
 		function mapPermissions()
Index: branches/5.2.x/units/shipping/shipping_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/shipping/shipping_event_handler.php	(.../shipping_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/shipping/shipping_event_handler.php	(.../shipping_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: shipping_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class ShippingEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/currencies/currencies_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/currencies/currencies_event_handler.php	(.../currencies_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/currencies/currencies_event_handler.php	(.../currencies_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: currencies_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: currencies_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class CurrenciesEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
@@ -134,7 +134,7 @@
 	protected function OnSave(&$event)
 	{
 		$this->Application->StoreVar('saved_curr_ids', $this->Application->RecallVar($event->Prefix . '_selected_ids'));
-		
+
 		parent::OnSave($event);
 	}
 
Index: branches/5.2.x/units/products/products_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/products/products_event_handler.php	(.../products_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: products_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class ProductsEventHandler extends kCatDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
@@ -361,7 +361,7 @@
 
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
-		
+
 		$object->SetDBField('Type', $this->Application->GetVar($event->getPrefixSpecial(true) . '_new_type'));
 	}
 
Index: branches/5.2.x/units/manufacturers/manufacturers_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/manufacturers/manufacturers_event_handler.php	(.../manufacturers_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/manufacturers/manufacturers_event_handler.php	(.../manufacturers_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: manufacturers_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: manufacturers_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class ManufacturersEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/affiliates/affiliates_tag_processor.php
===================================================================
diff -u -N -r14656 -r14677
--- branches/5.2.x/units/affiliates/affiliates_tag_processor.php	(.../affiliates_tag_processor.php)	(revision 14656)
+++ branches/5.2.x/units/affiliates/affiliates_tag_processor.php	(.../affiliates_tag_processor.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_tag_processor.php 14656 2011-10-11 16:16:08Z alex $
+* @version	$Id: affiliates_tag_processor.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -107,26 +107,28 @@
 		function UserLink($params)
 		{
 			$object =& $this->getObject($params);
+			/* @var $object kDBItem */
+
 			$user_id = $object->GetDBField('PortalUserId');
 
-			if ($user_id) {
-				$url_params =  Array (
-					'm_opener' => 'd',
-					'u_mode' => 't',
-					'u_event' => 'OnEdit',
-					'u_id' => $user_id,
-					'pass' => 'all,u'
-				);
-
-				return $this->Application->HREF($params['edit_template'], '', $url_params);
+			if ( !$user_id ) {
+				return '';
 			}
+
+			$url_params =  Array (
+				'm_opener' => 'd',
+				'u_mode' => 't',
+				'u_event' => 'OnEdit',
+				'u_id' => $user_id,
+				'pass' => 'all,u'
+			);
+
+			return $this->Application->HREF($params['edit_template'], '', $url_params);
 		}
 
 		function CurrentUserAffiliateField($params)
 		{
-			$object =& $this->Application->recallObject( $this->getPrefixSpecial(), $this->Prefix, array_merge($params, Array('skip_autoload' => true)) );
-			$object->Load( Array('PortalUserId'=>$this->Application->RecallVar('user_id')) );
-			return $object->GetField($this->SelectParam($params, 'field,name'));
+			return $this->Application->ProcessParsedTag($this->Prefix . '.user', 'Field', $params);
 		}
 
 		function IsAffiliateOrRegisterAsAffiliateAllowed($params)
Index: branches/5.2.x/units/pricing/pricing_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/pricing/pricing_event_handler.php	(.../pricing_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: pricing_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: pricing_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -17,7 +17,7 @@
 class PricingEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
@@ -152,16 +152,16 @@
 				$this->Application->SetVar($event->getPrefixSpecial(true), $temp);
 				$event->CallSubEvent('OnPreSaveBrackets');
 				break;
-				
-			case 'OnDeleteBrackets':				
+
+			case 'OnDeleteBrackets':
 				if ($group_id) {
 					$temp = ''; // delete all pricings from "pr_tang" var
-					
-					$sql = 'DELETE FROM ' . $bracket->TableName . ' 
+
+					$sql = 'DELETE FROM ' . $bracket->TableName . '
 							WHERE ProductId = ' . $this->Application->GetVar('p_id') . ' AND GroupId = ' . $group_id;
 					$this->Conn->Query($sql);
-				}				
-				break;	
+				}
+				break;
 
 			default:
 		}
@@ -172,27 +172,27 @@
 	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 . ' 
+					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 => $values) {
 
 				if (in_array($item_id, $stored_ids)) { //if it's already exist
 					$object->Load($item_id);
 					$object->SetFieldsFromHash($values);
-					
+
 					if (!$object->Validate()) {
 						unset($stored_ids[array_search($item_id, $stored_ids)]);
 						$event->redirect = false;
Index: branches/5.2.x/units/zones/zones_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/zones/zones_event_handler.php	(.../zones_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/zones/zones_event_handler.php	(.../zones_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: zones_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: zones_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class ZonesEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/taxes/taxes_event_handler.php
===================================================================
diff -u -N -r14625 -r14677
--- branches/5.2.x/units/taxes/taxes_event_handler.php	(.../taxes_event_handler.php)	(revision 14625)
+++ branches/5.2.x/units/taxes/taxes_event_handler.php	(.../taxes_event_handler.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: taxes_event_handler.php 14625 2011-10-04 09:34:12Z alex $
+* @version	$Id: taxes_event_handler.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class TaxesEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()
Index: branches/5.2.x/units/gift_certificates/gift_certificates_eh.php
===================================================================
diff -u -N -r14641 -r14677
--- branches/5.2.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 14641)
+++ branches/5.2.x/units/gift_certificates/gift_certificates_eh.php	(.../gift_certificates_eh.php)	(revision 14677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: gift_certificates_eh.php 14641 2011-10-05 15:31:23Z alex $
+* @version	$Id: gift_certificates_eh.php 14677 2011-10-19 08:32:00Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -16,7 +16,7 @@
 class GiftCertificateEventHandler extends kDBEventHandler {
 
 	/**
-	 * Allows to override standart permission mapping
+	 * Allows to override standard permission mapping
 	 *
 	 */
 	function mapPermissions()