Index: branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
diff -u -N -r13845 -r14099
--- branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 13845)
+++ branches/5.2.x/units/shipping_costs/shipping_costs_event_handler.php	(.../shipping_costs_event_handler.php)	(revision 14099)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_costs_event_handler.php 13745 2010-06-09 17:32:28Z alex $
+* @version	$Id: shipping_costs_event_handler.php 14099 2010-12-28 18:08:32Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -55,12 +55,12 @@
 
 				if( $object->Create() ) {
 					$this->customProcessing($event,'after');
-					$event->status = erSUCCESS;
+					$event->status = kEvent::erSUCCESS;
 				}
 				else {
-					$event->status = erFAIL;
+					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
-					$this->Application->SetVar($event->Prefix_Special.'_SaveEvent','OnCreate');
+					$this->Application->SetVar($event->getPrefixSpecial().'_SaveEvent','OnCreate');
 					$object->setID(0);
 				}
 			}
@@ -146,7 +146,7 @@
 	/*	$shipping_event = new kEvent();
 		$shipping_event->Init('s');
 		$shipping_event->Name = 'OnPreSave';
-		$shipping_event->status = erFATAL;
+		$shipping_event->status = kEvent::erFATAL;
 		$this->Application->HandleEvent(&$shipping_event);*/
 	}
 
@@ -165,7 +165,7 @@
 		$sql = 'DELETE FROM '.$object->TableName.' WHERE ZoneID IN ('.implode(',', $res).')';
 		$this->Conn->Query($sql);
 
-		$event->redirect_params = Array('opener' => 's', 'pass_events' => false);
+		$event->setRedirectParams(Array('opener' => 's', 'pass_events' => false), true);
 		$event->status=erSUCCESS;
 	}
 
@@ -190,11 +190,16 @@
 		}
 	}
 
+	/**
+	 * Enter description here...
+	 *
+	 * @param kEvent $event
+	 */
 	function OnSaveCreated(&$event)
 	{
 		$event->CallSubEvent('OnCreate');
 		$event->redirect = false;
-		$event->redirect_params = Array('opener'=>'s','pass'=>'all');
+		$event->setRedirectParams(Array('opener'=>'s','pass'=>'all'), true);
 	}
 
 	function OnAfterCopyToTemp(&$event)
@@ -207,7 +212,7 @@
 		$lang_object =& $this->Application->recallObject('lang.current');
 		// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
 		if ($shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2) {
-			$object->SetDBField('PerUnit', $object->GetDBField('PerUnit') * POUND_TO_KG);
+			$object->SetDBField('PerUnit', $object->GetDBField('PerUnit') * kUtil::POUND_TO_KG);
 			$object->Update(null, true);
 		}
 	}
@@ -223,7 +228,7 @@
 		$lang_object =& $this->Application->recallObject('lang.current');
 		// by weight and US/UK system - we need to store recalculated price per Kg cause shipping calculation is done per Kg!
 		if ($shipping_obj->GetDBField('Type') == 1 && $lang_object->GetDBField('UnitSystem') == 2) {
-			$object->SetDBField('PerUnit', $object->GetDBField('PerUnit') / POUND_TO_KG);
+			$object->SetDBField('PerUnit', $object->GetDBField('PerUnit') / kUtil::POUND_TO_KG);
 			$object->Update(null, true);
 		}
 	}