In-Portal Issue Tracker

Index: custom/units/sections/articles/e_article_eh.php
===================================================================
--- custom/units/sections/articles/e_article_eh.php	(revision 14590)
+++ custom/units/sections/articles/e_article_eh.php	(working copy)
@@ -28,11 +28,13 @@
 		}
 
 		/**
-		 * Permission exceptions
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -66,11 +68,14 @@
 		}
 
 		/**
-		 * Sets custom query for the list
+		 * Filters out archived articles
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -89,11 +94,13 @@
 		}
 
 		/**
-		 * Before new item created
+		 * Create missing excerpt
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -101,11 +108,13 @@
 		}
 
 		/**
-		 * Before existing item updated
+		 * Create missing excerpt
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -136,13 +145,14 @@
 
 		}
 
-
 		/**
-		 * After new item created
+		 * Sets values for import process
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -174,11 +184,14 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Occurs after loading item, 'id' parameter
+		 * allows to get id of item that was loaded
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/categories/e_category_eh.php
===================================================================
--- custom/units/sections/categories/e_category_eh.php	(revision 14590)
+++ custom/units/sections/categories/e_category_eh.php	(working copy)
@@ -28,11 +28,13 @@
 		}
 
 		/**
-		 * Permission exceptions
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -66,11 +68,14 @@
 		}
 
 		/**
-		 * Sets custom query for the list
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -89,11 +94,13 @@
 		}
 
 		/**
-		 * Before new item created
+		 * Sets correct status for new categories created on front-end
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -101,11 +108,13 @@
 		}
 
 		/**
-		 * Before existing item updated
+		 * Sets correct status for new categories created on front-end
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -136,13 +145,14 @@
 
 		}
 
-
 		/**
-		 * After new item created
+		 * Occurs after creating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -174,11 +184,13 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Removes this item and it's children (recursive) from structure dropdown
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/links/e_link_eh.php
===================================================================
--- custom/units/sections/links/e_link_eh.php	(revision 14590)
+++ custom/units/sections/links/e_link_eh.php	(working copy)
@@ -28,11 +28,13 @@
 		}
 
 		/**
-		 * Permission exceptions
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -66,11 +68,14 @@
 		}
 
 		/**
-		 * Sets custom query for the list
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -89,11 +94,13 @@
 		}
 
 		/**
-		 * Before new item created
+		 * Makes reciprocal check on link, when it is created
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -101,11 +108,13 @@
 		}
 
 		/**
-		 * Before existing item updated
+		 * Makes reciprocal check on link, when it is updated
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -138,11 +147,13 @@
 
 
 		/**
-		 * After new item created
+		 * Sets values for import process
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -174,11 +185,14 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Occurs after loading item, 'id' parameter
+		 * allows to get id of item that was loaded
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/products/e_product_eh.php
===================================================================
--- custom/units/sections/products/e_product_eh.php	(revision 14590)
+++ custom/units/sections/products/e_product_eh.php	(working copy)
@@ -28,11 +28,13 @@
 		}
 
 		/**
-		 * Permission exceptions
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -67,11 +69,14 @@
 		}
 
 		/**
-		 * Sets custom query for the list
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -90,11 +95,13 @@
 		}
 
 		/**
-		 * Before new item created
+		 * Sets default processing data for subscriptions
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -102,11 +109,13 @@
 		}
 
 		/**
-		 * Before existing item updated
+		 * Moves item to preferred category, updates item hits
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -137,13 +146,14 @@
 
 		}
 
-
 		/**
-		 * After new item created
+		 * Set new price to ProductsPricing
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -175,11 +185,14 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Occurs after loading item, 'id' parameter
+		 * allows to get id of item that was loaded
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/reviews/e_review_eh.php
===================================================================
--- custom/units/sections/reviews/e_review_eh.php	(revision 14590)
+++ custom/units/sections/reviews/e_review_eh.php	(working copy)
@@ -26,13 +26,14 @@
 //			$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
 		}
 
-				
 		/**
-		 * Before new item created
+		 * Prefills all fields on front-end
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -40,11 +41,13 @@
 		}
 
 		/**
-		 * Before existing item updated
+		 * Sets correct rating value
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -77,11 +80,13 @@
 
 
 		/**
-		 * After new item created
+		 * Updates item review counter
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -113,11 +118,14 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Occurs after loading item, 'id' parameter
+		 * allows to get id of item that was loaded
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/users/e_user_eh.php
===================================================================
--- custom/units/sections/users/e_user_eh.php	(revision 14590)
+++ custom/units/sections/users/e_user_eh.php	(working copy)
@@ -28,11 +28,13 @@
 		}
 
 		/**
-		 * Permission exceptions
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -66,11 +68,14 @@
 		}
 
 		/**
-		 * Sets custom query for the list
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -89,11 +94,13 @@
 		}
 
 		/**
-		 * Before new item created
+		 * Set's new unique resource id to user
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -101,11 +108,13 @@
 		}
 
 		/**
-		 * Before existing item updated
+		 * Checks state against country
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -138,11 +147,13 @@
 
 
 		/**
-		 * After new item created
+		 * Redirects user after successful registration to confirmation template (on Front only)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -174,11 +185,13 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Loads user images
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/widgets/widget_eh.php
===================================================================
--- custom/units/widgets/widget_eh.php	(revision 14590)
+++ custom/units/widgets/widget_eh.php	(working copy)
@@ -25,11 +25,13 @@
 		}
 
 		/**
-		 * Permission exceptions
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -55,11 +57,14 @@
 		}
 
 		/**
-		 * Set custom query for the list
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -73,22 +78,26 @@
 		}
 
 		/**
-		 * Before new item created
+		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 		}
 
 		/**
-		 * Before existing item updated
+		 * Occurs before updating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -120,11 +129,13 @@
 
 
 		/**
-		 * After new item created
+		 * Occurs after creating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -156,11 +167,13 @@
 		}
 
 		/**
-		 * After item loaded
+		 * Loads user images
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: in-auction/units/category_listing/category_listing_eh.php
===================================================================
--- in-auction/units/category_listing/category_listing_eh.php	(revision 14590)
+++ in-auction/units/category_listing/category_listing_eh.php	(working copy)
@@ -26,11 +26,13 @@
 		}
 
 		/**
-		 * Changes permission section to one from REQUEST, not from config
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 //			$sql = 'SELECT Prefix
 //					FROM '.TABLE_PREFIX.'ItemTypes
@@ -124,15 +126,31 @@
 			}
 		}
 
-		function OnBeforeItemUpdate(&$event)
+		/**
+		 * Occurs before updating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
+			
 			$this->ValidateCategories($event);
 		}
 
-		function OnBeforeItemCreate(&$event)
+		/**
+		 * Occurs before creating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
+
 			$this->ValidateCategories($event);
 		}
 
Index: in-auction/units/error_log/error_log_eh.php
===================================================================
--- in-auction/units/error_log/error_log_eh.php	(revision 14590)
+++ in-auction/units/error_log/error_log_eh.php	(working copy)
@@ -26,13 +26,15 @@
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
-
 		/**
 		 * Select products by clipboard instead of listings
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
Index: in-auction/units/listing/listing_eh.php
===================================================================
--- in-auction/units/listing/listing_eh.php	(revision 14590)
+++ in-auction/units/listing/listing_eh.php	(working copy)
@@ -87,8 +87,11 @@
 		 * Select products by clipboard instead of listings
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -301,8 +304,11 @@
 		 * Apply custom processing to item
 		 *
 		 * @param kEvent $event
+		 * @param string $type
+		 * @return void
+		 * @access protected
 		 */
-		function customProcessing(&$event, $type)
+		protected function customProcessing(&$event, $type)
 		{
 
 			if ($event->Name == 'OnMassDelete' && $type == 'before') {
Index: in-auction/units/product_listing/product_listing_eh.php
===================================================================
--- in-auction/units/product_listing/product_listing_eh.php	(revision 14590)
+++ in-auction/units/product_listing/product_listing_eh.php	(working copy)
@@ -26,13 +26,14 @@
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
-
 		/**
 		 * Changes permission section to one from REQUEST, not from config
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 //			$sql = 'SELECT Prefix
 //					FROM '.TABLE_PREFIX.'ItemTypes
@@ -150,16 +151,31 @@
 			}
 		}
 
-
-		function OnBeforeItemUpdate(&$event)
+		/**
+		 * Occurs before updating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
+			
 			$this->ValidateCategories($event);
 		}
 
-		function OnBeforeItemCreate(&$event)
+		/**
+		 * Occurs before creating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
+			
 			$this->ValidateCategories($event);
 		}
 
Index: in-auction/units/shipping/shipping_eh.php
===================================================================
--- in-auction/units/shipping/shipping_eh.php	(revision 14590)
+++ in-auction/units/shipping/shipping_eh.php	(working copy)
@@ -32,8 +32,15 @@
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
-
-		function SetCustomQuery(&$event)
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
 			$object =& $event->getObject();
 
Index: in-bulletin/units/poll_comments/poll_comment_eh.php
===================================================================
--- in-bulletin/units/poll_comments/poll_comment_eh.php	(revision 14590)
+++ in-bulletin/units/poll_comments/poll_comment_eh.php	(working copy)
@@ -45,8 +45,11 @@
 		 * Applies special filter, that allows to select all commented from current poll
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			if ($this->Application->isAdminUser) {
 				return ;
@@ -59,48 +62,41 @@
 		}
 
 		/**
-		 * Before New PollComment created
+		 * Occurs before creating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
-			if ($this->Application->isAdminUser) {
+			if ( $this->Application->isAdminUser ) {
 				return ;
 			}
 
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			// get Poll info
-			$parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix');
-			if($parent_prefix) {
-				$main_object =& $this->Application->recallObject($parent_prefix.'.'.$special, null,Array('raise_warnings' => 0));
-				/* @var $main_object kDBItem */
+			$parent_info = $object->getLinkedInfo($event->Special);
+			$poll_id = $parent_info['ParentId'];
 
-				if (!$main_object->isLoaded()) {
-					$main_object =& $this->Application->recallObject($parent_prefix);
-				}
-
-				$poll_id = $main_object->GetDBField($this->Application->getUnitOption($event->Prefix, 'ForeignKey'));
-			}
-
-			if ($poll_id) {
+			if ( $poll_id ) {
 				$spam_helper =& $this->Application->recallObject('SpamHelper');
 				/* @var $spam_helper SpamHelper */
 
 				$spam_helper->InitHelper($poll_id, 'PollComment', 0); // ResourceId used for SpamControl only
 
-				if ($spam_helper->InSpamControl()) {
+				if ( $spam_helper->InSpamControl() ) {
 					$event->status = kEvent::erFAIL;
 					$object->SetError('CommentText', 'too_frequent', 'lu_error_AlreadyCommented');
 					return ;
 				}
+
+				$object->SetDBField('PollId', $poll_id); // PollId
 			}
 
 			$object->SetDBField('CreatedById', $this->Application->RecallVar('user_id'));
 			$object->SetDBField('UserIP', $_SERVER['REMOTE_ADDR']);
-			$object->SetDBField('PollId', $poll_id); // PollId
 			$object->SetDBField('Status', STATUS_ACTIVE);
 
 			parent::OnBeforeItemCreate($event);
@@ -127,17 +123,22 @@
 		}
 
 		/**
-		 * Updates item review counter
+		 * Protects against spam
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
-			if (!$this->Application->isAdminUser) {
+			parent::OnAfterItemCreate($event);
+
+			if ( !$this->Application->isAdminUser ) {
 				$spam_helper =& $this->Application->recallObject('SpamHelper');
 				/* @var $spam_helper SpamHelper */
 
 				$object =& $event->getObject();
+				/* @var $object kDBItem */
 
 				$comment_settings = 'poll_CommentDelay_Value:poll_CommentDelay_Interval';
 				$spam_helper->InitHelper($object->GetDBField('PollId'), 'PollComment', $comment_settings);
Index: in-bulletin/units/polls/poll_eh.php
===================================================================
--- in-bulletin/units/polls/poll_eh.php	(revision 14590)
+++ in-bulletin/units/polls/poll_eh.php	(working copy)
@@ -35,8 +35,11 @@
 		 * Applies special filter, that allows to select all poll from given date range
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			if ($this->Application->isAdminUser) {
 				return ;
@@ -73,12 +76,16 @@
 		}
 
 		/**
-		 * Reset votes statistics for current poll
+		 * Sets resource id
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
+			parent::OnBeforeItemCreate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
Index: in-bulletin/units/posts/post_eh.php
===================================================================
--- in-bulletin/units/posts/post_eh.php	(revision 14590)
+++ in-bulletin/units/posts/post_eh.php	(working copy)
@@ -20,8 +20,10 @@
 		 * Checks topic-post modify and delete permissions
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$events = Array('OnUpdate', 'OnDelete');
 			if (in_array($event->Name, $events)) {
@@ -35,9 +37,13 @@
 		 * Sets default values
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
+			parent::OnBeforeItemCreate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -56,8 +62,8 @@
 			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
 
 			$sql = 'SELECT Login
-					FROM '.TABLE_PREFIX.'PortalUser
-					WHERE PortalUserId = '.$user_id;
+					FROM ' . TABLE_PREFIX . 'PortalUser
+					WHERE PortalUserId = ' . $user_id;
 			$object->SetDBField('PosterAlias', $this->Conn->GetOne($sql));
 
 			// set post options
@@ -108,16 +114,20 @@
 		 * Ensures, that only user with permission will update topic
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
+			parent::OnBeforeItemUpdate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
 			$perm_status = $this->checkPostPermission($event, 'TOPIC.REPLY.MODIFY|TOPIC.REPLY.OWNER.MODIFY');
-			if (!$perm_status) {
+			if ( !$perm_status ) {
 				$event->status = kEvent::erFAIL;
-				return ;
+				return;
 			}
 
 			$post_helper =& $this->Application->recallObject('PostHelper');
@@ -164,9 +174,13 @@
 		 * Sets post options to virtual fields
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
+			parent::OnAfterItemLoad($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -175,6 +189,7 @@
 
 			$options_map = $post_helper->getOptionsMap();
 			$post_options = $object->GetDBField('Options');
+			
 			foreach ($options_map as $option_name => $field_name) {
 				$option_value = $post_helper->GetPostOption($option_name, $post_options);
 				$object->SetDBField($field_name, (int)$option_value);
@@ -185,9 +200,13 @@
 		 * Updates cached post counter in topic
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
+			parent::OnAfterItemCreate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -206,17 +225,17 @@
 			$category_id = $this->Application->GetVar('m_cat_id');
 			$post_helper->PropagateCategoryField($category_id, 'Modified', $object->GetDBField('CreatedOn'));
 
-			if (!$this->Application->isAdmin && $main_object->GetDBField('Posts')) {
+			if ( !$this->Application->isAdmin && $main_object->GetDBField('Posts') ) {
 				// don't send any email events when in admin OR new topic just added (0 posts)
 
 				$user_notified = false; // don't send POST.ADD event twice to same user (in case if owner adds new post)
-				if ($main_object->GetDBField('NotifyOwnerOnChanges')) {
+				if ( $main_object->GetDBField('NotifyOwnerOnChanges') ) {
 					$user_notified = $main_object->GetDBField('OwnerId');
 					$this->Application->EmailEventUser('POST.ADD', $user_notified);
 				}
 
 				$post_owner_id = $object->GetDBField('CreatedById');
-				if (($post_owner_id > 0) && ($user_notified != $post_owner_id)) {
+				if ( ($post_owner_id > 0) && ($user_notified != $post_owner_id) ) {
 					$this->Application->EmailEventUser('POST.ADD', $post_owner_id);
 				}
 
@@ -230,12 +249,14 @@
 			$posts_count = $post_helper->updatePostCount($topic_id, +1);
 			$main_object->SetDBField('Posts', $posts_count);
 
-			// autolock topic after N number of posts (if option enabled)
+			// auto-lock topic after N number of posts (if option enabled)
 			$auto_lock = $this->Application->ConfigValue('AutoTopicLockPosts');
-			if ((int)$auto_lock > 0) {
-				if ($posts_count >= $auto_lock) {
+			
+			if ( (int)$auto_lock > 0 ) {
+				if ( $posts_count >= $auto_lock ) {
 					// user has unlocked topic after $auto_lock and posts again -> ensure that topic will be locked again
-					$this->Application->HandleEvent($parent_prefix.':OnTopicLockToggle');
+					$lock_event = new kEvent($parent_prefix . ':OnTopicLockToggle');
+					$this->Application->HandleEvent($lock_event);
 				}
 			}
 		}
Index: in-bulletin/units/private_message_body/private_message_body_eh.php
===================================================================
--- in-bulletin/units/private_message_body/private_message_body_eh.php	(revision 14590)
+++ in-bulletin/units/private_message_body/private_message_body_eh.php	(working copy)
@@ -20,9 +20,13 @@
 		 * Sets default values
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
+			parent::OnBeforeItemCreate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
Index: in-bulletin/units/private_messages/private_message_eh.php
===================================================================
--- in-bulletin/units/private_messages/private_message_eh.php	(revision 14590)
+++ in-bulletin/units/private_messages/private_message_eh.php	(working copy)
@@ -32,8 +32,11 @@
 		 * Applies folder & message owner filter to message list
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			$folder_id = $this->Application->GetVar('folder_id');
 			if ($folder_id === false) {
@@ -58,13 +61,17 @@
 		 * Puts message to Sent folder
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
+			parent::OnBeforeItemCreate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($object->GetDBField('FolderId') != PM_FOLDER_SENT) {
+			if ( $object->GetDBField('FolderId') != PM_FOLDER_SENT ) {
 				// when creating "Inbox" message (from "Sent" message) don't reset folder & status
 				return ;
 			}
@@ -79,8 +86,10 @@
 		 * Creates 1st post when topic is created
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -89,14 +98,14 @@
 
 			$this->Application->EmailEventUser('PM.ADD', $object->GetDBField('ToId'));
 
-			if ($object->GetDBField('FolderId') != PM_FOLDER_SENT) {
+			if ( $object->GetDBField('FolderId') != PM_FOLDER_SENT ) {
 				// 1. create message in sender's "Sent" folder (this method only for this step)
 				// 2. create message body (shared)
 				// 3. create message copy in recipient's "Inbox" folder
 				return ;
 			}
 
-			$message_body =& $this->Application->recallObject($event->Prefix.'-body', null, Array ('skip_autoload' => true));
+			$message_body =& $this->Application->recallObject($event->Prefix . '-body', null, Array ('skip_autoload' => true));
 			/* @var $message_body kDBItem */
 
 			// 1. create message body (for sender & recipient)
@@ -104,7 +113,7 @@
 			$message_body->SetDBFieldsFromHash($object->GetFieldValues(), $copy_fields);
 
 			$body_created = $message_body->Create();
-			if ($body_created) {
+			if ( $body_created ) {
 				// 2. link body with message
 				$object->SetDBField('PMBodyId', $message_body->GetID());
 				$object->Update();
@@ -120,9 +129,13 @@
 		 * Sets post options to virtual fields
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
+			parent::OnAfterItemLoad($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -131,6 +144,7 @@
 
 			$options_map = $post_helper->getOptionsMap();
 			$post_options = $object->GetDBField('Options');
+			
 			foreach ($options_map as $option_name => $field_name) {
 				$option_value = $post_helper->GetPostOption($option_name, $post_options);
 				$object->SetDBField($field_name, (int)$option_value);
Index: in-bulletin/units/topics/topics_event_handler.php
===================================================================
--- in-bulletin/units/topics/topics_event_handler.php	(revision 14590)
+++ in-bulletin/units/topics/topics_event_handler.php	(working copy)
@@ -16,13 +16,14 @@
 
 	class TopicsEventHandler extends kCatDBEventHandler {
 
-
 		/**
 		 * Checks topic lock permission
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			if ($event->Name == 'OnTopicLockToggle') {
 				$object =& $event->getObject();
@@ -64,8 +65,10 @@
 		 * Cache topic owner
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -76,8 +79,10 @@
 		 * Cache topic owner
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -86,26 +91,28 @@
 			$object =& $event->getObject();
 			/* @var $object kCatDBItem */
 
-			if (!$object->GetDBField('TodayDate')) {
+			if ( !$object->GetDBField('TodayDate') ) {
 				$object->SetDBField('TodayDate', adodb_date('Y-m-d'));
 			}
 
 			$post_helper =& $this->Application->recallObject('PostHelper');
 			/* @var $post_helper PostHelper */
 
-			$object->SetDBField('TopicText', $post_helper->CensorText( $object->GetDBField('TopicText') ));
+			$object->SetDBField('TopicText', $post_helper->CensorText($object->GetDBField('TopicText')));
 		}
 
 		/**
 		 * Creates 1st post when topic is created
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
 			parent::OnAfterItemCreate($event);
 
-			if ($event->Special == '-item') {
+			if ( $event->Special == '-item' ) {
 				// don't create first post when cloning
 				return ;
 			}
@@ -113,7 +120,7 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			$post =& $this->Application->recallObject($event->Prefix.'-post', null, Array ('skip_autoload' => true));
+			$post =& $this->Application->recallObject($event->Prefix . '-post', null, Array ('skip_autoload' => true));
 			/* @var $post kDBItem */
 
 			$post->SetDBField('Pending', $object->GetDBField('Status') == STATUS_ACTIVE ? 0 : 1);
@@ -157,18 +164,20 @@
 		}
 
 		/**
-		 * Makes first post body field non-requered when topic has posts already
+		 * Makes first post body field non-required when topic has posts already
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
 			$object =& $event->getObject();
 			/* @var $object kCatDBItem */
 
-			if ($object->GetDBField('Posts') > 0 || !$this->Application->isAdminUser) {
+			if ( $object->GetDBField('Posts') > 0 || !$this->Application->isAdminUser ) {
 				$object->setRequired('PostingText', false);
 			}
 		}
Index: in-commerce/units/addresses/addresses_event_handler.php
===================================================================
--- in-commerce/units/addresses/addresses_event_handler.php	(revision 14590)
+++ in-commerce/units/addresses/addresses_event_handler.php	(working copy)
@@ -40,11 +40,14 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			if ($this->Application->isAdminUser) {
 				return ;
@@ -76,13 +79,17 @@
 		 * Ensures, that user have only one "use as billing" / "use as shipping" address
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
+			parent::OnBeforeItemUpdate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if (!$object->isLoaded() || !$this->checkItemStatus($event)) {
+			if ( !$object->isLoaded() || !$this->checkItemStatus($event) ) {
 				// not trivially loaded object OR not current user address
 				$event->status = kEvent::erPERM_FAIL;
 				return ;
@@ -139,8 +146,10 @@
 		 * Fills states for object country
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(&$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -284,10 +293,14 @@
 		 * Disables Guest ability to create addresses
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
-			if (!$this->Application->LoggedIn()) {
+			parent::OnBeforeItemCreate($event);
+
+			if ( !$this->Application->LoggedIn() ) {
 				$event->status = kEvent::erPERM_FAIL;
 				return ;
 			}
Index: in-commerce/units/affiliate_payment_types/affiliate_payment_types_event_handler.php
===================================================================
--- in-commerce/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(revision 14590)
+++ in-commerce/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(working copy)
@@ -15,12 +15,21 @@
 
 	class AffiliatePaymentTypesEventHandler extends kDBEventHandler  {
 
-		function SetCustomQuery(&$event)
+		/**
+		 * Lists only active affiliate payment types on Front-End
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
-			if($event->Special == 'active')
-			{
+			if ( !$this->Application->isAdmin ) {
 				$object =& $event->getObject();
-				$object->addFilter('active', '%1$s.Status = 1');
+				/* @var $object kDBList */
+
+				$object->addFilter('active', '%1$s.Status = ' . STATUS_ACTIVE);
 			}
 		}
 
@@ -38,51 +47,74 @@
 
 
 		/**
-		 * Enter description here...
+		 * Ensures, that user have only one "use as billing" / "use as shipping" address
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
+			parent::OnBeforeItemUpdate($event);
+
+			$this->itemChanged($event);
+		}
+
+		/**
+		 * Occurs before creating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(&$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()) {
-				$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-				$sql = 'UPDATE '.$table_name.' SET IsPrimary = 0';
+			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') );
+				$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
 				$object->SetDBField($status_field, 1);
 			}
 		}
 
-		function OnBeforeItemCreate(&$event)
+		/**
+		 * Don't allow to delete primary affiliate payment type
+		 *
+		 * @param kEvent $event
+		 * @param string $type
+		 * @return void
+		 * @access protected
+		 */
+		protected function customProcessing(&$event, $type)
 		{
-			$this->OnBeforeItemUpdate($event);
-		}
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+				$ids = $event->getEventParam('ids');
 
-		function OnMassDelete(&$event)
-		{
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
+				$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
+						FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+						WHERE IsPrimary = 1';
+				$primary_id = $this->Conn->GetOne($sql);
 
-			$this->StoreSelectedIDs($event);
-			$event->setEventParam('ids', $this->getSelectedIDs($event) );
-			$ids = $event->getEventParam('ids');
+				$ids = array_diff($ids, Array ($primary_id));
 
-			$temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-
-			$sql = 'SELECT AffiliatePlanId FROM '.$this->Application->getUnitOption('ap', 'TableName').'
-					WHERE IsPrimary = 1';
-			$primary_id = $this->Conn->GetOne($sql);
-			$ids = array_diff($ids, Array($primary_id));
-
-			if($ids)
-			{
-				$temp->DeleteItems($event->Prefix, $event->Special, $ids);
+				$event->setEventParam('ids', $ids);
 			}
-			$this->clearSelectedIDs($event);
 		}
 	}
\ No newline at end of file
Index: in-commerce/units/affiliate_payments/affiliate_payments_event_handler.php
===================================================================
--- in-commerce/units/affiliate_payments/affiliate_payments_event_handler.php	(revision 14590)
+++ in-commerce/units/affiliate_payments/affiliate_payments_event_handler.php	(working copy)
@@ -16,27 +16,34 @@
 	class AffiliatePaymentsEventHandler extends kDBEventHandler {
 
 		/**
-		 * Enter description here...
+		 * Apply some special processing to object being
+		 * recalled before using it in other events that
+		 * call prepareObject
 		 *
-		 * @param kDBItem $object
+		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function prepareObject(&$object, &$event)
+		protected function prepareObject(&$object, &$event)
 		{
-			if($event->Special == 'log') return false;
+			if ( $event->Special == 'log' ) {
+				return ;
+			}
 
 			$parent_info = $object->getLinkedInfo();
+
 			$parent_object =& $this->Application->recallObject($parent_info['ParentPrefix']);
+			/* @var $parent_object kDBItem */
+
 			$options = $object->getFieldOptions('PaymentTypeId');
 
-			if($parent_object->isLoaded())
-			{
+			if ( $parent_object->isLoaded() ) {
 				$options['default'] = $parent_object->GetDBField('PaymentTypeId');
 				$object->SetDBField('PaymentTypeId', $parent_object->GetDBField('PaymentTypeId'));
 			}
 
-			if($this->Application->GetVar($event->getPrefixSpecial().'_event') != 'OnNew' && $this->Application->GetVar($event->getPrefixSpecial().'_event') != 'OnCreate')
-			{
+			if ( $this->Application->GetVar($event->getPrefixSpecial() . '_event') != 'OnNew' && $this->Application->GetVar($event->getPrefixSpecial() . '_event') != 'OnCreate' ) {
 				$options['options'][0] = '';
 			}
 
@@ -59,38 +66,44 @@
 		}
 
 		/**
-		 * Set's day of payment for newly created payments
+		 * Updates Affiliate Record On Successfully payment creation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnAfterItemCreate(&$event)
 		{
-			$object =& $event->getObject( Array('skip_autoload'=>true) );
-		}
+			parent::OnAfterItemCreate($event);
 
-		/**
-		 * Updates Affiliate Record On Successfuly payment creation
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
 			$parent_info = $object->getLinkedInfo();
-			$sql = 'SELECT MAX(PaymentDate) FROM '.$object->TableName.'
-					WHERE '.$parent_info['ParentTableKey'].' = '.$parent_info['ParentId'];
+
+			$sql = 'SELECT MAX(PaymentDate)
+					FROM ' . $object->TableName . '
+					WHERE ' . $parent_info['ParentTableKey'] . ' = ' . $parent_info['ParentId'];
 			$payment_date = $this->Conn->GetOne($sql);
 
-			$amount_payed = $object->GetDBField('Amount');
+			$affiliate =& $this->Application->recallObject('affil');
+			/* @var $affiliate kDBItem */
 
-			$affiliate =& $this->Application->recallObject('affil');
-			$affiliate->SetDBField( 'AmountToPay', $affiliate->GetDBField('AmountToPay') - $amount_payed );
+			$affiliate->SetDBField('AmountToPay', $affiliate->GetDBField('AmountToPay') - $object->GetDBField('Amount'));
 			$affiliate->SetDBField('LastPaymentDate_date', $payment_date);
 			$affiliate->SetDBField('LastPaymentDate_time', $payment_date);
 			$affiliate->Update();
 		}
 
-		function SetCustomQuery(&$event)
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
 			$object =& $event->getObject();
 			if($event->Special == 'log')
Index: in-commerce/units/affiliate_plans/affiliate_plans_event_handler.php
===================================================================
--- in-commerce/units/affiliate_plans/affiliate_plans_event_handler.php	(revision 14590)
+++ in-commerce/units/affiliate_plans/affiliate_plans_event_handler.php	(working copy)
@@ -15,7 +15,15 @@
 
 	class AffiliatePlansEventHandler extends kDBEventHandler {
 
-		function SetCustomQuery(&$event)
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
 			if($event->Special == 'active')
 			{
@@ -37,56 +45,80 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Occurs before updating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
+			parent::OnBeforeItemUpdate($event);
+
+			$this->itemChanged($event);
+		}
+
+		/**
+		 * Occurs before creating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemCreate(&$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);
+			$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').'
+			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') );
+				$status_field = array_shift($this->Application->getUnitOption($event->Prefix, 'StatusField'));
 				$object->SetDBField($status_field, 1);
 			}
 		}
 
-		function OnBeforeItemCreate(&$event)
+		/**
+		 * Don't allow to delete primary affiliate plan
+		 *
+		 * @param kEvent $event
+		 * @param string $type
+		 * @return void
+		 * @access protected
+		 */
+		protected function customProcessing(&$event, $type)
 		{
-			$this->OnBeforeItemUpdate($event);
-		}
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+				$ids = $event->getEventParam('ids');
 
-		function OnMassDelete(&$event)
-		{
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
-				$event->status = kEvent::erFAIL;
-				return;
-			}
+				$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 = $this->StoreSelectedIDs($event);
-			$event->setEventParam('ids', $ids );
-			$ids = $event->getEventParam('ids');
+				$ids = array_diff($ids, Array ($primary_id));
 
-			$temp =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
-
-			$sql = 'SELECT AffiliatePlanId FROM '.$this->Application->getUnitOption('ap', 'TableName').'
-					WHERE IsPrimary = 1';
-			$primary_id = $this->Conn->GetOne($sql);
-			$ids = array_diff($ids, Array($primary_id));
-
-			if($ids)
-			{
-				$temp->DeleteItems($event->Prefix, $event->Special, $ids);
+				$event->setEventParam('ids', $ids);
 			}
-			$this->clearSelectedIDs($event);
 		}
 	}
\ No newline at end of file
Index: in-commerce/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
===================================================================
--- in-commerce/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(revision 14590)
+++ in-commerce/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(working copy)
@@ -78,14 +78,27 @@
 			$event->CallSubEvent('OnPreSaveBrackets');
 		}
 
-		function OnBeforeItemUpdate(&$event)
+		/**
+		 * Occurs before updating item
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(&$event)
 		{
+			parent::OnBeforeItemUpdate($event);
+
 			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
 			$linked_info = $object->getLinkedInfo();
 			$object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']);
 
 			$brackets_helper =& $this->Application->recallObject('BracketsHelper');
-			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array('Percent' => '') );
+			/* @var $brackets_helper kBracketsHelper */
+
+			$brackets_helper->InitHelper('FromAmount', 'ToAmount', Array ('Percent' => ''));
 			$brackets_helper->replaceInfinity($event);
 		}
 
Index: in-commerce/units/affiliates/affiliates_tag_processor.php
===================================================================
--- in-commerce/units/affiliates/affiliates_tag_processor.php	(revision 14590)
+++ in-commerce/units/affiliates/affiliates_tag_processor.php	(working copy)
@@ -61,25 +61,33 @@
 		}
 
 		/**
-		 * Returns true if user is affiliate
+		 * [Aggregated Tag] Returns true if user is affiliate
 		 *
 		 * @param Array $params
 		 * @return bool
+		 * @access protected
 		 */
-		function User_IsAffiliate($params)
+		protected function User_IsAffiliate($params)
 		{
-			$object =& $this->Application->recallObject($this->Prefix.'.user', $this->Prefix, Array('skip_autoload'=>true) );
-			$object->Load( $this->Application->RecallVar('user_id'), 'PortalUserId' );
-
+			$object =& $this->Application->recallObject($this->Prefix . '.user');
+			/* @var $object kDBItem */
+			
 			return $object->isLoaded();
 		}
 
-		function User_AffiliateIsNotActive($params)
+		/**
+		 * [Aggregated Tag] Checks, that affiliate record for current user exists and is active
+		 *
+		 * @param $params
+		 * @return bool
+		 * @access protected
+		 */
+		protected function User_AffiliateIsActive($params)
 		{
-			$object =& $this->Application->recallObject($this->Prefix.'.user', $this->Prefix, Array('skip_autoload'=>true) );
-			$object->Load( $this->Application->RecallVar('user_id'), 'PortalUserId' );
+			$object =& $this->Application->recallObject($this->Prefix . '.user');
+			/* @var $object kDBItem */
 
-			return $object->isLoaded() && ($object->GetDBField('Status') != 1);
+			return $object->isLoaded() && ($object->GetDBField('Status') == STATUS_ACTIVE);
 		}
 
 		/**
@@ -115,14 +123,14 @@
 
 		function IsAffiliateOrRegisterAsAffiliateAllowed($params)
 		{
-			$object =& $this->Application->recallObject($this->Prefix.'.user', $this->Prefix, Array('skip_autoload'=>true) );
-			$object->Load( $this->Application->RecallVar('user_id'), 'PortalUserId' );
+			$object =& $this->Application->recallObject($this->Prefix . '.user');
+			/* @var $object kDBItem */
 
-			return ($this->Application->ConfigValue('Comm_RegisterAsAffiliate') || $object->isLoaded()) ? 1 : 0;
+			return $this->Application->ConfigValue('Comm_RegisterAsAffiliate') || $object->isLoaded() ? 1 : 0;
 		}
 
 		/**
-		 * [AGGREGATED TAG] Checks if affilite registration is allowed
+		 * [AGGREGATED TAG] Checks if affiliate registration is allowed
 		 *
 		 * @param Array $params
 		 * @return int
@@ -135,10 +143,24 @@
 		function Main_RequireAffiliate($params)
 		{
 			$t = $params['registration_template'];
-			if( !$this->User_IsAffiliate($params) )
-			{
-				$redirect_params = Array( 'next_template' => $this->Application->GetVar('t') );
+
+			if ( !$this->User_IsAffiliate($params) ) {
+				$redirect_params = Array ('next_template' => $this->Application->GetVar('t'));
 				$this->Application->Redirect($t, $redirect_params);
 			}
 		}
+
+		/**
+		 * Calls OnNew event from template, when no other event submitted
+		 *
+		 * @param Array $params
+		 */
+		function PresetFormFields($params)
+		{
+			$prefix = $this->getPrefixSpecial();
+			
+			if ( !$this->Application->GetVar($prefix . '_event') && !$this->Application->GetVar('u.register_event') ) {
+				$this->Application->HandleEvent(new kEvent($prefix . ':OnNew'));
+			}
+		}
 	}
\ No newline at end of file
Index: in-commerce/units/brackets/brackets_event_handler.php
===================================================================
--- in-commerce/units/brackets/brackets_event_handler.php	(revision 14590)
+++ in-commerce/units/brackets/brackets_event_handler.php	(working copy)
@@ -30,25 +30,38 @@
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
-	function prepareObject(&$object, &$event)
+	/**
+	 * Apply some special processing to object being
+	 * recalled before using it in other events that
+	 * call prepareObject
+	 *
+	 * @param kDBItem|kDBList $object
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function prepareObject(&$object, &$event)
 	{
-		if($this->Application->GetVar('s_id') === false)
-		{
+		if ( $this->Application->GetVar('s_id') === false ) {
 			return;
 		}
 
 		$shipping_object =& $this->Application->recallObject('s');
+		/* @var $shipping_object kDBItem */
+
 		$lang_object =& $this->Application->recallObject('lang.current');
+		/* @var $lang_object LanguagesItem */
 
-		if($lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1)
-		{
-			$fields = Array('Start', 'End');
+		if ( $lang_object->GetDBField('UnitSystem') == 2 && $shipping_object->GetDBField('Type') == 1 ) {
+			$fields = Array ('Start', 'End');
+
 			$formatter =& $this->Application->recallObject('kUnitFormatter');
-			foreach($fields as $field)
-			{
+			/* @var $formatter kUnitFormatter */
+
+			foreach ($fields as $field) {
+				$object->SetFieldOption($field, 'formatter', 'kUnitFormatter');
 				$options = $object->GetFieldOptions($field);
-				$options['formatter'] = 'kUnitFormatter';
-				$object->SetFieldOptions($field, $options);
+
 				$formatter->prepareOptions($field, $options, $object);
 			}
 		}
@@ -156,17 +169,32 @@
 		$event->CallSubEvent('OnPreSaveBrackets');
 	}
 
-	function OnBeforeItemUpdate(&$event)
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(&$event)
 	{
+		parent::OnBeforeItemUpdate($event);
+
 		$shipping_object =& $this->Application->recallObject('s');
+		/* @var $shipping_object kDBItem */
+
 		$default_start = ($shipping_object->GetDBField('Type') == 1) ? 0 : 1;
 
 		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
 		$linked_info = $object->getLinkedInfo();
 		$object->SetDBField($linked_info['ParentTableKey'], $linked_info['ParentId']);
 
 		$brackets_helper =& $this->Application->recallObject('BracketsHelper');
-		$brackets_helper->InitHelper('Start', 'End', Array(), $default_start );
+		/* @var $brackets_helper kBracketsHelper */
+
+		$brackets_helper->InitHelper('Start', 'End', Array (), $default_start);
 		$brackets_helper->replaceInfinity($event);
 	}
 
Index: in-commerce/units/coupons/coupons_event_handler.php
===================================================================
--- in-commerce/units/coupons/coupons_event_handler.php	(revision 14590)
+++ in-commerce/units/coupons/coupons_event_handler.php	(working copy)
@@ -59,8 +59,15 @@
 		$object->SetDBField('DefaultExpiration_time', $default_expiration);
 	}
 
-	
-	function OnBeforeClone(&$event)
+	/**
+	 * Occurs before an item has been cloned
+	 * Id of newly created item is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeClone(&$event)
 	{
 		parent::OnBeforeClone($event);
 		
@@ -206,33 +213,69 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * 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
 	 */
-	function OnPreCreate(&$event){
-
+	protected function OnPreCreate(&$event)
+	{
 		parent::OnPreCreate($event);
 
-		$object = &$event->getObject();
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
 		$exp_date = adodb_mktime();
-
 		$default_duration = $this->Application->ConfigValue('Comm_DefaultCouponDuration');
 
-		if ($default_duration && $default_duration>0){
-			$exp_date += (int)$default_duration*86400;
+		if ( $default_duration && $default_duration > 0 ) {
+			$exp_date += (int)$default_duration * 86400;
 		}
+
 		$object->SetDBField('Expiration_date', $exp_date);
 	}
 
-	function OnBeforeItemUpdate(&$event)
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(&$event)
 	{
-		$object =& $event->getObject();
-		$object->SetDBField( 'Amount', abs($object->GetDBField('Amount')) );
+		parent::OnBeforeItemUpdate($event);
+
+		$this->itemChanged($event);
 	}
 
-	function OnBeforeItemCreate(&$event)
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(&$event)
 	{
-		$this->OnBeforeItemUpdate($event);
+		parent::OnBeforeItemCreate($event);
+
+		$this->itemChanged($event);
 	}
+
+	/**
+	 * Occurs before item is changed
+	 *
+	 * @param kEvent $event
+	 */
+	function itemChanged(&$event)
+	{
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
+		$object->SetDBField('Amount', abs($object->GetDBField('Amount')));
+	}
 }
\ No newline at end of file
Index: in-commerce/units/currencies/currencies_event_handler.php
===================================================================
--- in-commerce/units/currencies/currencies_event_handler.php	(revision 14590)
+++ in-commerce/units/currencies/currencies_event_handler.php	(working copy)
@@ -52,38 +52,47 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(&$event)
 	{
+		parent::OnBeforeItemUpdate($event);
+
 		$object =& $event->getObject();
-		if($object->GetDBField('IsPrimary') && $object->Validate())
-		{
-			$sql = 'UPDATE '.$this->Application->getUnitOption($this->Prefix, 'TableName').'
+		/* @var $object kDBItem */
+
+		if ( $object->GetDBField('IsPrimary') && $object->Validate() ) {
+			$sql = 'UPDATE ' . $this->Application->getUnitOption($this->Prefix, 'TableName') . '
 					SET IsPrimary = 0
-					WHERE CurrencyId <> '.$object->GetDBField('CurrencyId');
+					WHERE CurrencyId <> ' . $object->GetDBField('CurrencyId');
 			$this->Conn->Query($sql);
+
 			$object->SetDBField('Status', 1);
 		}
-		$object->SetDBField('Modified_date', adodb_mktime() );
-		$object->SetDBField('Modified_time', adodb_mktime() );
 
-		if($object->GetDBField('Status') == 0)
-		{
-			$sql = 	'DELETE FROM '.$this->Application->getUnitOption('ptc', 'TableName').
-					' WHERE CurrencyId='.$object->GetDBField('CurrencyId');
+		$object->SetDBField('Modified_date', adodb_mktime());
+		$object->SetDBField('Modified_time', adodb_mktime());
+
+		if ( $object->GetDBField('Status') == 0 ) {
+			$sql = 'DELETE FROM ' . $this->Application->getUnitOption('ptc', 'TableName') . '
+					WHERE CurrencyId = ' . $object->GetDBField('CurrencyId');
 			$this->Conn->Query($sql);
 		}
 	}
 
 	/**
-	 * Enter description here...
+	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
 	 */
-	function SetCustomQuery(&$event)
+	protected function SetCustomQuery(&$event)
 	{
 		$object =& $event->getObject();
 
@@ -115,17 +124,20 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * Saves content of temp table into live and
+	 * redirects to event' default redirect (normally grid template)
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnSave(&$event)
+	protected function OnSave(&$event)
 	{
-		$this->Application->StoreVar( 'saved_curr_ids', $this->Application->RecallVar($event->Prefix.'_selected_ids') );
+		$this->Application->StoreVar('saved_curr_ids', $this->Application->RecallVar($event->Prefix . '_selected_ids'));
+		
 		parent::OnSave($event);
 	}
 
-
 	/**
 	 * Enter description here...
 	 *
Index: in-commerce/units/destinations/dst_event_handler.php
===================================================================
--- in-commerce/units/destinations/dst_event_handler.php	(revision 14590)
+++ in-commerce/units/destinations/dst_event_handler.php	(working copy)
@@ -46,7 +46,15 @@
 		}
 	}
 
-	function customProcessing(&$event, $type)
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event, $type)
 	{
 		if($type != 'before') return ;
 
Index: in-commerce/units/discounts/discounts_event_handler.php
===================================================================
--- in-commerce/units/discounts/discounts_event_handler.php	(revision 14590)
+++ in-commerce/units/discounts/discounts_event_handler.php	(working copy)
@@ -15,14 +15,44 @@
 
 class DiscountsEventHandler extends kDBEventHandler {
 
-	function OnBeforeItemUpdate(&$event)
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(&$event)
 	{
-		$object =& $event->getObject();
-		$object->SetDBField( 'Amount', abs($object->GetDBField('Amount')) );
+		parent::OnBeforeItemUpdate($event);
+
+		$this->itemChanged($event);
 	}
 
-	function OnBeforeItemCreate(&$event)
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(&$event)
 	{
-		$this->OnBeforeItemUpdate($event);
+		parent::OnBeforeItemCreate($event);
+
+		$this->itemChanged($event);
 	}
+
+	/**
+	 * Occurs before item changed
+	 *
+	 * @param kEvent $event
+	 */
+	function itemChanged(&$event)
+	{
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
+		$object->SetDBField('Amount', abs($object->GetDBField('Amount')));
+	}
 }
\ No newline at end of file
Index: in-commerce/units/files/files.php
===================================================================
--- in-commerce/units/files/files.php	(revision 14590)
+++ in-commerce/units/files/files.php	(working copy)
@@ -11,19 +11,27 @@
 * See http://www.in-portal.org/commercial-license for copyright notices and details.
 */
 
-	defined('FULL_PATH') or die('restricted access!');
+defined('FULL_PATH') or die('restricted access!');
 
-	class FilesItem extends kDBItem {
+class FilesItem extends kDBItem {
 
-		public function Delete($id = null)
-		{
-			$this->Load($id);
-			$upload_dir = $this->Fields['FilePath']['upload_dir'];
-			$file_path = FULL_PATH.$upload_dir.$this->GetDBField('FilePath');
-			if(file_exists($file_path))
-			{
-				unlink($file_path);
-			}
-			return parent::Delete($id);
+	/**
+	 * Deletes the record from database
+	 *
+	 * @param int $id
+	 * @return bool
+	 * @access public
+	 */
+	public function Delete($id = null)
+	{
+		$this->Load($id);
+		$upload_dir = $this->Fields['FilePath']['upload_dir'];
+		$file_path = FULL_PATH . $upload_dir . $this->GetDBField('FilePath');
+
+		if ( file_exists($file_path) ) {
+			unlink($file_path);
 		}
-	}
\ No newline at end of file
+		
+		return parent::Delete($id);
+	}
+}
\ No newline at end of file
Index: in-commerce/units/gateways/gw_tag_processor.php
===================================================================
--- in-commerce/units/gateways/gw_tag_processor.php	(revision 14590)
+++ in-commerce/units/gateways/gw_tag_processor.php	(working copy)
@@ -91,26 +91,31 @@
 		return $o;
 	}
 
-	function PredefinedOptions($params)
+	/**
+	 * Prints list a all possible field options
+	 *
+	 * @param Array $params
+	 * @return string
+	 * @access protected
+	 */
+	protected function PredefinedOptions($params)
 	{
-		$object =& $this->Application->recallObject($this->getPrefixSpecial(),$this->Prefix, $params);
+		$object =& $this->getObject($params);
+		/* @var $object kDBItem */
 
-		$value = $this->gwConfigValue($params);
-
-		$options = explode(',', $object->GetDBField('ValueList') );
-
 		$block_params = $this->prepareTagParams($params);
-
 		$block_params['name'] = $this->SelectParam($params, 'render_as,block');
 		$block_params['pass_params'] = 'true';
 
 		$o = '';
-		foreach ($options as $key_val)
-		{
-			list($key,$val) = explode('=', $key_val);
+		$value = $this->gwConfigValue($params);
+		$options = explode(',', $object->GetDBField('ValueList'));
+
+		foreach ($options as $key_val) {
+			list($key, $val) = explode('=', $key_val);
 			$block_params['key'] = $key;
 			$block_params['option'] = $val;
-			$block_params['selected'] = ( $key == $value ? ' '.$params['selected'] : '');
+			$block_params['selected'] = ($key == $value ? ' ' . $params['selected'] : '');
 			$block_params['PrefixSpecial'] = $this->getPrefixSpecial();
 			$o .= $this->Application->ParseBlock($block_params, 1);
 		}
Index: in-commerce/units/manufacturers/manufacturers_event_handler.php
===================================================================
--- in-commerce/units/manufacturers/manufacturers_event_handler.php	(revision 14590)
+++ in-commerce/units/manufacturers/manufacturers_event_handler.php	(working copy)
@@ -30,11 +30,14 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
 	 */
-	function SetCustomQuery(&$event)
+	protected function SetCustomQuery(&$event)
 	{
 		if ($this->Application->isAdminUser) {
 			return ;
@@ -72,14 +75,14 @@
 		$object->addFilter('category_manufacturer_filter', $manufacturers ? '%1$s.ManufacturerId IN (' . implode(',', $manufacturers) . ')' : 'FALSE');
 	}
 
-
 	/**
-	 * Prefill states dropdown with correct values
+	 * Pre-fills states dropdown with correct values
 	 *
 	 * @param kEvent $event
-	 * @access public
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemLoad(&$event)
+	protected function OnAfterItemLoad(&$event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -93,8 +96,10 @@
 	 * Processes states
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(&$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -109,8 +114,10 @@
 	 * Processes states
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(&$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
Index: in-commerce/units/order_items/order_items_event_handler.php
===================================================================
--- in-commerce/units/order_items/order_items_event_handler.php	(revision 14590)
+++ in-commerce/units/order_items/order_items_event_handler.php	(working copy)
@@ -178,18 +178,37 @@
 			$this->Conn->Query($sql);
 		}
 
-		function OnAfterItemLoad(&$event)
+		/**
+		 * Occurs after loading item, 'id' parameter
+		 * allows to get id of item that was loaded
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnAfterItemLoad(&$event)
 		{
+			parent::OnAfterItemLoad($event);
+
 			$object =& $event->getObject();
-			if( $item_info = $object->GetDBField('ItemData') )
-			{
+			/* @var $object kDBItem */
+
+			if ( $item_info = $object->GetDBField('ItemData') ) {
 				$item_info = unserialize($item_info);
 				$object->SetDBField('DiscountType', getArrayValue($item_info, 'DiscountType'));
 				$object->SetDBField('DiscountId', getArrayValue($item_info, 'DiscountId'));
 			}
 		}
 
-		function SetCustomQuery(&$event)
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
Index: in-commerce/units/payment_type/payment_type_event_handler.php
===================================================================
--- in-commerce/units/payment_type/payment_type_event_handler.php	(revision 14590)
+++ in-commerce/units/payment_type/payment_type_event_handler.php	(working copy)
@@ -97,20 +97,22 @@
 	}
 
 	/**
-	 * Occurse before updating item
+	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
-	 * @access public
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(&$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
-		$object = &$event->getObject();
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
 
-		$status_field = array_shift( $this->Application->getUnitOption($event->Prefix,'StatusField') );
+		$status_field = array_shift( $this->Application->getUnitOption($event->Prefix, 'StatusField') );
 
-		if($object->GetDBField('IsPrimary')==1 && $object->GetDBField($status_field)==0){
+		if ( $object->GetDBField('IsPrimary') == 1 && $object->GetDBField($status_field) == 0 ) {
 			$object->SetDBField($status_field, 1);
 		}
 
@@ -118,12 +120,13 @@
 	}
 
 	/**
-	 * Occurse before creating item
+	 * Occurs before creating item
 	 *
 	 * @param kEvent $event
-	 * @access public
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(&$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -134,11 +137,13 @@
 	 * Disable delete on primary payment type
 	 *
 	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
 	 * @access protected
 	 */
-
-	function customProcessing(&$event, $when){
-		if ($event->Name == 'OnMassDelete' && $when == 'before'){
+	protected function customProcessing(&$event, $type)
+	{
+		if ($event->Name == 'OnMassDelete' && $type == 'before'){
 			$object = &$event->getObject();
 
 			$ids = $event->getEventParam('ids');
@@ -157,9 +162,18 @@
 		}
 	}
 
-	function OnSave(&$event)
+	/**
+	 * 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(&$event)
 	{
 		$this->Application->StoreVar('check_unused_currencies', 1);
+
 		parent::OnSave($event);
 	}
 
@@ -219,11 +233,14 @@
 	}
 
 	/**
-	 * Apply system filter to themes list
+	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
 	 */
-	function SetCustomQuery(&$event)
+	protected function SetCustomQuery(&$event)
 	{
 		parent::SetCustomQuery($event);
 
Index: in-commerce/units/pricing/pricing_event_handler.php
===================================================================
--- in-commerce/units/pricing/pricing_event_handler.php	(revision 14590)
+++ in-commerce/units/pricing/pricing_event_handler.php	(working copy)
@@ -227,7 +227,15 @@
 		}
 	}
 
-	function customProcessing(&$event,$type)
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event,$type)
 	{
 		$bracket =& $event->getObject();
 		switch ($type)
@@ -372,19 +380,21 @@
 	}
 
 	/**
-	 * Resets primary mark for other pricings of given product, when current pricing is primary
+	 * Resets primary mark for other prices of given product, when current pricing is primary
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(&$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
 
-		if ($object->GetDBField('IsPrimary') == 1) {
-			// make all pricings non primary, when this one is
+		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() . ')';
@@ -393,35 +403,50 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * Occurs before creating item
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(&$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);
+		$table_info['ParentId'] = ($table_info['ParentId'] ? $table_info['ParentId'] : 0);
 
-		if ( $object->GetDBField('IsPrimary') == 1 ){
-			$this->Conn->Query('UPDATE '.$object->TableName.' SET IsPrimary = 0 WHERE '.$table_info['ForeignKey'].' = '.$table_info['ParentId']);
+		if ( $object->GetDBField('IsPrimary') == 1 ) {
+			$sql = 'UPDATE ' . $object->TableName . '
+					SET IsPrimary = 0
+					WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
+			$this->Conn->Query($sql);
 		}
 		else {
-			$prices_qty = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE '.$table_info['ForeignKey'].' = '.$table_info['ParentId']);
+			$sql = 'SELECT COUNT(*)
+					FROM ' . $object->TableName . '
+					WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
+			$prices_qty = $this->Conn->GetOne($sql);
 
-			if ($prices_qty == 0) {
+			if ( $prices_qty == 0 ) {
 				$object->SetDBField('IsPrimary', 1);
 			}
 		}
 	}
 
 	/**
-	 * Enter description here...
+	 * Apply any custom changes to list's sql query
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 * @see kDBEventHandler::OnListBuild()
 	 */
-	function SetCustomQuery(&$event)
+	protected function SetCustomQuery(&$event)
 	{
 		$object =& $event->getObject();
 
Index: in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
--- in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php	(revision 14590)
+++ in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php	(working copy)
@@ -19,8 +19,11 @@
 	 * Apply custom processing to item
 	 *
 	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
 	 */
-	function customProcessing(&$event, $type)
+	protected function customProcessing(&$event, $type)
 	{
 		if ($type == 'after') {
 			return true;
@@ -238,23 +241,31 @@
 		$actions->Set($event->getPrefixSpecial().'_GoId', '');
 	}
 
-	function LoadItem(&$event)
+	/**
+	 * Load item if id is available
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function LoadItem(&$event)
 	{
 		$object =& $event->getObject();
+		/* @var $object kDBItem */
+
 		$id = $this->getPassedID($event);
-		if (!$id) {
+		
+		if ( !$id ) {
 			$event->CallSubEvent('OnNew');
+
+			return ;
 		}
-		else {
-			if ($object->Load($id) )
-			{
-				$actions =& $this->Application->recallObject('kActions');
-				$actions->Set($event->getPrefixSpecial().'_id', $object->GetId() );
-			}
-			else
-			{
-				//$object->setID($id);
-			}
+
+		if ( $object->Load($id) ) {
+			$actions =& $this->Application->recallObject('kActions');
+			/* @var $actions Params */
+			
+			$actions->Set($event->getPrefixSpecial() . '_id', $object->GetId());
 		}
 	}
 
@@ -277,8 +288,18 @@
 		return $special;
 	}
 
-	function OnBeforeClone(&$event)
+	/**
+	 * Occurs before an item has been cloned
+	 * Id of newly created item is passed as event' 'id' param
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeClone(&$event)
 	{
+		parent::OnBeforeClone($event);
+		
 		$event->Init($event->Prefix, '-item');
 		$object =& $event->getObject();
 
@@ -306,9 +327,13 @@
 	 * Restore back values from live table to temp table before overwriting live with temp
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeDeleteFromLive(&$event)
+	protected function OnBeforeDeleteFromLive(&$event)
 	{
+		parent::OnBeforeDeleteFromLive($event);
+
 		// check if product inventory management is via options and then proceed
 
 		$id = $event->getEventParam('id');
@@ -317,24 +342,25 @@
 		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 
 		$sql = 'SELECT p.InventoryStatus
-				FROM '.$products_table.' p
-				LEFT JOIN '.$table_name.' poc ON poc.ProductId = p.ProductId
-				WHERE poc.'.$id_field.' = '.$id;
+				FROM ' . $products_table . ' p
+				LEFT JOIN ' . $table_name . ' poc ON poc.ProductId = p.ProductId
+				WHERE poc.' . $id_field . ' = ' . $id;
+		$inventory_status = $this->Conn->GetOne($sql);
 
-		if ($this->Conn->GetOne($sql) == 2) {
-			$live_object =& $this->Application->recallObject($event->Prefix.'.itemlive', null, Array('skip_autoload' => true));
+		if ( $inventory_status == ProductInventory::BY_OPTIONS ) {
+			$live_object =& $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
 			/* @var $live_object kDBItem */
 
 			$live_object->SwitchToLive();
 			$live_object->Load($id);
 
-			$temp_object =& $this->Application->recallObject($event->Prefix.'.itemtemp', null, Array('skip_autoload' => true));
+			$temp_object =& $this->Application->recallObject($event->Prefix . '.itemtemp', null, Array ('skip_autoload' => true));
 			/* @var $temp_object kDBItem */
 
 			$temp_object->SwitchToTemp();
 			$temp_object->Load($id);
 
-			$temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), Array('QtyInStock','QtyReserved','QtyBackOrdered','QtyOnOrder'));
+			$temp_object->SetDBFieldsFromHash($live_object->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
 			$temp_object->Update();
 		}
 	}
Index: in-commerce/units/product_option_combinations/product_option_formatters.php
===================================================================
--- in-commerce/units/product_option_combinations/product_option_formatters.php	(revision 14590)
+++ in-commerce/units/product_option_combinations/product_option_formatters.php	(working copy)
@@ -15,6 +15,15 @@
 
 	class kCombinationFormatter extends kFormatter {
 
+		/**
+		 * Formats value of a given field
+		 *
+		 * @param string $value
+		 * @param string $field_name
+		 * @param kDBItem|kDBList $object
+		 * @param string $format
+		 * @return string
+		 */
 		function Format($value, $field_name, $object, $format=null)
 		{
 			$o = '';
@@ -45,18 +54,18 @@
 		 * @param string $field_name
 		 * @param kDBItem $object
 		 * @return mixed
+		 * @access public
 		 */
-		function Parse($value, $field_name, &$object)
+		public function Parse($value, $field_name, &$object)
 		{
-			if (!is_array($value)) {
+			if ( !is_array($value) ) {
 				$object->SetError($field_name, 'required');
 				return '';
 			}
 			else {
 				if ( $object->isRequired($field_name) ) {
-					foreach ($value as $key=>$val)
-					{
-						if ($val == '') {
+					foreach ($value as $key => $val) {
+						if ( $val == '' ) {
 							$object->SetError($field_name, 'required');
 						}
 					}
@@ -69,11 +78,11 @@
 	class kCombPriceFormatter extends kFormatter {
 
 		/**
-		 * Enter description here...
+		 * Formats value of a given field
 		 *
-		 * @param mixed $value
+		 * @param string $value
 		 * @param string $field_name
-		 * @param kDBItem $object
+		 * @param kDBItem|kDBList $object
 		 * @param string $format
 		 * @return string
 		 */
Index: in-commerce/units/product_options/product_options_event_handler.php
===================================================================
--- in-commerce/units/product_options/product_options_event_handler.php	(revision 14590)
+++ in-commerce/units/product_options/product_options_event_handler.php	(working copy)
@@ -15,7 +15,15 @@
 
 	class ProductOptionsEventHandler extends kDBEventHandler{
 
-		function SetCustomQuery(&$event)
+		/**
+		 * Apply any custom changes to list's sql query
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
+		 */
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
Index: in-commerce/units/products/products_event_handler.php
===================================================================
--- in-commerce/units/products/products_event_handler.php	(revision 14590)
+++ in-commerce/units/products/products_event_handler.php	(working copy)
@@ -56,14 +56,17 @@
 	 * Sets default processing data for subscriptions
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(&$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
 		$object =& $event->getObject();
+		/* @var $object kDBItem */
 
-		$product_approve_events = Array(
+		$product_approve_events = Array (
 			2 => 'p:OnSubscriptionApprove',
 			4 => 'p:OnDownloadableApprove',
 			5 => 'p:OnPackageApprove'
@@ -71,11 +74,11 @@
 
 		$product_type = $object->GetDBField('Type');
 
-		$type_found = in_array($product_type, array_keys($product_approve_events) );
+		$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) );
+		if ( $type_found && !$object->GetDBField('ProcessingData') ) {
+			$processing_data = Array ('ApproveEvent' => $product_approve_events[$product_type]);
+			$object->SetDBField('ProcessingData', serialize($processing_data));
 		}
 	}
 
@@ -285,22 +288,37 @@
 		}
 	}
 
-	function OnBeforeDeleteFromLive(&$event)
+	/**
+	 * 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(&$event)
 	{
-		$id = $event->getEventParam('id');
-		$product =& $this->Application->recallObject($event->Prefix.'.itemlive', null, Array('skip_autoload' => true));
+		parent::OnBeforeDeleteFromLive($event);
+
+		$product =& $this->Application->recallObject($event->Prefix . '.itemlive', null, Array ('skip_autoload' => true));
 		/* @var $product kCatDBItem */
 
 		$product->SwitchToLive();
-		if (!$product->Load($id)) return ; // this will make sure New product will not be overwritten with empty data
+		$id = $event->getEventParam('id');
 
-		$temp =& $this->Application->recallObject($event->Prefix.'.itemtemp', null, Array('skip_autoload' => true));
+		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(), Array('QtyInStock','QtyReserved','QtyBackOrdered','QtyOnOrder'));
+		$temp->SetDBFieldsFromHash($product->GetFieldValues(), Array ('QtyInStock', 'QtyReserved', 'QtyBackOrdered', 'QtyOnOrder'));
 		$temp->Update();
 	}
 
@@ -311,23 +329,42 @@
 		$this->Application->RemoveVar('inventory_actions');
 	}
 
-	function OnSave(&$event)
+	/**
+	 * 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(&$event)
 	{
-		$res = parent::OnSave($event);
-		if ($event->status == kEvent::erSUCCESS) {
+		parent::OnSave($event);
+
+		if ( $event->status == kEvent::erSUCCESS ) {
 			$this->RunScheduledInventoryActions($event);
 		}
-		return $res;
 	}
 
-	function OnPreCreate(&$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(&$event)
 	{
 		parent::onPreCreate($event);
-		$object =& $event->GetObject();
-		$object->SetDBField('Type', $this->Application->GetVar( $event->getPrefixSpecial(true).'_new_type' ));
+
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
+		
+		$object->SetDBField('Type', $this->Application->GetVar($event->getPrefixSpecial(true) . '_new_type'));
 	}
 
-
 	/**
 	 * Enter description here...
 	 *
@@ -865,11 +902,14 @@
 	}
 
 	/**
-	 * Checks, that all required product options are filled in before product is saved
+	 * 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
 	 */
-	function OnPreSave(&$event)
+	protected function OnPreSave(&$event)
 	{
 		$this->CheckRequiredOptions($event);
 
@@ -880,8 +920,10 @@
 	 * Set new price to ProductsPricing
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(&$event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -996,7 +1038,15 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnAfterItemLoad(&$event)
+
+	/**
+	 * Load price from temp table if product mode is temp table
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemLoad(&$event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -1004,7 +1054,7 @@
 		/* @var $object ProductsItem */
 
 		$a_pricing = $object->getPrimaryPricing();
-		if (!$a_pricing) {
+		if ( !$a_pricing ) {
 			// pricing doesn't exist for new products
 			$price = $cost = null;
 		}
Index: in-commerce/units/shipping/shipping_event_handler.php
===================================================================
--- in-commerce/units/shipping/shipping_event_handler.php	(revision 14590)
+++ in-commerce/units/shipping/shipping_event_handler.php	(working copy)
@@ -33,18 +33,21 @@
 	 * Presets shipping cost object based on shipping fields
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemLoad(&$event)
+	protected function OnAfterItemLoad(&$event)
 	{
 		parent::OnAfterItemLoad($event);
 
-		if (!$this->Application->isAdminUser) {
-			return ;
+		if ( !$this->Application->isAdminUser ) {
+			return;
 		}
 
 		$object =& $event->getObject();
+		/* @var $object kDBItem */
 
-		$format = '%01.'.$object->GetDBField('PrecisionAfterSep').'f'; // %01.2f
+		$format = '%01.' . $object->GetDBField('PrecisionAfterSep') . 'f'; // %01.2f
 		$zero_if_empty = $object->GetDBField('ZeroIfEmpty');
 
 		$sc_object =& $this->Application->recallObject('sc', null, Array ('raise_warnings' => 0));
@@ -56,10 +59,10 @@
 		$flat_options['default'] = $zero_if_empty ? 0 : null;
 		$sc_object->SetFieldOptions('Flat', $flat_options);
 
-		$perunit_options = $sc_object->GetFieldOptions('PerUnit');
-		$perunit_options['format'] = $format;
-		$perunit_options['default'] = $zero_if_empty ? 0 : null;
-		$sc_object->SetFieldOptions('PerUnit', $perunit_options);
+		$per_unit_options = $sc_object->GetFieldOptions('PerUnit');
+		$per_unit_options['format'] = $format;
+		$per_unit_options['default'] = $zero_if_empty ? 0 : null;
+		$sc_object->SetFieldOptions('PerUnit', $per_unit_options);
 	}
 
 	/**
@@ -140,15 +143,32 @@
 		$event->status=kEvent::erSUCCESS;
 	}
 
-	function OnSave(&$event)
+	/**
+	 * 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(&$event)
 	{
 		$this->OnAfterItemLoad($event);
 
 		parent::OnSave($event);
 	}
 
-	function OnAfterItemCreate(&$event)
+	/**
+	 * Occurs after creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnAfterItemCreate(&$event)
 	{
+		parent::OnAfterItemCreate($event);
+
 		$event->CallSubEvent('OnAnyChange');
 	}
 
@@ -168,14 +188,22 @@
 		$this->Conn->Query($sql);
 	}
 
-	function OnPreSaveCreated(&$event){
+	/**
+	 * Creates a new item in temp table and
+	 * stores item id in App vars and Session on success
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnPreSaveCreated(&$event)
+	{
 		parent::OnPreSaveCreated($event);
 
-		$default_group = $this->Application->ConfigValue('User_LoggedInGroup');
+		$object =& $event->getObject( Array ('skip_autoload' => true) );
+		/* @var $object kDBItem */
 
-		$object =& $event->getObject( Array('skip_autoload' => true) );
-
-		$object->SetDBField('PortalGroups', ','.$default_group.',');
+		$object->SetDBField('PortalGroups', ',' . $this->Application->ConfigValue('User_LoggedInGroup') . ',');
 	}
 
 	function UpdateGroups(&$event){
@@ -196,8 +224,16 @@
 		}
 	}
 
-	function customProcessing(&$event, $when){
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event, $type)
+	{
 		$this->UpdateGroups($event);
-
 	}
 }
\ No newline at end of file
Index: in-commerce/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
--- in-commerce/units/shipping_costs/shipping_costs_event_handler.php	(revision 14590)
+++ in-commerce/units/shipping_costs/shipping_costs_event_handler.php	(working copy)
@@ -169,7 +169,15 @@
 		$event->status = kEvent::erSUCCESS;
 	}
 
-	function customProcessing(&$event, $type)
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event, $type)
 	{
 		if( $type == 'before' && $this->Application->GetVar('sc') )
 		{
Index: in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
===================================================================
--- in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(revision 14590)
+++ in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(working copy)
@@ -16,18 +16,20 @@
 class ShippingQuoteEngineEventHandler extends kDBEventHandler {
 
 	/**
-	 * Enter description here...
+	 * Occurs before updating item
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(&$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
 
-		$engine =& $this->Application->recallObject( $object->GetDBField('ClassName') );
+		$engine =& $this->Application->recallObject($object->GetDBField('ClassName'));
 		/* @var $engine ShippingQuoteEngine */
 
 		$engine_fields = $engine->GetEngineFields();
@@ -35,7 +37,7 @@
 		$properties = $properties ? unserialize($properties) : Array ();
 
 		// common fields for all shipping quote engines
-		if ($object->GetDBField('AccountPassword') != '') {
+		if ( $object->GetDBField('AccountPassword') != '' ) {
 			// don't erase password by accident
 			$engine_fields[] = 'AccountPassword';
 		}
@@ -53,28 +55,28 @@
 		$from_country = $this->Application->ConfigValue('Comm_Shipping_Country');
 		$has_states = strlen($from_country) == 3 ? $cs_helper->CountryHasStates($from_country) : false;
 
-		$valid_address = 	$from_country && ($has_states && $this->Application->ConfigValue('Comm_Shipping_State') || !$has_states) &&
-							$this->Application->ConfigValue('Comm_Shipping_City') && $this->Application->ConfigValue('Comm_Shipping_ZIP');
+		$valid_address = $from_country && ($has_states && $this->Application->ConfigValue('Comm_Shipping_State') || !$has_states) && $this->Application->ConfigValue('Comm_Shipping_City') && $this->Application->ConfigValue('Comm_Shipping_ZIP');
 
-		if (!function_exists('curl_init')) {
+		if ( !function_exists('curl_init') ) {
 			$object->SetError('Status', 'curl_not_present');
 		}
-		elseif (($object->GetDBField('Status') == STATUS_ACTIVE) && !$valid_address) {
+		elseif ( ($object->GetDBField('Status') == STATUS_ACTIVE) && !$valid_address ) {
 			$object->SetError('Status', 'from_info_not_filled_in');
 		}
 	}
 
 	/**
-	 * Enter description here...
+	 * Apply same processing to each item being selected in grid
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function iterateItems(&$event)
+	protected function iterateItems(&$event)
 	{
-//		$event->setEventParam('SkipProcessing', 1);
 		parent::iterateItems($event);
-		if($event->Name == 'OnMassApprove')
-		{
+
+		if ( $event->Name == 'OnMassApprove' ) {
 			$event->status = kEvent::erSUCCESS;
 			$event->redirect = true;
 		}
@@ -84,8 +86,10 @@
 	 * Sets virtual fields from serialized properties array
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemLoad(&$event)
+	protected function OnAfterItemLoad(&$event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -94,8 +98,8 @@
 
 		$properties = $object->GetDBField('Properties');
 
-		if ($properties) {
-			$object->SetDBFieldsFromHash( unserialize($properties) );
+		if ( $properties ) {
+			$object->SetDBFieldsFromHash(unserialize($properties));
 		}
 	}
 
@@ -103,8 +107,10 @@
 	 * Deletes cached shipping quotes on any setting change
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(&$event)
 	{
 		parent::OnAfterItemCreate($event);
 
Index: in-commerce/units/taxes/taxes_event_handler.php
===================================================================
--- in-commerce/units/taxes/taxes_event_handler.php	(revision 14590)
+++ in-commerce/units/taxes/taxes_event_handler.php	(working copy)
@@ -41,39 +41,40 @@
 		$this->eventMethods = array_merge($this->eventMethods, $zones_events);
 	}
 
-	function customProcessing(&$event, $type)
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event, $type)
 	{
-		$zone_object =& $event->GetObject();
-		switch($type)
-		{
-			case 'before':
+		$zone_object =& $event->getObject();
+		/* @var $zone_object kDBItem */
 
-				break;
-			case 'after':
-				$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-				$dst_object =& $this->Application->RecallObject('taxdst');
-				if ($event->Name == 'OnUpdate')
-				{
-					$sql = 'DELETE FROM '.$dst_object->TableName.' WHERE TaxZoneId='.$zone_object->GetID();
-					$this->Conn->Query($sql);
+		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();
 				}
-				else
-				{
-					$temp = $this->Application->GetVar('taxdst');
-					foreach ($temp as $key => $value)
-					{
-						$temp[$key]['TaxZoneId'] = $zone_object->GetID();
-					}
-					$this->Application->SetVar('taxdst', $temp);
-				}
 
-				$dst_event = new kEvent();
-				$dst_event->Init('taxdst');
-				$dst_event->Name = 'OnCreate';
-				$this->Application->HandleEvent($dst_event);
-				break;
+				$this->Application->SetVar('taxdst', $temp);
+			}
 
-			default:
+			$dst_event = new kEvent('taxdst:OnCreate');
+			$this->Application->HandleEvent($dst_event);
 		}
 	}
 
@@ -222,22 +223,6 @@
 		$event->CallSubEvent("OnPreSave");
 	}
 
-	function OnMassDelete(&$event)
-	{
-		$this->StoreSelectedIDs($event);
-
-		$event->setEventParam('ids', $this->getSelectedIDs($event) );
-		$this->customProcessing($event, 'before');
-		$ids = $event->getEventParam('ids');
-		$ids = implode(',', $ids);
-
-		$dst =& $this->Application->recallObject('taxdst');
-		$sql = 'DELETE FROM '.$dst->TableName.' WHERE TaxZoneId IN ('.$ids.')';
-		$this->Conn->Query($sql);
-
-		parent::OnMassDelete($event);
-	}
-
 	function OnCountryChange(&$event)
 	{
 		$destinations = &$this->Application->recallObject('taxdst');
Index: in-commerce/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
--- in-commerce/units/taxesdestinations/taxes_dst_event_handler.php	(revision 14590)
+++ in-commerce/units/taxesdestinations/taxes_dst_event_handler.php	(working copy)
@@ -95,7 +95,15 @@
 		}
 	}
 
-	function customProcessing(&$event, $type)
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event, $type)
 	{
 		switch($type)
 		{
Index: in-commerce/units/zones/zones_event_handler.php
===================================================================
--- in-commerce/units/zones/zones_event_handler.php	(revision 14590)
+++ in-commerce/units/zones/zones_event_handler.php	(working copy)
@@ -41,42 +41,46 @@
 		$this->eventMethods = array_merge($this->eventMethods, $zones_events);
 	}
 
-	function customProcessing(&$event, $type)
+	/**
+	 * Apply custom processing to item
+	 *
+	 * @param kEvent $event
+	 * @param string $type
+	 * @return void
+	 * @access protected
+	 */
+	protected function customProcessing(&$event, $type)
 	{
-		$zone_object =& $event->GetObject();
-		switch($type)
-		{
+		$zone_object =& $event->getObject();
+		/* @var $zone_object kDBItem */
+
+		switch ( $type ) {
 			case 'before':
-				if ($event->Name == 'OnCreate')
-				{
+				if ( $event->Name == 'OnCreate' ) {
 					$zone_object->SetDBField('ShippingTypeID', $this->Application->GetVar('s_id'));
 				}
 				break;
+
 			case 'after':
-				$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-				$dst_object =& $this->Application->RecallObject('dst');
-				if ($event->Name == 'OnUpdate')
-				{
-					$sql = 'DELETE FROM '.$dst_object->TableName.' WHERE ShippingZoneId='.$zone_object->GetID();
+				$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');
-					foreach ($temp as $key => $value)
-					{
+				else {
+					$temp = $this->Application->GetVar('dst', Array ());
+					foreach ($temp as $key => $value) {
 						$temp[$key]['ShippingZoneId'] = $zone_object->GetID();
 					}
 					$this->Application->SetVar('dst', $temp);
 				}
 
-				$dst_event = new kEvent();
-				$dst_event->Init('dst');
-				$dst_event->Name = 'OnCreate';
+				$dst_event = new kEvent('dst:OnCreate');
 				$this->Application->HandleEvent($dst_event);
 				break;
-
-			default:
 		}
 	}
 
@@ -200,22 +204,6 @@
 		}
 	}
 
-	function OnMassDelete(&$event)
-	{
-		$ids = $this->StoreSelectedIDs($event);
-
-		$event->setEventParam('ids', $ids);
-		$this->customProcessing($event, 'before');
-		$ids = $event->getEventParam('ids');
-		$ids = implode(',', $ids);
-
-		$dst =& $this->Application->recallObject('dst');
-		$sql = 'DELETE FROM '.$dst->TableName.' WHERE ShippingZoneId IN ('.$ids.')';
-		$this->Conn->Query($sql);
-
-		parent::OnMassDelete($event);
-	}
-
 	function OnCountryChange(&$event)
 	{
 		$destinations = &$this->Application->recallObject('dst');
@@ -229,16 +217,29 @@
 		$event->redirect = false;
 	}
 
-	function OnCancel(&$event){
+	/**
+	 * Cancels kDBItem Editing/Creation
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	function OnCancel(&$event)
+	{
+		parent::OnCancel($event);
 
-		parent::OnCancel($event);
 		$dst_object = &$this->Application->recallObject('dst');
-		$delete_zones_sql = 'DELETE FROM '.$dst_object->TableName.' WHERE ShippingZoneId = 0';
+		/* @var $dst_object kDBItem */
+
+		$delete_zones_sql = '	DELETE FROM ' . $dst_object->TableName . '
+								WHERE ShippingZoneId = 0';
 		$this->Conn->Query($delete_zones_sql);
 
 		// if cancelling after create
-		if ($this->Application->RecallVar('zone_mode'.$this->Application->GetVar('m_wid')) == 'create') {
+		if ( $this->Application->RecallVar('zone_mode' . $this->Application->GetVar('m_wid')) == 'create' ) {
 			$zone =& $event->getObject();
+			/* @var $zone kDBItem */
+
 			$zone->Delete();
 		}
 	}
Index: in-link/units/link_validation/link_validation_eh.php
===================================================================
--- in-link/units/link_validation/link_validation_eh.php	(revision 14590)
+++ in-link/units/link_validation/link_validation_eh.php	(working copy)
@@ -50,11 +50,13 @@
 		}
 
 		/**
-		 * Checks permissions of user
+		 * Checks user permission to execute given $event
 		 *
 		 * @param kEvent $event
+		 * @return bool
+		 * @access public
 		 */
-		function CheckPermission(&$event)
+		public function CheckPermission(&$event)
 		{
 			$check_events = Array ('OnApproveLinks', 'OnDeclineLinks', 'OnDeleteLinks');
 			if (in_array($event->Name, $check_events)) {
@@ -89,10 +91,12 @@
 		/**
 		 * Adds calculates fields for category name
 		 *
-		 * @param kDBItem $object
+		 * @param kDBItem|kDBList $object
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function prepareObject(&$object, &$event)
+		protected function prepareObject(&$object, &$event)
 		{
 			parent::prepareObject($object, $event);
 
@@ -103,8 +107,11 @@
 		 * Allows to show only invalid links
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBList */
@@ -400,26 +407,29 @@
 		 * Approves/declines selected links
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function iterateItems(&$event)
+		protected function iterateItems(&$event)
 		{
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
 			$ids = $this->_getSelectedIds($event);
-			if (!$ids) {
-				return ;
+			if ( !$ids ) {
+				return;
 			}
 
 			$object =& $this->Application->recallObject('l.-item', null, Array ('skip_autoload' => true));
 			/* @var $object kCatDBItem */
 
 			foreach ($ids as $id) {
+				$ret = true;
 				$object->Load($id);
 
-				switch ($event->Name) {
+				switch ( $event->Name ) {
 					case 'OnApproveLinks':
 						$ret = $object->ApproveChanges();
 						break;
@@ -429,7 +439,7 @@
 						break;
 				}
 
-				if (!$ret) {
+				if ( !$ret ) {
 					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					break;
Index: in-link/units/links/links_event_handler.php
===================================================================
--- in-link/units/links/links_event_handler.php	(revision 14590)
+++ in-link/units/links/links_event_handler.php	(working copy)
@@ -34,11 +34,14 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Apply any custom changes to list's sql query
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -331,8 +334,10 @@
 		 * Makes reciprocal check on link, when it is created
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -343,8 +348,10 @@
 		 * Makes reciprocal check on link, when it is updated
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: in-link/units/listings/listings_event_handler.php
===================================================================
--- in-link/units/listings/listings_event_handler.php	(revision 14590)
+++ in-link/units/listings/listings_event_handler.php	(working copy)
@@ -69,45 +69,76 @@
 		return;
 	}
 
-	function OnBeforeItemUpdate(&$event)
+	/**
+	 * Occurs before updating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemUpdate(&$event)
 	{
 		$object =& $event->getObject();
-		if ($object->IgnoreValidation) {
+		/* @var $object kDBItem */
+
+		if ( $object->IgnoreValidation ) {
 			$object->UpdateFormattersMasterFields();
 		}
 	}
 
-	function OnBeforeItemCreate(&$event)
+	/**
+	 * Occurs before creating item
+	 *
+	 * @param kEvent $event
+	 * @return void
+	 * @access protected
+	 */
+	protected function OnBeforeItemCreate(&$event)
 	{
+		parent::OnBeforeItemCreate($event);
+
 		$object =& $event->getObject();
-		if ($object->IgnoreValidation) {
+		/* @var $object kDBItem */
+
+		if ( $object->IgnoreValidation ) {
 			$object->UpdateFormattersMasterFields();
 		}
 	}
 
 	/**
-	 * Enter description here...
+	 * 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
 	 */
-	function OnBeforeDeleteFromLive(&$event)
+	protected function OnBeforeDeleteFromLive(&$event)
 	{
+		parent::OnBeforeDeleteFromLive($event);
+
 		$object =& $event->getObject();
-		$sql = 'SELECT * FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
-				WHERE ListingId = '.$object->GetId();
+		/* @var $object kDBItem */
+
+		$sql = 'SELECT *
+				FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+				WHERE ListingId = ' . $object->GetId();
 		$original_values = $this->Conn->GetRow($sql);
 
 		$type_modified = ($object->GetDBField('ListingTypeId') != $original_values['ListingTypeId']);
 		$link_modified = ($object->GetDBField('ItemResourceId') != $original_values['ItemResourceId']);
 		$status_modified = ($object->GetDBField('Status') != $original_values['Status']);
 
-		if ($status_modified) {
+		if ( $status_modified ) {
 			$email_event = $object->GetDBField('Status') ? 'LINK.ENHANCE.APPROVE' : 'LINK.ENHANCE.DENY';
-			$sql = 'SELECT CreatedById FROM '.$this->Application->getUnitOption('l', 'TableName').'
-					WHERE ResourceId = '.$object->GetDBField('ItemResourceId');
+			$sql = 'SELECT CreatedById
+					FROM ' . $this->Application->getUnitOption('l', 'TableName') . '
+					WHERE ResourceId = ' . $object->GetDBField('ItemResourceId');
+			$user_id = $this->Conn->GetOne($sql);
 
-			$email_event_user =& $this->Application->EmailEventUser($email_event, $this->Conn->GetOne($sql));
-			$email_event_admin =& $this->Application->EmailEventAdmin($email_event);
+			$this->Application->EmailEventUser($email_event, $user_id);
+			$this->Application->EmailEventAdmin($email_event);
 		}
 
 		if ( $type_modified || $link_modified ) {
@@ -492,19 +523,23 @@
 	}
 
 	/**
-	 * Enter description here...
+	 * Apply same processing to each item being selected in grid
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function iterateItems(&$event)
+	protected function iterateItems(&$event)
 	{
-		$object =& $event->getObject( Array('skip_autoload' => true) );
+		$object =& $event->getObject(Array ('skip_autoload' => true));
+		/* @var $object kDBItem */
+
 		$ids = $this->StoreSelectedIDs($event);
 
-		if ($event->Name == 'OnMassApprove') {
+		if ( $event->Name == 'OnMassApprove' ) {
 			foreach ($ids as $id) {
 				$object->Load($id);
-				if ($object->GetDBField('Status') != STATUS_ACTIVE) {
+				if ( $object->GetDBField('Status') != STATUS_ACTIVE ) {
 					$original_values = $object->GetFieldValues();
 					$object->SetDBField('Status', STATUS_ACTIVE);
 					$this->EnhanceLink($object, $original_values);
@@ -512,16 +547,16 @@
 			}
 		}
 
-		if ($event->Name == 'OnMassDecline') {
+		if ( $event->Name == 'OnMassDecline' ) {
 			foreach ($ids as $id) {
 				$object->Load($id);
-				if ($object->GetDBField('Status') == STATUS_ACTIVE) {
+				if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
 					$original_values = $object->GetFieldValues();
 					$this->ResetLink($original_values);
 
 					$sql = 'SELECT CreatedById
-							FROM '.$this->Application->getUnitOption('l', 'TableName').'
-							WHERE ResourceId = '.$object->GetDBField('ItemResourceId');
+							FROM ' . $this->Application->getUnitOption('l', 'TableName') . '
+							WHERE ResourceId = ' . $object->GetDBField('ItemResourceId');
 					$email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.DENY', $this->Conn->GetOne($sql));
 					$email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.DENY');
 				}
@@ -531,30 +566,28 @@
 		parent::iterateItems($event);
 
 		// extend period for pending/renewal links (if owner has agreed)
-		if ($event->Name == 'OnMassApprove') {
-			$lst_object =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true));
+		if ( $event->Name == 'OnMassApprove' ) {
+			$lst_object =& $this->Application->recallObject('lst', null, Array ('skip_autoload' => true));
+			/* @var $lst_object kDBItem */
 
 			foreach ($ids as $id) {
 				$object->Load($id);
+
 				$sql = 'SELECT CreatedById
-						FROM '.$this->Application->getUnitOption('l', 'TableName').'
-						WHERE ResourceId = '.$object->GetDBField('ItemResourceId');
+						FROM ' . $this->Application->getUnitOption('l', 'TableName') . '
+						WHERE ResourceId = ' . $object->GetDBField('ItemResourceId');
 				$owner_id = $this->Conn->GetOne($sql);
 
-				if ($object->GetDBField('PendingRenewal') == 1) {
+				if ( $object->GetDBField('PendingRenewal') == 1 ) {
 					$lst_object->Load( $object->GetDBField('ListingTypeId') );
-					$dur_type_mapping = Array(	1	=>	1,
-												2	=>	60,
-												3	=>	3600,
-												4	=>	3600*24,
-												5	=>	3600*24*7,
-												6	=>	3600*24*365/12,
-												7	=>	3600*24*365
-											);
+					$dur_type_mapping = Array (
+						1 => 1, 2 => 60, 3 => 3600, 4 => 3600 * 24, 5 => 3600 * 24 * 7,
+						6 => 3600 * 24 * 365 / 12, 7 => 3600 * 24 * 365
+					);
 					$duration = $lst_object->GetDBField('Duration');
 					$duration_type = $lst_object->GetDBField('DurationType');
 					$expiration_interval = $duration * $dur_type_mapping[$duration_type];
-					$renewal_begins = max( adodb_mktime(), $object->GetDBField('ExpiresOn') );
+					$renewal_begins = max(adodb_mktime(), $object->GetDBField('ExpiresOn'));
 					$expiration_date = $renewal_begins + $expiration_interval;
 
 					$object->SetDBField('ExpiresOn_date', $expiration_date);
@@ -563,21 +596,21 @@
 					$object->SetDBField('RenewalReminderSent', 0);
 					$object->SetDBField('PendingRenewal', 0);
 
-					if ($object->Update()) {
+					if ( $object->Update() ) {
 						$event->status = kEvent::erSUCCESS;
-						$event->setRedirectParams(Array('opener' => 's'), true);
-						$email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.RENEW', $owner_id);
-						$email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.RENEW');
+						$event->setRedirectParams(Array ('opener' => 's'), true);
+						$this->Application->EmailEventUser('LINK.ENHANCE.RENEW', $owner_id);
+						$this->Application->EmailEventAdmin('LINK.ENHANCE.RENEW');
 					}
 					else {
-						$event->status=kEvent::erFAIL;
-						$event->redirect=false;
+						$event->status = kEvent::erFAIL;
+						$event->redirect = false;
 						break;
 					}
 				}
 				else {
-					$email_event_user =& $this->Application->EmailEventUser('LINK.ENHANCE.APPROVE', $owner_id);
-					$email_event_admin =& $this->Application->EmailEventAdmin('LINK.ENHANCE.APPROVE');
+					$this->Application->EmailEventUser('LINK.ENHANCE.APPROVE', $owner_id);
+					$this->Application->EmailEventAdmin('LINK.ENHANCE.APPROVE');
 				}
 			}
 		}
@@ -587,12 +620,14 @@
 	 * Redirects to cancel template on front-end
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnCancel(&$event)
+	protected function OnCancel(&$event)
 	{
 		parent::OnCancel($event);
 
-		if (!$this->Application->isAdmin) {
+		if ( !$this->Application->isAdmin ) {
 			$event->SetRedirectParam('opener', 's');
 			$event->redirect = $this->Application->GetVar('cancel_template');
 		}
@@ -732,21 +767,24 @@
 	 * Removes enhancements on listing delete
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnMassDelete(&$event)
+	protected function OnMassDelete(&$event)
 	{
-		$object =& $event->getObject( Array('skip_autoload' => true) );
+		$object =& $event->getObject( Array ('skip_autoload' => true) );
+		/*@var $object kDBItem */
+
 		$ids = $this->StoreSelectedIDs($event);
 
-		foreach($ids as $id)
-		{
+		foreach ($ids as $id) {
 			$object->Load($id);
-			if($object->GetDBField('Status') == 1)
-			{
-				$original_values = $object->GetFieldValues();
-				$this->ResetLink($original_values);
+
+			if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
+				$this->ResetLink( $object->GetFieldValues() );
 			}
 		}
+
 		parent::OnMassDelete($event);
 	}
 
Index: in-news/units/articles/articles_event_handler.php
===================================================================
--- in-news/units/articles/articles_event_handler.php	(revision 14590)
+++ in-news/units/articles/articles_event_handler.php	(working copy)
@@ -20,8 +20,11 @@
 		 * Filters out archived articles
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @see kDBEventHandler::OnListBuild()
 		 */
-		function SetCustomQuery(&$event)
+		protected function SetCustomQuery(&$event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -414,8 +417,10 @@
 		 * Create missing excerpt
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(&$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -427,8 +432,10 @@
 		 * Create missing excerpt
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(&$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -496,20 +503,25 @@
 		 * Sets default expiration based on module setting
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreCreate(&$event)
+		protected function OnPreCreate(&$event)
 		{
 			parent::OnPreCreate($event);
 
-			if ($event->status == kEvent::erSUCCESS) {
-				$object =& $event->getObject();
+			if ( $event->status != kEvent::erSUCCESS ) {
+				return ;
+			}
 
-				$archive_days = $this->Application->ConfigValue('News_Archive');
-				if ($archive_days) {
-					$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
-					$object->SetDBField('EndOn_date', $expire_date);
-					$object->SetDBField('EndOn_time', $expire_date);
-				}
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
+
+			$archive_days = $this->Application->ConfigValue('News_Archive');
+			if ( $archive_days ) {
+				$expire_date = adodb_mktime() + $archive_days * 3600 * 24;
+				$object->SetDBField('EndOn_date', $expire_date);
+				$object->SetDBField('EndOn_time', $expire_date);
 			}
 		}
 

Index: custom/units/helpers/helpers_config.php
===================================================================
--- custom/units/helpers/helpers_config.php	(revision 15111)
+++ custom/units/helpers/helpers_config.php	(working copy)
@@ -9,6 +9,6 @@
 		'EventHandlerClass'	=> Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
 		'RegisterClasses' => Array (
-			Array ('pseudo' => 'SampleHelper', 'class' => 'SampleHelper', 'file' => 'sample_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
+			Array ('pseudo' => 'SampleHelper', 'class' => 'SampleHelper', 'file' => 'sample_helper.php', 'build_event' => ''),
 		),
 	);
\ No newline at end of file
Index: custom/units/sections/articles/e_article_eh.php
===================================================================
--- custom/units/sections/articles/e_article_eh.php	(revision 15111)
+++ custom/units/sections/articles/e_article_eh.php	(working copy)
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -54,7 +54,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -77,7 +77,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -116,7 +116,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -131,7 +131,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -146,7 +146,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemLoad(kEvent &$event)
+		protected function OnBeforeItemLoad(kEvent $event)
 		{
 			parent::OnBeforeItemLoad($event);
 
@@ -160,7 +160,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -174,7 +174,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -189,7 +189,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -204,7 +204,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/categories/e_category_eh.php
===================================================================
--- custom/units/sections/categories/e_category_eh.php	(revision 15111)
+++ custom/units/sections/categories/e_category_eh.php	(working copy)
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -54,7 +54,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -77,7 +77,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -116,7 +116,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -131,7 +131,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -146,7 +146,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemLoad(kEvent &$event)
+		protected function OnBeforeItemLoad(kEvent $event)
 		{
 			parent::OnBeforeItemLoad($event);
 
@@ -160,7 +160,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -174,7 +174,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -189,7 +189,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -203,7 +203,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/custom_eh.php
===================================================================
--- custom/units/sections/custom_eh.php	(revision 15111)
+++ custom/units/sections/custom_eh.php	(working copy)
@@ -13,7 +13,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnOverrideClonedSubItems(&$event)
+		function OnOverrideClonedSubItems($event)
 		{
 			# register EReviewEventHandler class as extented from cloned ReviewEventHandler for article reviews ("n" prefix)
 //			$this->Application->registerClass('EReviewEventHandler', dirname(__FILE__) . '/reviews/e_review_eh.php', 'n-rev_EventHandler');
@@ -24,7 +24,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnModifyCategoriesConfig(&$event)
+		function OnModifyCategoriesConfig($event)
 		{
 			# get Fields configuration from /core/units/categories/categories_config.php
 			$fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
Index: custom/units/sections/links/e_link_eh.php
===================================================================
--- custom/units/sections/links/e_link_eh.php	(revision 15111)
+++ custom/units/sections/links/e_link_eh.php	(working copy)
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -54,7 +54,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -77,7 +77,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -116,7 +116,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -131,7 +131,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -146,7 +146,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemLoad(kEvent &$event)
+		protected function OnBeforeItemLoad(kEvent $event)
 		{
 			parent::OnBeforeItemLoad($event);
 
@@ -161,7 +161,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -175,7 +175,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -190,7 +190,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -205,7 +205,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/products/e_product_eh.php
===================================================================
--- custom/units/sections/products/e_product_eh.php	(revision 15111)
+++ custom/units/sections/products/e_product_eh.php	(working copy)
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -54,7 +54,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -78,7 +78,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -103,7 +103,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -117,7 +117,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -132,7 +132,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -147,7 +147,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemLoad(kEvent &$event)
+		protected function OnBeforeItemLoad(kEvent $event)
 		{
 			parent::OnBeforeItemLoad($event);
 
@@ -161,7 +161,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -175,7 +175,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -190,7 +190,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -205,7 +205,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/reviews/e_review_eh.php
===================================================================
--- custom/units/sections/reviews/e_review_eh.php	(revision 15111)
+++ custom/units/sections/reviews/e_review_eh.php	(working copy)
@@ -15,7 +15,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
@@ -35,7 +35,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -49,7 +49,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -64,7 +64,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemDelete(kEvent &$event)
+	protected function OnBeforeItemDelete(kEvent $event)
 	{
 		parent::OnBeforeItemDelete($event);
 
@@ -79,7 +79,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemLoad(kEvent &$event)
+	protected function OnBeforeItemLoad(kEvent $event)
 	{
 		parent::OnBeforeItemLoad($event);
 
@@ -94,7 +94,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(kEvent &$event)
+	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -108,7 +108,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemUpdate(kEvent &$event)
+	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -123,7 +123,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemDelete(kEvent &$event)
+	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
@@ -138,7 +138,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
Index: custom/units/sections/users/e_user_eh.php
===================================================================
--- custom/units/sections/users/e_user_eh.php	(revision 15111)
+++ custom/units/sections/users/e_user_eh.php	(working copy)
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -54,7 +54,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -77,7 +77,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -116,7 +116,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -131,7 +131,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -146,7 +146,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemLoad(kEvent &$event)
+		protected function OnBeforeItemLoad(kEvent $event)
 		{
 			parent::OnBeforeItemLoad($event);
 
@@ -161,7 +161,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -175,7 +175,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -190,7 +190,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -204,7 +204,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: custom/units/widgets/widget_eh.php
===================================================================
--- custom/units/widgets/widget_eh.php	(revision 15111)
+++ custom/units/widgets/widget_eh.php	(working copy)
@@ -34,7 +34,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$skip_permissions_check_events = Array (
 				'OnAnotherCustomEvent',
@@ -52,7 +52,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnCustomEvent(&$event)
+		function OnCustomEvent($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBList */
@@ -67,7 +67,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -87,7 +87,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -100,7 +100,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -114,7 +114,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -129,7 +129,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemLoad(kEvent &$event)
+		protected function OnBeforeItemLoad(kEvent $event)
 		{
 			parent::OnBeforeItemLoad($event);
 
@@ -144,7 +144,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -158,7 +158,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -173,7 +173,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -187,7 +187,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: in-auction/cron.php
===================================================================
--- in-auction/cron.php	(revision 15111)
+++ in-auction/cron.php	(working copy)
@@ -26,7 +26,7 @@
 
 	$application->StoreVar('user_id', USER_ROOT);
 
-	$application->HandleEvent($event, 'l-ebay:OnListItems');
+	$application->HandleEvent(new kEvent('l-ebay:OnListItems'));
 
 	$application->Done();
 
Index: in-auction/hitcounter.php
===================================================================
--- in-auction/hitcounter.php	(revision 15111)
+++ in-auction/hitcounter.php	(working copy)
@@ -26,7 +26,7 @@
 
 	$application->StoreVar('user_id', USER_ROOT);
 
-	$application->HandleEvent($event, 'l-ebay:OnHitAuction');
+	$application->HandleEvent(new kEvent('l-ebay:OnHitAuction'));
 	$filename = MODULES_PATH . '/in-auction/admin_templates/img/s.gif';
 	header('Content-type: image/gif');
 	header('Content-length: '.filesize($filename));
Index: in-auction/new_token_accept.php
===================================================================
--- in-auction/new_token_accept.php	(revision 15111)
+++ in-auction/new_token_accept.php	(working copy)
@@ -31,7 +31,7 @@
 		$process_event = $application->GetVar('process_event');
 		if ($process_event)
 		{
-			$application->HandleEvent($event, 'ebay-sections:OnNewTokenAccept');
+			$application->HandleEvent(new kEvent('ebay-sections:OnNewTokenAccept'));
 			echo 'Success! New Token is Got!';
 		} else {
 			echo '<HTML>
@@ -45,7 +45,7 @@
 			';
 		}
 	} else {
-		$application->HandleEvent($event, 'ebay-sections:OnNewTokenAccept');
+		$application->HandleEvent(new kEvent('ebay-sections:OnNewTokenAccept'));
 	}
 
 	$application->Done();
Index: in-auction/new_token_reject.php
===================================================================
--- in-auction/new_token_reject.php	(revision 15111)
+++ in-auction/new_token_reject.php	(working copy)
@@ -26,7 +26,7 @@
 	$application->StoreVar('user_id', USER_ROOT);
 
 
-	$application->HandleEvent($event, 'ebay-sections:OnNewTokenReject');
+	$application->HandleEvent(new kEvent('ebay-sections:OnNewTokenReject'));
 
 	echo 'Failure! New Token is not Generated!';
 
Index: in-auction/notify.php
===================================================================
--- in-auction/notify.php	(revision 15111)
+++ in-auction/notify.php	(working copy)
@@ -26,7 +26,7 @@
 
 	$application->StoreVar('user_id', USER_ROOT);
 
-	$application->HandleEvent($event, 'l-ebay:OnStoreToLog');
+	$application->HandleEvent(new kEvent('l-ebay:OnStoreToLog'));
 
 	$application->Done();
 
Index: in-auction/units/category_listing/category_listing_eh.php
===================================================================
--- in-auction/units/category_listing/category_listing_eh.php	(revision 15111)
+++ in-auction/units/category_listing/category_listing_eh.php	(working copy)
@@ -41,7 +41,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 //			$sql = 'SELECT Prefix
 //					FROM '.TABLE_PREFIX.'ItemTypes
@@ -60,7 +60,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnModifyCategoriesConfig(&$event)
+		function OnModifyCategoriesConfig($event)
 		{
 
 		    $title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
@@ -84,7 +84,7 @@
 //		 *
 //		 * @param kEvent $event
 //		 */
-//		function OnAfterConfigRead(&$event)
+//		function OnAfterConfigRead($event)
 //		{
 //
 //			parent::OnAfterConfigRead($event);
@@ -93,7 +93,7 @@
 //		}
 
 
-		function OnCategoriesPreSave(&$event)
+		function OnCategoriesPreSave($event)
 		{
 
 			$object =& $event->getObject();
@@ -142,7 +142,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -156,14 +156,14 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->ValidateCategories($event);
 		}
 
-		function ValidateCategories(&$event)
+		function ValidateCategories($event)
 		{
 			$this->ValidateCategoryField($event, 'AuctionPrimaryCategoryId');
 			$this->ValidateCategoryField($event, 'AuctionSecondaryCategoryId');
@@ -171,7 +171,7 @@
 			$this->ValidateCategoryField($event, 'StoreSecondaryCategoryId', 1);
 		}
 
-		function ValidateCategoryField(&$event, $field, $is_store = 0)
+		function ValidateCategoryField($event, $field, $is_store = 0)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -212,7 +212,7 @@
 		 * @return int
 		 * @access public
 		 */
-		public function getPassedID(kEvent &$event)
+		public function getPassedID(kEvent $event)
 		{
 			$category_id = $this->Application->GetVar('c_id');
 
@@ -232,7 +232,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterCategorySave(&$event)
+		function OnAfterCategorySave($event)
 		{
 
 			if ($event->MasterEvent->status != kEvent::erSUCCESS)
@@ -341,7 +341,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterProductValidate(&$event)
+		function OnAfterProductValidate($event)
 		{
 			$Product =& $event->MasterEvent->getObject();
 
Index: in-auction/units/error_log/error_log_eh.php
===================================================================
--- in-auction/units/error_log/error_log_eh.php	(revision 15111)
+++ in-auction/units/error_log/error_log_eh.php	(working copy)
@@ -42,7 +42,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -65,7 +65,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnDeleteAll(kEvent &$event)
+		protected function OnDeleteAll(kEvent $event)
 		{
 			if ( !$this->Application->isAdminUser || $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
@@ -100,7 +100,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
Index: in-auction/units/helpers/helpers_config.php
===================================================================
--- in-auction/units/helpers/helpers_config.php	(revision 15111)
+++ in-auction/units/helpers/helpers_config.php	(working copy)
@@ -18,8 +18,8 @@
 		'EventHandlerClass'	=>	Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
 		'RegisterClasses' => Array (
-			Array('pseudo' => 'eBayHelper', 'class' => 'eBayHelper', 'file' => 'ebay_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')),
-			Array('pseudo' => 'CatSelectHelper', 'class' => 'CatSelectHelper', 'file' => 'catselect_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')),
-			Array('pseudo' => 'XMLHelper', 'class' => 'XMLHelper', 'file' => 'xml_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')),
+			Array('pseudo' => 'eBayHelper', 'class' => 'eBayHelper', 'file' => 'ebay_helper.php', 'build_event' => ''),
+			Array('pseudo' => 'CatSelectHelper', 'class' => 'CatSelectHelper', 'file' => 'catselect_helper.php', 'build_event' => ''),
+			Array('pseudo' => 'XMLHelper', 'class' => 'XMLHelper', 'file' => 'xml_helper.php', 'build_event' => ''),
 		),
 	);
\ No newline at end of file
Index: in-auction/units/listing/listing_eh.php
===================================================================
--- in-auction/units/listing/listing_eh.php	(revision 15111)
+++ in-auction/units/listing/listing_eh.php	(working copy)
@@ -50,7 +50,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnNewListingWindow(&$event)
+		function OnNewListingWindow($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -100,7 +100,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -164,7 +164,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnDeleteAll(kEvent &$event)
+		protected function OnDeleteAll(kEvent $event)
 		{
 			if ( !$this->Application->isAdminUser || $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
@@ -201,7 +201,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -225,7 +225,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnProcessAddListing(&$event)
+		function OnProcessAddListing($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -293,7 +293,7 @@
 		 * @param int $product_id
 		 * @return Array
 		 */
-		function getProductFields(&$event, $product_id)
+		function getProductFields($event, $product_id)
 		{
 			static $items_info = null;
 
@@ -318,7 +318,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(kEvent &$event, $type)
+		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$a_ids = $event->getEventParam('ids');
@@ -410,7 +410,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnListItems(&$event)
+		function OnListItems($event)
 		{
 			// get queued items data
 			if (!$this->Application->isAdmin) {
@@ -1065,7 +1065,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnStoreToLog(&$event)
+		function OnStoreToLog($event)
 		{
 
 			$eBayHelper =& $this->Application->recallObject('eBayHelper');
@@ -1082,7 +1082,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnArchive(&$event)
+		function OnArchive($event)
 		{
 			if (!$this->Application->isAdminUser || $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
@@ -1110,7 +1110,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnEndItem(&$event)
+		function OnEndItem($event)
 		{
 			if (!$this->Application->isAdminUser || $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
@@ -1148,7 +1148,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnArchiveAll(&$event)
+		function OnArchiveAll($event)
 		{
 			if (!$this->Application->isAdminUser || $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
@@ -1183,7 +1183,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnHitAuction(&$event)
+		function OnHitAuction($event)
 		{
 
 			if ($this->Application->ConfigValue('eBay_UseEbayCounters') == 1)
@@ -1210,7 +1210,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnChangeStatistics(&$event)
+		function OnChangeStatistics($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -1297,7 +1297,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnPrintChart(&$event)
+		function OnPrintChart($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -1350,7 +1350,7 @@
 
 		}
 
-		function OnExportReport(&$event)
+		function OnExportReport($event)
 		{
 
 			$a_report = unserialize($this->Application->RecallVar('report_data'));
Index: in-auction/units/product_listing/product_listing_eh.php
===================================================================
--- in-auction/units/product_listing/product_listing_eh.php	(revision 15111)
+++ in-auction/units/product_listing/product_listing_eh.php	(working copy)
@@ -42,7 +42,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			/*$sql = 'SELECT Prefix
 					FROM ' . TABLE_PREFIX . 'ItemTypes
@@ -63,7 +63,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnModifyProductsConfig(&$event)
+		function OnModifyProductsConfig($event)
 		{
 
 		    $title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
@@ -89,7 +89,7 @@
 		 * @param kEvent $event
 		 * @access protected
 		 */
-		protected function OnItemBuild(kEvent &$event)
+		protected function OnItemBuild(kEvent $event)
 		{
 			parent::OnItemBuild($event);
 
@@ -108,7 +108,7 @@
 			}
 		}
 
-		function OnProductsPreSave(&$event)
+		function OnProductsPreSave($event)
 		{
 
 			$object =& $event->getObject();
@@ -166,7 +166,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -180,14 +180,14 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->ValidateCategories($event);
 		}
 
-		function ValidateCategories(&$event)
+		function ValidateCategories($event)
 		{
 			$this->ValidateCategoryField($event, 'AuctionPrimaryCategoryId');
 			$this->ValidateCategoryField($event, 'AuctionSecondaryCategoryId');
@@ -195,7 +195,7 @@
 			$this->ValidateCategoryField($event, 'StoreSecondaryCategoryId', 1);
 		}
 
-		function ValidateCategoryField(&$event, $field, $is_store = 0)
+		function ValidateCategoryField($event, $field, $is_store = 0)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -236,7 +236,7 @@
 		 * @return int
 		 * @access public
 		 */
-		public function getPassedID(kEvent &$event)
+		public function getPassedID(kEvent $event)
 		{
 			$product_id = $this->Application->GetVar('p_id');
 
@@ -258,7 +258,7 @@
 		 */
 
 		/*
-		function OnAfterCopyImagesToLive(&$event)
+		function OnAfterCopyImagesToLive($event)
 		{
 			$id = $event->MasterEvent->getEventParam('id');
 			$temp_id = $event->MasterEvent->getEventParam('temp_id');
@@ -356,7 +356,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnGenerateTemplate(&$event)
+		function OnGenerateTemplate($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
Index: in-auction/units/schedule/schedule_eh.php
===================================================================
--- in-auction/units/schedule/schedule_eh.php	(revision 15111)
+++ in-auction/units/schedule/schedule_eh.php	(working copy)
@@ -40,7 +40,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnMassDisable(&$event)
+		function OnMassDisable($event)
 		{
 			$this->SetMassStatus($event, 0);
 		}
@@ -50,7 +50,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnMassEnable(&$event)
+		function OnMassEnable($event)
 		{
 			$this->SetMassStatus($event, 1);
 		}
@@ -61,7 +61,7 @@
 		 * @param kEvent $event
 		 * @param int $status
 		 */
-		function SetMassStatus(&$event, $status)
+		function SetMassStatus($event, $status)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
Index: in-auction/units/sections/ebay_eh.php
===================================================================
--- in-auction/units/sections/ebay_eh.php	(revision 15111)
+++ in-auction/units/sections/ebay_eh.php	(working copy)
@@ -45,7 +45,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterProductConfigRead(&$event)
+		function OnAfterProductConfigRead($event)
 		{
 			$a_fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
 
@@ -135,7 +135,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterCategoryConfigRead(&$event)
+		function OnAfterCategoryConfigRead($event)
 		{
 			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
 			$edit_tab_presets['Default']['ebay'] = Array (
@@ -149,7 +149,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterImageAdded(&$event)
+		function OnAfterImageAdded($event)
 		{
 			$image =& $event->MasterEvent->getObject();
 
@@ -219,7 +219,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterSaveProduct(&$event)
+		function OnAfterSaveProduct($event)
 		{
 			$temp_handler =& $this->Application->recallObject($event->MasterEvent->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler');
 			/* @var $temp_handler kTempTablesHandler */
@@ -258,7 +258,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnBeforeProductItemCreate(&$event)
+		function OnBeforeProductItemCreate($event)
 		{
 			$object =& $event->MasterEvent->getObject();
 			$product_type = $object->GetDBField('Type');
@@ -311,7 +311,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnApproveEbayProduct(&$event)
+		function OnApproveEbayProduct($event)
 		{
 			// the call of this event is based on Products->ProcessingData
 			// field value
@@ -442,7 +442,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnRefreshStore(&$event)
+		function OnRefreshStore($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -491,7 +491,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnTestAddUser(&$event)
+		function OnTestAddUser($event)
 		{
 //			$this->AddEbayUser('alex-intechnic','110024859878');
 
@@ -1016,7 +1016,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnRefreshCategories(&$event)
+		function OnRefreshCategories($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -1391,7 +1391,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnRefreshAttributes(&$event)
+		function OnRefreshAttributes($event)
 		{
 			ini_set('memory_limit', '200M');
 
@@ -1590,7 +1590,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnAddListingLog(&$event)
+		function OnAddListingLog($event)
 		{
 
 			// read new listing log
@@ -2154,7 +2154,7 @@
 		 * and redirect to MyOrders section ?
 		 * @param kEvent $event
 		 */
-		function OnOrderLogin(&$event)
+		function OnOrderLogin($event)
 		{
 			$key = $this->Application->GetVar('key');
 			if ($key == '')
@@ -2209,7 +2209,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnBeforeRemoveFromCart(&$event)
+		function OnBeforeRemoveFromCart($event)
 		{
 
 			$ord_item_id = $this->Application->GetVar('orditems_id');
@@ -2229,7 +2229,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnBeforeRecalculateItems(&$event)
+		function OnBeforeRecalculateItems($event)
 		{
 			if ($this->Application->isAdminUser) {
 				return;
@@ -2418,7 +2418,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnBeforeCompleteOrder(&$event)
+		function OnBeforeCompleteOrder($event)
 		{
 			$order =& $event->MasterEvent->getObject();
 			/* @var $order OrdersItem */
@@ -2539,7 +2539,7 @@
 
 		}
 
-		function OnModifyUsersConfig(&$event)
+		function OnModifyUsersConfig($event)
 		{
 		    $fields = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Fields');
 			$fields['EbayLogin'] = Array ('type' => 'string', 'max_len' => 255, 'default' => NULL);
@@ -2595,7 +2595,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnGetSellerList(&$event)
+		function OnGetSellerList($event)
 		{
 			$a_times = $this->GetRequestInterval('get_list_time', 'eBay_GetSellerListIntervalHours');
 			if (!$a_times) {
@@ -2743,7 +2743,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnSubscribeListingNotifications(&$event)
+		function OnSubscribeListingNotifications($event)
 		{
 			if (!$this->IsNotifiableServer())
 			{
@@ -2812,7 +2812,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnGetSellerTransactions(&$event)
+		function OnGetSellerTransactions($event)
 		{
 			$a_times = $this->GetRequestInterval('get_transactions_time', 'eBay_GetSellerTransactionsIntervalHours');
 			if (!$a_times) {
@@ -2940,7 +2940,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnAutoDispute(&$event)
+		function OnAutoDispute($event)
 		{
 
 			$dispute_days = $this->Application->ConfigValue('eBay_AutoDisputeDays');
@@ -3091,7 +3091,7 @@
 		 * @param kEvent $event
 		 */
 
-		function OnProcessSchedule(&$event)
+		function OnProcessSchedule($event)
 		{
 			// Get Schedules to run
 //			return;
@@ -3267,7 +3267,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnConfigUpdate(&$event)
+		function OnConfigUpdate($event)
 		{
 			// save changes in ebay shipping options, made on config template
 	//		$object =& $event->getObject();
@@ -3335,7 +3335,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnDeleteOldHits(&$event)
+		function OnDeleteOldHits($event)
 		{
 			return;
 			$delay = $this->Application->ConfigValue('eBay_ListingHitsDelayMinutes');
@@ -3354,7 +3354,7 @@
 		/**
 		 * Redirect to error page
 		 */
-		function OnNewTokenReject(&$event)
+		function OnNewTokenReject($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -3364,7 +3364,7 @@
 		/**
 		 * Write new token to DB
 		 */
-		function OnNewTokenAccept(&$event)
+		function OnNewTokenAccept($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -3409,7 +3409,7 @@
 		 * @param kEvent $event
 		 * @return void
 		 */
-		function OnAuthorizeForToken(&$event)
+		function OnAuthorizeForToken($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -3472,7 +3472,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnReviseCheckoutStatuses(&$event)
+		function OnReviseCheckoutStatuses($event)
 		{
 			// Get all ebay items where order is approved, and CheckoutStatus is 0
 
@@ -3532,7 +3532,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnReceiveFeedbacks(&$event)
+		function OnReceiveFeedbacks($event)
 		{
 
 			$eBayHelper =& $this->Application->recallObject('eBayHelper');
@@ -3650,7 +3650,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSendFeedbacks(&$event)
+		function OnSendFeedbacks($event)
 		{
 
 			if ($this->Application->ConfigValue('eBay_EnableFeedback') != 1)
@@ -3760,7 +3760,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSendFeedbackNotifications(&$event)
+		function OnSendFeedbackNotifications($event)
 		{
 			if (!$this->Application->ConfigValue('eBay_SendFeedbackNotification'))
 			{
@@ -3850,7 +3850,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnDeleteToken(&$event)
+		function OnDeleteToken($event)
 		{
 			if (!DEBUG_MODE || !$this->Application->isAdminUser) {
 				return;
@@ -3866,7 +3866,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSetAPIKeys(&$event)
+		function OnSetAPIKeys($event)
 		{
 			if (!DEBUG_MODE || !$this->Application->isAdminUser) {
 				return;
Index: in-auction/units/shipping/shipping_eh.php
===================================================================
--- in-auction/units/shipping/shipping_eh.php	(revision 15111)
+++ in-auction/units/shipping/shipping_eh.php	(working copy)
@@ -44,7 +44,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -67,7 +67,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnConfigUpdate(&$event)
+		function OnConfigUpdate($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -92,7 +92,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnAfterParentLoad(&$event)
+		function OnAfterParentLoad($event)
 		{
 			if (!$this->IsOnEbayTab())
 			{
@@ -154,7 +154,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnParentPreSave(&$event)
+		function OnParentPreSave($event)
 		{
 			if (!$this->Application->isAdminUser) {
 				return;
@@ -186,7 +186,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function UseTempTables(kEvent &$event)
+		protected function UseTempTables(kEvent $event)
 		{
 			if ( $this->IsOnEbayTab() ) {
 				return true;
Index: in-bulletin/units/emoticons/emoticon_eh.php
===================================================================
--- in-bulletin/units/emoticons/emoticon_eh.php	(revision 15111)
+++ in-bulletin/units/emoticons/emoticon_eh.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
Index: in-bulletin/units/helpers/helpers_config.php
===================================================================
--- in-bulletin/units/helpers/helpers_config.php	(revision 15111)
+++ in-bulletin/units/helpers/helpers_config.php	(working copy)
@@ -19,6 +19,6 @@
 		'EventHandlerClass'	=>	Array('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
 		'RegisterClasses' => Array (
-			Array('pseudo' => 'PostHelper', 'class' => 'PostHelper','file' => 'post_helper.php', 'build_event' => '', 'require_classes' => Array('kHelper')),
+			Array('pseudo' => 'PostHelper', 'class' => 'PostHelper','file' => 'post_helper.php', 'build_event' => ''),
 		),
 	);
\ No newline at end of file
Index: in-bulletin/units/poll_comments/poll_comment_eh.php
===================================================================
--- in-bulletin/units/poll_comments/poll_comment_eh.php	(revision 15111)
+++ in-bulletin/units/poll_comments/poll_comment_eh.php	(working copy)
@@ -42,7 +42,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -63,7 +63,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -84,7 +84,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			if ( !$this->Application->isAdmin ) {
 				$object =& $event->getObject();
@@ -123,7 +123,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCreate(kEvent &$event)
+		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
@@ -141,7 +141,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
Index: in-bulletin/units/polls/poll_eh.php
===================================================================
--- in-bulletin/units/polls/poll_eh.php	(revision 15111)
+++ in-bulletin/units/polls/poll_eh.php	(working copy)
@@ -44,7 +44,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -64,7 +64,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnResetVotes(&$event)
+		function OnResetVotes($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -89,7 +89,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -104,7 +104,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnMakeVote(&$event)
+		function OnMakeVote($event)
 		{
 			$object =& $event->getObject($this->Application->GetVar('poll_id'));
 			/* @var $object kDBItem */
@@ -157,7 +157,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
Index: in-bulletin/units/posts/post_eh.php
===================================================================
--- in-bulletin/units/posts/post_eh.php	(revision 15111)
+++ in-bulletin/units/posts/post_eh.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$events = Array ('OnUpdate', 'OnDelete');
 
@@ -41,7 +41,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -89,7 +89,7 @@
 		 * @param kEvent $event
 		 * @param string $permissions
 		 */
-		function checkPostPermission(&$event, $permissions)
+		function checkPostPermission($event, $permissions)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -118,7 +118,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -150,7 +150,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -164,7 +164,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -183,7 +183,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -209,7 +209,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -261,8 +261,7 @@
 			if ( (int)$auto_lock > 0 ) {
 				if ( $posts_count >= $auto_lock ) {
 					// user has unlocked topic after $auto_lock and posts again -> ensure that topic will be locked again
-					$lock_event = new kEvent($parent_prefix . ':OnTopicLockToggle');
-					$this->Application->HandleEvent($lock_event);
+					$this->Application->HandleEvent(new kEvent($parent_prefix . ':OnTopicLockToggle'));
 				}
 			}
 		}
@@ -273,7 +272,7 @@
 		 * @param kEvent $event
 		 * @param kCatDBItem $main_object
 		 */
-		function updateTopicInfo(&$event, &$main_object)
+		function updateTopicInfo($event, &$main_object)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -296,7 +295,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCreate(kEvent &$event)
+		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
@@ -313,7 +312,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnUpdate(kEvent &$event)
+		protected function OnUpdate(kEvent $event)
 		{
 			parent::OnUpdate($event);
 
@@ -331,7 +330,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -386,7 +385,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -404,7 +403,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnDelete(kEvent &$event)
+		protected function OnDelete(kEvent $event)
 		{
 			parent::OnDelete($event);
 
@@ -421,7 +420,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnNew(kEvent &$event)
+		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
Index: in-bulletin/units/private_message_body/private_message_body_eh.php
===================================================================
--- in-bulletin/units/private_message_body/private_message_body_eh.php	(revision 15111)
+++ in-bulletin/units/private_message_body/private_message_body_eh.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -50,7 +50,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
Index: in-bulletin/units/private_messages/private_message_eh.php
===================================================================
--- in-bulletin/units/private_messages/private_message_eh.php	(revision 15111)
+++ in-bulletin/units/private_messages/private_message_eh.php	(working copy)
@@ -44,7 +44,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -77,7 +77,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -102,7 +102,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -145,7 +145,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -171,7 +171,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCreate(kEvent &$event)
+		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
@@ -188,7 +188,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -210,7 +210,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemDelete(kEvent &$event)
+		protected function OnAfterItemDelete(kEvent $event)
 		{
 	    	parent::OnAfterItemDelete($event);
 
@@ -233,7 +233,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -251,7 +251,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function checkItemStatus(kEvent &$event)
+		protected function checkItemStatus(kEvent $event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -271,7 +271,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnNew(kEvent &$event)
+		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
Index: in-bulletin/units/topics/topics_config.php
===================================================================
--- in-bulletin/units/topics/topics_config.php	(revision 15111)
+++ in-bulletin/units/topics/topics_config.php	(working copy)
@@ -18,8 +18,8 @@
 					'Prefix'			=>	'bb',
 					'ItemClass'			=>	Array ('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array ('class' => 'TopicsEventHandler', 'file' => 'topics_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array ('class' => 'TopicsTagProcessor', 'file' => 'topics_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'),
+					'EventHandlerClass'	=>	Array ('class' => 'TopicsEventHandler', 'file' => 'topics_event_handler.php', 'build_event' => 'OnBuild'),
+					'TagProcessorClass' =>	Array ('class' => 'TopicsTagProcessor', 'file' => 'topics_tag_processor.php', 'build_event' => 'OnBuild'),
 					'AutoLoad'			=>	true,
 					'QueryString'		=>	Array (
 												1 => 'id',
Index: in-bulletin/units/topics/topics_event_handler.php
===================================================================
--- in-bulletin/units/topics/topics_event_handler.php	(revision 15111)
+++ in-bulletin/units/topics/topics_event_handler.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnTopicLockToggle' ) {
 				$object =& $event->getObject();
@@ -52,7 +52,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnToggleLock(&$event)
+		function OnToggleLock($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -69,7 +69,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -83,7 +83,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -109,7 +109,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -144,7 +144,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -175,7 +175,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -192,7 +192,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnTopicLockToggle(&$event)
+		function OnTopicLockToggle($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kCatDBItem */
@@ -209,7 +209,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -231,7 +231,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCloneSubItem(kEvent &$event)
+		protected function OnCloneSubItem(kEvent $event)
 		{
 			parent::OnCloneSubItem($event);
 
Index: in-commerce/gw_notify.php
===================================================================
--- in-commerce/gw_notify.php	(revision 15111)
+++ in-commerce/gw_notify.php	(working copy)
@@ -54,8 +54,7 @@
 
 	if($transaction_status == 1)
 	{
-		$dummy_var = '10';
-		$application->HandleEvent($dummy_var, 'ord:OnCompleteOrder');
+		$application->HandleEvent(new kEvent('ord:OnCompleteOrder'));
 	}
 	else {
 		$application->StoreVar('gw_error', $gateway_object->getErrorMsg());
Index: in-commerce/units/addresses/addresses_event_handler.php
===================================================================
--- in-commerce/units/addresses/addresses_event_handler.php	(revision 15111)
+++ in-commerce/units/addresses/addresses_event_handler.php	(working copy)
@@ -43,7 +43,7 @@
 		 * @return string
 		 * @access protected
 		 */
-		protected function getMainSpecial(kEvent &$event)
+		protected function getMainSpecial(kEvent $event)
 		{
 			return '';
 		}
@@ -56,7 +56,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -95,7 +95,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -125,7 +125,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnUpdate(kEvent &$event)
+		protected function OnUpdate(kEvent $event)
 		{
 			parent::OnUpdate($event);
 
@@ -139,7 +139,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCreate(kEvent &$event)
+		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
@@ -153,7 +153,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function setNextTemplate(kEvent &$event)
+		protected function setNextTemplate(kEvent $event)
 		{
 			if ( $this->Application->isAdminUser ) {
 				return;
@@ -174,7 +174,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -191,7 +191,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function OnUpdateProfileAddress(kEvent &$event)
+		protected function OnUpdateProfileAddress(kEvent $event)
 		{
 			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
@@ -266,7 +266,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function OnUpdateUserProfile(kEvent &$event)
+		protected function OnUpdateUserProfile(kEvent $event)
 		{
 			$user =& $event->MasterEvent->getObject();
 			/* @var $user UsersItem */
@@ -328,7 +328,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function checkItemStatus(kEvent &$event)
+		protected function checkItemStatus(kEvent $event)
 		{
 			if ( $this->Application->isAdminUser ) {
 				return true;
@@ -357,7 +357,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -391,7 +391,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemDelete(kEvent &$event)
+		protected function OnBeforeItemDelete(kEvent $event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -412,7 +412,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -429,7 +429,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnModifyUsersConfig(&$event)
+		function OnModifyUsersConfig($event)
 		{
 			$title_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TitlePresets');
 
Index: in-commerce/units/affiliate_payment_types/affiliate_payment_types_event_handler.php
===================================================================
--- in-commerce/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(revision 15111)
+++ in-commerce/units/affiliate_payment_types/affiliate_payment_types_event_handler.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -40,7 +40,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSetPrimary(&$event)
+		function OnSetPrimary($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -57,7 +57,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -71,7 +71,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -83,7 +83,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function itemChanged(&$event)
+		function itemChanged($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -106,7 +106,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(kEvent &$event, $type)
+		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
Index: in-commerce/units/affiliate_payments/affiliate_payments_event_handler.php
===================================================================
--- in-commerce/units/affiliate_payments/affiliate_payments_event_handler.php	(revision 15111)
+++ in-commerce/units/affiliate_payments/affiliate_payments_event_handler.php	(working copy)
@@ -25,7 +25,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function prepareObject(&$object, kEvent &$event)
+		protected function prepareObject(&$object, kEvent $event)
 		{
 			if ( $event->Special == 'log' ) {
 				return ;
@@ -57,7 +57,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnNew(kEvent &$event)
+		protected function OnNew(kEvent $event)
 		{
 			parent::OnNew($event);
 
@@ -78,7 +78,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(kEvent &$event)
+		protected function OnAfterItemCreate(kEvent $event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -109,7 +109,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
Index: in-commerce/units/affiliate_plans/affiliate_plans_event_handler.php
===================================================================
--- in-commerce/units/affiliate_plans/affiliate_plans_event_handler.php	(revision 15111)
+++ in-commerce/units/affiliate_plans/affiliate_plans_event_handler.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -40,7 +40,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSetPrimary(&$event)
+		function OnSetPrimary($event)
 		{
 			$object =& $event->getObject();
 			$object->SetDBField('IsPrimary', 1);
@@ -54,7 +54,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -68,7 +68,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -80,7 +80,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function itemChanged(&$event)
+		function itemChanged($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -109,7 +109,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(kEvent &$event, $type)
+		protected function customProcessing(kEvent $event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
Index: in-commerce/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php
===================================================================
--- in-commerce/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(revision 15111)
+++ in-commerce/units/affiliate_plans_brackets/affiliate_plans_brackets_event_handler.php	(working copy)
@@ -40,7 +40,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnMoreBrackets(&$event)
+		function OnMoreBrackets($event)
 		{
 			$event->redirect = false;
 
@@ -54,7 +54,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnArrange(&$event)
+		function OnArrange($event)
 		{
 			$event->redirect = false;
 			$brackets_helper =& $this->Application->recallObject('BracketsHelper');
@@ -69,7 +69,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnInfinity(&$event)
+		function OnInfinity($event)
 		{
 			$event->redirect = false;
 			$brackets_helper =& $this->Application->recallObject('BracketsHelper');
@@ -90,7 +90,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -112,7 +112,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnPreSaveBrackets(&$event)
+		function OnPreSaveBrackets($event)
 		{
 			$brackets_helper =& $this->Application->recallObject('BracketsHelper');
 			/* @var $brackets_helper kBracketsHelper */
Index: in-commerce/units/affiliate_plans_items/affiliate_plans_items_event_handler.php
===================================================================
--- in-commerce/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(revision 15111)
+++ in-commerce/units/affiliate_plans_items/affiliate_plans_items_event_handler.php	(working copy)
@@ -21,7 +21,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnProcessSelected(&$event)
+		function OnProcessSelected($event)
 		{
 			// uses another handler event, because does the same stuff but on different table
 			$di_handler =& $this->Application->recallObject('di_EventHandler');
@@ -35,7 +35,7 @@
 		 * @todo get parent item id through $object->getLinkedInfo()['ParentId']
 		 * @access public
 		 */
-		function OnEntireOrder(&$event)
+		function OnEntireOrder($event)
 		{
 			$object =& $event->GetObject();
 			$sql = 'DELETE FROM '.$object->TableName.' WHERE AffiliatePlanId='.$this->Application->GetVar('ap_id');
@@ -62,7 +62,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnDeleteDiscountedItem(&$event)
+		function OnDeleteDiscountedItem($event)
 		{
 			$main_object =& $event->MasterEvent->getObject();
 			$resource_id = $main_object->GetDBField('ResourceId');
@@ -79,7 +79,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
Index: in-commerce/units/affiliates/affiliates_event_handler.php
===================================================================
--- in-commerce/units/affiliates/affiliates_event_handler.php	(revision 15111)
+++ in-commerce/units/affiliates/affiliates_event_handler.php	(working copy)
@@ -40,7 +40,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			if ( $event->Name == 'OnBecomeAffiliate' || $event->Name == 'OnChangePaymentType' ) {
 				return $this->Application->LoggedIn() && $this->Application->ConfigValue('Comm_RegisterAsAffiliate');
@@ -56,7 +56,7 @@
 		 * @return int
 		 * @access public
 		 */
-		public function getPassedID(kEvent &$event)
+		public function getPassedID(kEvent $event)
 		{
 			if ( $event->Special == 'user' ) {
 				$event->setEventParam('raise_warnings', 0);
@@ -80,7 +80,7 @@
 		 * @param kEvent $event
 		 * @return string
 		 */
-		function generateAffiliateCode(&$event)
+		function generateAffiliateCode($event)
 		{
 			// accepts 1 - 36
 			$number_length = 11;
@@ -117,7 +117,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -142,7 +142,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -164,8 +164,12 @@
 		 * @param kEvent $event
 		 * @return bool
 		 */
-		function OnStoreAffiliate(&$event)
+		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 */
 
@@ -219,7 +223,7 @@
 		 * @param kEvent $event
 		 * @author Alex
 		 */
-		function OnOrderApprove(&$event)
+		function OnOrderApprove($event)
 		{
 			$order =& $this->Application->recallObject($event->getEventParam('Order_PrefixSpecial'));
 			/* @var $order OrdersItem */
@@ -299,7 +303,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnValidateAffiliate(&$event)
+		protected function OnValidateAffiliate($event)
 		{
 			if ( $this->Application->GetVar('RegisterAsAffiliate') != 'on' || $event->MasterEvent->status != kEvent::erSUCCESS ) {
 				return;
@@ -327,7 +331,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnRegisterAffiliate(&$event)
+		function OnRegisterAffiliate($event)
 		{
 			if ( $this->Application->GetVar('RegisterAsAffiliate') != 'on' || $event->MasterEvent->status != kEvent::erSUCCESS ) {
 				return;
@@ -367,7 +371,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnBecomeAffiliate(&$event)
+		function OnBecomeAffiliate($event)
 		{
 			$object =& $event->getObject( Array('form_name' => 'registration', 'skip_autoload' => true) );
 			/* @var $object UsersItem */
@@ -392,7 +396,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnChangePaymentType(&$event)
+		protected function OnChangePaymentType($event)
 		{
 			$event->CallSubEvent('OnUpdate');
 
@@ -420,7 +424,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteFromLive(kEvent &$event)
+		protected function OnBeforeDeleteFromLive(kEvent $event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
@@ -474,7 +478,7 @@
 		 * @param kEvent $event
 		 * @author Alex
 		 */
-		function OnResetStatistics(&$event)
+		function OnResetStatistics($event)
 		{
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				return;
@@ -574,7 +578,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function iterateItems(kEvent &$event)
+		protected function iterateItems(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
@@ -641,7 +645,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function checkItemStatus(kEvent &$event)
+		protected function checkItemStatus(kEvent $event)
 		{
 			if ( $this->Application->isAdminUser ) {
 				return true;
Index: in-commerce/units/brackets/brackets_event_handler.php
===================================================================
--- in-commerce/units/brackets/brackets_event_handler.php	(revision 15111)
+++ in-commerce/units/brackets/brackets_event_handler.php	(working copy)
@@ -45,7 +45,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function prepareObject(&$object, kEvent &$event)
+	protected function prepareObject(&$object, kEvent $event)
 	{
 		if ( $this->Application->GetVar('s_id') === false ) {
 			return;
@@ -72,7 +72,7 @@
 		}
 	}
 
-	function prepareBrackets(&$event)
+	function prepareBrackets($event)
 	{
 		$lang_object =& $this->Application->recallObject('lang.current');
 		/* @var $lang_object LanguagesItem */
@@ -113,7 +113,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnMoreBrackets(&$event)
+	function OnMoreBrackets($event)
 	{
 		$brackets_helper =& $this->getHelper($event);
 
@@ -125,7 +125,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnArrange(&$event)
+	function OnArrange($event)
 	{
 		$brackets_helper =& $this->getHelper($event);
 
@@ -138,7 +138,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnInfinity(&$event)
+	function OnInfinity($event)
 	{
 		$brackets_helper =& $this->getHelper($event);
 
@@ -156,7 +156,7 @@
 	 * @param bool $event_readonly
 	 * @return kBracketsHelper
 	 */
-	protected function &getHelper(&$event, $event_readonly = false)
+	protected function &getHelper($event, $event_readonly = false)
 	{
 		$shipping_object =& $this->Application->recallObject('s');
 		/* @var $shipping_object kDBItem */
@@ -183,7 +183,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -202,7 +202,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnPreSaveBrackets(&$event)
+	function OnPreSaveBrackets($event)
 	{
 		$lang_object =& $this->Application->recallObject('lang.current');
 		/* @var $lang_object LanguagesItem */
Index: in-commerce/units/coupon_items/coupon_items_event_handler.php
===================================================================
--- in-commerce/units/coupon_items/coupon_items_event_handler.php	(revision 15111)
+++ in-commerce/units/coupon_items/coupon_items_event_handler.php	(working copy)
@@ -38,7 +38,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProcessSelected(&$event)
+	function OnProcessSelected($event)
 	{
 		// uses another handler event, because does the same stuff but on different table
 		$di_handler =& $this->Application->recallObject('di_EventHandler');
@@ -52,7 +52,7 @@
 	 * @todo get parent item id through $object->getLinkedInfo()['ParentId']
 	 * @access public
 	 */
-	function OnEntireOrder(&$event)
+	function OnEntireOrder($event)
 	{
 		$object =& $event->GetObject();
 		$sql = 'DELETE FROM '.$object->TableName.' WHERE CouponId='.$this->Application->GetVar('coup_id');
@@ -79,7 +79,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDeleteCouponItem(&$event)
+	function OnDeleteCouponItem($event)
 	{
 		$main_object =& $event->MasterEvent->getObject();
 		$resource_id = $main_object->GetDBField('ResourceId');
@@ -96,7 +96,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
Index: in-commerce/units/coupons/coupons_event_handler.php
===================================================================
--- in-commerce/units/coupons/coupons_event_handler.php	(revision 15111)
+++ in-commerce/units/coupons/coupons_event_handler.php	(working copy)
@@ -40,7 +40,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnPrepareClone(&$event)
+	function OnPrepareClone($event)
 	{
 		$this->StoreSelectedIDs($event);
 
@@ -71,7 +71,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeClone(kEvent &$event)
+	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
@@ -89,7 +89,7 @@
 		$object->SetDBField('Expiration_time', $expiration);
 	}
 
-	function OnApplyClone(&$event)
+	function OnApplyClone($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
@@ -174,7 +174,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(kEvent &$event)
+	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
@@ -198,7 +198,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -212,7 +212,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -224,7 +224,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function itemChanged(&$event)
+	function itemChanged($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
Index: in-commerce/units/currencies/currencies_event_handler.php
===================================================================
--- in-commerce/units/currencies/currencies_event_handler.php	(revision 15111)
+++ in-commerce/units/currencies/currencies_event_handler.php	(working copy)
@@ -51,7 +51,7 @@
 	 * @return int
 	 * @access public
 	 */
-	public function getPassedID(kEvent &$event)
+	public function getPassedID(kEvent $event)
 	{
 		if ( $event->Special == 'current' ) {
 			return Array ('ISO' => $this->Application->RecallVar('curr_iso'));
@@ -65,7 +65,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSetPrimary(&$event)
+	function OnSetPrimary($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
@@ -86,7 +86,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -120,7 +120,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
@@ -161,7 +161,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		$this->Application->StoreVar('saved_curr_ids', $this->Application->RecallVar($event->Prefix . '_selected_ids'));
 
@@ -173,7 +173,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDisableUnused(&$event)
+	function OnDisableUnused($event)
 	{
 		$unused_ids = $this->Application->GetVar('unused_ids');
 
@@ -190,7 +190,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateRate(&$event)
+	function OnUpdateRate($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
@@ -230,7 +230,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateRates(&$event)
+	function OnUpdateRates($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
@@ -275,7 +275,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnChangeCurrency(&$event)
+	protected function OnChangeCurrency($event)
 	{
 		$currency_iso = $this->Application->GetVar('curr_iso');
 		$available_currencies = $this->Application->siteDomainField('Currencies');
@@ -305,7 +305,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
Index: in-commerce/units/destinations/dst_event_handler.php
===================================================================
--- in-commerce/units/destinations/dst_event_handler.php	(revision 15111)
+++ in-commerce/units/destinations/dst_event_handler.php	(working copy)
@@ -22,7 +22,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCreate(kEvent &$event)
+	protected function OnCreate(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -59,7 +59,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $type != 'before' ) {
 			return;
@@ -87,9 +87,10 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnZoneUpdate(&$event) {
+	function OnZoneUpdate($event) {
 
-		$object = &$event->getObject();
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
 
 		$zone_object = &$this->Application->recallObject('z');
 		$zone_id = (int)$zone_object->GetID();
Index: in-commerce/units/discount_items/discount_items_event_handler.php
===================================================================
--- in-commerce/units/discount_items/discount_items_event_handler.php	(revision 15111)
+++ in-commerce/units/discount_items/discount_items_event_handler.php	(working copy)
@@ -38,7 +38,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProcessSelected(&$event)
+	function OnProcessSelected($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$selected_ids = $this->Application->GetVar('selected_ids');
@@ -102,7 +102,7 @@
 	 * @todo get parent item id through $object->getLinkedInfo()['ParentId']
 	 * @access public
 	 */
-	function OnEntireOrder(&$event)
+	function OnEntireOrder($event)
 	{
 		$object =& $event->GetObject();
 		$sql = 'DELETE FROM '.$object->TableName.' WHERE DiscountId='.$this->Application->GetVar('d_id');
@@ -129,7 +129,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDeleteDiscountedItem(&$event)
+	function OnDeleteDiscountedItem($event)
 	{
 		$main_object =& $event->MasterEvent->getObject();
 		$resource_id = $main_object->GetDBField('ResourceId');
@@ -146,7 +146,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
Index: in-commerce/units/discounts/discounts_event_handler.php
===================================================================
--- in-commerce/units/discounts/discounts_event_handler.php	(revision 15111)
+++ in-commerce/units/discounts/discounts_event_handler.php	(working copy)
@@ -22,7 +22,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -36,7 +36,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -48,7 +48,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function itemChanged(&$event)
+	function itemChanged($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
Index: in-commerce/units/downloads/downloads_config.php
===================================================================
--- in-commerce/units/downloads/downloads_config.php	(revision 15111)
+++ in-commerce/units/downloads/downloads_config.php	(working copy)
@@ -21,7 +21,7 @@
 					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
 
 					'RegisterClasses'	=>	Array(
-						Array('pseudo'=>'DownloadHelper','class'=>'DownloadHelper','file'=>'download_helper.php','build_event'=>'','require_classes'=>'kHelper'),
+						Array('pseudo' => 'DownloadHelper', 'class' => 'DownloadHelper', 'file' => 'download_helper.php', 'build_event' => ''),
 					),
 
 					'AutoLoad'			=>	true,
Index: in-commerce/units/files/files_event_handler.php
===================================================================
--- in-commerce/units/files/files_event_handler.php	(revision 15111)
+++ in-commerce/units/files/files_event_handler.php	(working copy)
@@ -22,7 +22,7 @@
 	 * @return string
 	 * @access protected
 	 */
-	protected function getMainSpecial(kEvent &$event)
+	protected function getMainSpecial(kEvent $event)
 	{
 		if ( $event->Special == 'downl' ) {
 			return '';
@@ -39,7 +39,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
@@ -60,7 +60,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -74,7 +74,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -103,7 +103,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function itemChanged(&$event)
+	function itemChanged($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -129,7 +129,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSetPrimary(&$event)
+	function OnSetPrimary($event)
 	{
 		$ids = $this->StoreSelectedIDs($event);
 		$id = array_shift($ids);
@@ -151,7 +151,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 			$ids = $event->getEventParam('ids');
Index: in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php
===================================================================
--- in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php	(revision 15111)
+++ in-commerce/units/gateways/gw_classes/notify_scripts/google_checkout_notify.php	(working copy)
@@ -43,9 +43,8 @@
 	$order->SetDBField('TransactionStatus', $transaction_status);
 
 	if ($transaction_status == 1) {
-		$dummy_var = '10';
 		$application->SetVar('ord_id', $order->GetID()); // used in OrdersEventHandler::UpdateOrderItem
-		$application->HandleEvent($dummy_var, 'ord:OnCompleteOrder');
+		$application->HandleEvent(new kEvent('ord:OnCompleteOrder'));
 	}
 
 	$application->Done();
\ No newline at end of file
Index: in-commerce/units/gateways/gw_classes/paypal.php
===================================================================
--- in-commerce/units/gateways/gw_classes/paypal.php	(revision 15111)
+++ in-commerce/units/gateways/gw_classes/paypal.php	(working copy)
@@ -195,7 +195,7 @@
 					break;
 				case 'subscr_payment':
 					$field_values = $this->Conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'OrderItems WHERE OrderItemId = '.$_POST['item_number']);
-					$this->Application->HandleEvent($an_event, 'p:OnSubscriptionApprove', array('field_values' => $field_values));
+					$this->Application->HandleEvent(new kEvent('p:OnSubscriptionApprove', array('field_values' => $field_values)));
 					$success = 0; //this will eliminate OnCompleteOrder in gw_notify!
 
 					$org_order = $this->Application->recallObject('ord.-original', 'ord', Array('skip_autoload' => true));
Index: in-commerce/units/gateways/gw_event_handler.php
===================================================================
--- in-commerce/units/gateways/gw_event_handler.php	(revision 15111)
+++ in-commerce/units/gateways/gw_event_handler.php	(working copy)
@@ -15,7 +15,7 @@
 
 class GatewayEventHandler extends kDBEventHandler {
 
-	function OnSaveValues(&$event)
+	function OnSaveValues($event)
 	{
 		// if there is no id - it means we need to create an item
 		$item_id = $this->getPassedID($event);
@@ -56,7 +56,7 @@
 		}
 	}
 
-	protected function OnCheckGateways(&$event)
+	protected function OnCheckGateways($event)
 	{
 		if ( !$this->Application->isAdminUser ) {
 			return;
Index: in-commerce/units/gift_certificates/gift_certificates_eh.php
===================================================================
--- in-commerce/units/gift_certificates/gift_certificates_eh.php	(revision 15111)
+++ in-commerce/units/gift_certificates/gift_certificates_eh.php	(working copy)
@@ -42,7 +42,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(kEvent &$event)
+	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
@@ -65,7 +65,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -79,7 +79,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -96,7 +96,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function itemChanged(&$event)
+	function itemChanged($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -143,7 +143,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
@@ -168,7 +168,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnEmailGiftCertificate(&$event)
+	function OnEmailGiftCertificate($event)
 	{
 		$ids = $this->StoreSelectedIDs($event);
 		if (!$ids) {
Index: in-commerce/units/helpers/helpers_config.php
===================================================================
--- in-commerce/units/helpers/helpers_config.php	(revision 15111)
+++ in-commerce/units/helpers/helpers_config.php	(working copy)
@@ -9,10 +9,10 @@
 		'EventHandlerClass'	=> Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
 		'RegisterClasses' => Array (
-			Array ('pseudo' => 'OrderHelper', 'class' => 'OrderHelper', 'file' => 'order_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
+			Array ('pseudo' => 'OrderHelper', 'class' => 'OrderHelper', 'file' => 'order_helper.php', 'build_event' => ''),
 			Array ('pseudo' => 'CurrencyRates', 'class' => 'CurrencyRates', 'file' => 'currency_rates.php', 'build_event' => ''),
-			Array ('pseudo' => 'BankLVCurrencyRates', 'class' => 'BankLVCurrencyRates', 'file' => 'bank_lv_currency_rates.php', 'require_classes'  => 'CurrencyRates', 'build_event' => ''),
-			Array ('pseudo' => 'ECBCurrencyRates', 'class' => 'ECBCurrencyRates', 'file' => 'ecb_currency_rates.php', 'require_classes'  => 'CurrencyRates', 'build_event' => ''),
-			Array ('pseudo' => 'FRNYCurrencyRates', 'class' => 'FRNYCurrencyRates', 'file' => 'frny_currency_rates.php', 'require_classes'  => 'CurrencyRates', 'build_event' => ''),
+			Array ('pseudo' => 'BankLVCurrencyRates', 'class' => 'BankLVCurrencyRates', 'file' => 'bank_lv_currency_rates.php', 'build_event' => ''),
+			Array ('pseudo' => 'ECBCurrencyRates', 'class' => 'ECBCurrencyRates', 'file' => 'ecb_currency_rates.php', 'build_event' => ''),
+			Array ('pseudo' => 'FRNYCurrencyRates', 'class' => 'FRNYCurrencyRates', 'file' => 'frny_currency_rates.php', 'build_event' => ''),
 		),
 	);
Index: in-commerce/units/manufacturers/manufacturers_event_handler.php
===================================================================
--- in-commerce/units/manufacturers/manufacturers_event_handler.php	(revision 15111)
+++ in-commerce/units/manufacturers/manufacturers_event_handler.php	(working copy)
@@ -41,7 +41,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
@@ -89,7 +89,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -106,7 +106,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -124,7 +124,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
Index: in-commerce/units/order_items/order_items_event_handler.php
===================================================================
--- in-commerce/units/order_items/order_items_event_handler.php	(revision 15111)
+++ in-commerce/units/order_items/order_items_event_handler.php	(working copy)
@@ -39,7 +39,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnProcessSelected(&$event)
+		function OnProcessSelected($event)
 		{
 			$object =& $event->getObject( Array('skip_autoload' => true) );
 
@@ -93,7 +93,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnUpdate(kEvent &$event)
+		protected function OnUpdate(kEvent $event)
 		{
 			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 
@@ -160,7 +160,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemUpdate(kEvent &$event)
+		protected function OnAfterItemUpdate(kEvent $event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -257,7 +257,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSaveItems(&$event)
+		function OnSaveItems($event)
 		{
 			$event->CallSubEvent('OnUpdate');
 
@@ -274,7 +274,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterClone(kEvent &$event)
+		protected function OnAfterClone(kEvent $event)
 		{
 			parent::OnAfterClone($event);
 
@@ -296,7 +296,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(kEvent &$event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -320,7 +320,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -345,7 +345,7 @@
 		 * @return bool
 		 * @access protected
 		 */
-		protected function checkItemStatus(kEvent &$event)
+		protected function checkItemStatus(kEvent $event)
 		{
 			if ( $this->Application->isAdmin ) {
 				return true;
Index: in-commerce/units/orders/order_validator.php
===================================================================
--- in-commerce/units/orders/order_validator.php	(revision 15111)
+++ in-commerce/units/orders/order_validator.php	(working copy)
@@ -15,9 +15,9 @@
 
 class OrderValidator extends kValidator {
 
-	public function __construct($application = null)
+	public function __construct()
 	{
-		parent::__construct($application);
+		parent::__construct();
 
 		$this->ErrorMsgs['credit_card_validation_error'] = '!lu_cc_validation_error!';
 		$this->ErrorMsgs['credit_card_expired'] = '!lu_cc_expired!';
Index: in-commerce/units/orders/orders_config.php
===================================================================
--- in-commerce/units/orders/orders_config.php	(revision 15111)
+++ in-commerce/units/orders/orders_config.php	(working copy)
@@ -26,7 +26,7 @@
 					'RegisterClasses' => Array (
 						Array ('pseudo' => 'OrderCalculator', 'class' => 'OrderCalculator', 'file' => 'order_calculator.php', 'build_event' => ''),
 						Array ('pseudo' => 'OrderManager', 'class' => 'OrderManager', 'file' => 'order_manager.php', 'build_event' => ''),
-						Array ('pseudo' => 'OrderValidator', 'class' => 'OrderValidator', 'file' => 'order_validator.php', 'build_event' => '', 'require_classes' => 'kValidator'),
+						Array ('pseudo' => 'OrderValidator', 'class' => 'OrderValidator', 'file' => 'order_validator.php', 'build_event' => ''),
 					),
 
 					'Hooks'				=>	Array (
Index: in-commerce/units/orders/orders_event_handler.php
===================================================================
--- in-commerce/units/orders/orders_event_handler.php	(revision 15111)
+++ in-commerce/units/orders/orders_event_handler.php	(working copy)
@@ -23,7 +23,7 @@
 	 * @return bool
 	 * @access public
 	 */
-	public function CheckPermission(kEvent &$event)
+	public function CheckPermission(kEvent $event)
 	{
 		if ( !$this->Application->isAdminUser ) {
 			if ( $event->Name == 'OnCreate' ) {
@@ -176,7 +176,7 @@
 
 	/* ======================== FRONT ONLY ======================== */
 
-	function OnQuietPreSave(&$event)
+	function OnQuietPreSave($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -191,7 +191,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSelectAddress(&$event)
+	function OnSelectAddress($event)
 	{
 		if ($this->Application->isAdminUser) {
 			return ;
@@ -252,7 +252,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUserCreate(&$event)
+	function OnUserCreate($event)
 	{
 		if( !($event->MasterEvent->status == kEvent::erSUCCESS) ) return false;
 
@@ -271,7 +271,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUserLogin(&$event)
+	protected function OnUserLogin($event)
 	{
 		if ( ($event->MasterEvent->status != kEvent::erSUCCESS) || kUtil::constOn('IS_INSTALL') ) {
 			// login failed OR login during installation
@@ -301,7 +301,7 @@
 	 * @param kEvent $event
 	 * @return void
 	 */
-	function updateUserID($order_id, &$event)
+	function updateUserID($order_id, $event)
 	{
 		$user =& $this->Application->recallObject('u.current');
 		/* @var $user UsersItem */
@@ -380,7 +380,7 @@
 		return $email_params;
 	}
 
-	function PrepareCoupons(&$event, &$order)
+	function PrepareCoupons($event, &$order)
 	{
 		$order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
@@ -432,7 +432,7 @@
 	 * @param kEvent $event
 	 * @return bool
 	 */
-	function OnCompleteOrder(&$event)
+	function OnCompleteOrder($event)
 	{
 		$this->LockTables($event);
 		if ( !$this->CheckQuantites($event) ) {
@@ -526,7 +526,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function setBillingAddress(&$event)
+	function setBillingAddress($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -557,7 +557,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProceedToPreview(&$event)
+	function OnProceedToPreview($event)
 	{
 		$this->setBillingAddress($event);
 
@@ -566,13 +566,13 @@
 	}
 
 
-	function OnViewCart(&$event)
+	function OnViewCart($event)
 	{
 		$this->StoreContinueShoppingLink();
 		$event->redirect = $this->Application->GetVar('viewcart_template');
 	}
 
-	function OnContinueShopping(&$event)
+	function OnContinueShopping($event)
 	{
 		$order_helper =& $this->Application->recallObject('OrderHelper');
 		/* @var $order_helper OrderHelper */
@@ -587,7 +587,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCheckout(&$event)
+	function OnCheckout($event)
 	{
 		$this->OnUpdateCart($event);
 		if ( !$event->getEventParam('RecalculateChangedCart') ) {
@@ -633,7 +633,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnRestoreOrder(kEvent &$event)
+	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
@@ -663,7 +663,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProceedToBilling(&$event)
+	function OnProceedToBilling($event)
 	{
 		$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
 		if ( $items_info ) {
@@ -695,7 +695,7 @@
 	 * @param kEvent $event
 	 * @return void
 	 */
-	protected function OnCancelRecurring(&$event)
+	protected function OnCancelRecurring($event)
 	{
 		$order =& $event->getObject();
 		/* @var $order OrdersItem */
@@ -715,7 +715,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemUpdate(kEvent &$event)
+	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -737,7 +737,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUpdate(kEvent &$event)
+	protected function OnUpdate(kEvent $event)
 	{
 		$this->setBillingAddress($event);
 
@@ -767,7 +767,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function createMissingAddresses(&$event)
+	function createMissingAddresses($event)
 	{
 		if ( !$this->Application->LoggedIn() ) {
 			return ;
@@ -822,9 +822,9 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUpdateCart(&$event)
+	protected function OnUpdateCart($event)
 	{
-		$this->Application->HandleEvent($items_event, 'orditems:OnUpdate');
+		$this->Application->HandleEvent(new kEvent('orditems:OnUpdate'));
 
 		$event->CallSubEvent('OnRecalculateItems');
 	}
@@ -834,7 +834,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateCartJSON(&$event)
+	function OnUpdateCartJSON($event)
 	{
 		if ( $this->Application->GetVar('ajax') != 'yes' ) {
 			return;
@@ -865,7 +865,7 @@
 		}
 
 		// 3. update product quantities and recalculate all discounts
-		$this->Application->HandleEvent($items_event, 'orditems:OnUpdate');
+		$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
@@ -885,7 +885,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnAddToCart(&$event)
+	function OnAddToCart($event)
 	{
 		$this->StoreContinueShoppingLink();
 
@@ -1000,7 +1000,7 @@
 	 * @return string
 	 * @todo Needed? Should be refactored (by Alex)
 	 */
-	function TablePrefix(kEvent &$event)
+	function TablePrefix(kEvent $event)
 	{
 		return $this->UseTempTables($event) ? $this->Application->GetTempTablePrefix('prefix:' . $event->Prefix) . TABLE_PREFIX : TABLE_PREFIX;
 	}
@@ -1015,7 +1015,7 @@
 	 * @param int $selection_mode
 	 * @return bool
 	 */
-	function CheckOptions(&$event, &$options, $product_id, $qty, $selection_mode)
+	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) ' : '';
@@ -1099,7 +1099,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateItemOptions(&$event)
+	function OnUpdateItemOptions($event)
 	{
 		$opt_data = $this->Application->GetVar('options');
 		$options = getArrayValue($opt_data, $this->Application->GetVar('p_id'));
@@ -1167,7 +1167,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnApplyCoupon(&$event)
+	function OnApplyCoupon($event)
 	{
 		$code = $this->Application->GetVar('coupon_code');
 
@@ -1238,7 +1238,7 @@
 	 * @param kEvent $event
 	 * @deprecated
 	 */
-	function OnRemoveCoupon(&$event)
+	function OnRemoveCoupon($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -1277,7 +1277,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnAddVirtualProductToCart(&$event)
+	function OnAddVirtualProductToCart($event)
 	{
 		$l_info = $this->Application->GetVar('l');
 		if($l_info)
@@ -1315,7 +1315,7 @@
 		$event->SetRedirectParam('m_cat_id', 0); // not to pass link id
 	}
 
-	function OnRemoveFromCart(&$event)
+	function OnRemoveFromCart($event)
 	{
 		$ord_item_id = $this->Application->GetVar('orditems_id');
 		$ord_id = $this->getPassedID($event);
@@ -1323,7 +1323,7 @@
 		$this->OnRecalculateItems($event);
 	}
 
-	function OnCleanupCart(&$event)
+	function OnCleanupCart($event)
 	{
 		$object =& $event->getObject();
 
@@ -1344,7 +1344,7 @@
 	 * @return int
 	 * @access public
 	 */
-	public function getPassedID(kEvent &$event)
+	public function getPassedID(kEvent $event)
 	{
 		$event->setEventParam('raise_warnings', 0);
 		$passed = parent::getPassedID($event);
@@ -1392,7 +1392,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function LoadItem(kEvent &$event)
+	protected function LoadItem(kEvent $event)
 	{
 		$id = $this->getPassedID($event);
 
@@ -1415,7 +1415,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _createNewCart(&$event)
+	function _createNewCart($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -1509,7 +1509,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function SetStepRequiredFields(&$event)
+	function SetStepRequiredFields($event)
 	{
 		$order =& $event->getObject();
 		/* @var $order OrdersItem */
@@ -1566,7 +1566,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function CheckUser(&$event)
+	function CheckUser($event)
 	{
 		if ($this->Application->isAdminUser || defined('GW_NOTIFY')) {
 			// don't check for user in order while processing payment
@@ -1600,7 +1600,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(kEvent &$event)
+	protected function OnPreCreate(kEvent $event)
 	{
 		parent::OnPreCreate($event);
 
@@ -1622,7 +1622,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeClone(kEvent &$event)
+	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
@@ -1643,7 +1643,7 @@
 		$object->SetDBField('GWResult2', '');
 	}
 
-	function OnReserveItems(&$event)
+	function OnReserveItems($event)
 	{
 		$order_items =& $this->Application->recallObject('orditems.-inv','orditems_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $order_items kDBList */
@@ -1711,7 +1711,7 @@
 		return true;
 	}
 
-	function OnOrderPrint(&$event)
+	function OnOrderPrint($event)
 	{
 		$event->SetRedirectParam('opener', 's');
 	}
@@ -1722,7 +1722,7 @@
 	 * @param kEvent $event
 	 * @access public
 	 */
-	function OnResetAddress(&$event)
+	function OnResetAddress($event)
 	{
 		$to_tab = $this->Application->GetVar('to_tab');
 		$from_tab = substr($event->Name, strlen('OnResetTo'));
@@ -1747,7 +1747,7 @@
 	 * @todo Is this called ? (by Alex)
 	 * @param kEvent $event
 	 */
-	function OnProcessSelected(&$event)
+	function OnProcessSelected($event)
 	{
 		$selected_ids = $this->Application->GetVar('selected_ids');
 		$product_ids = $selected_ids['p'];
@@ -1764,7 +1764,7 @@
 		$event->SetRedirectParam('opener', 'u');
 	}
 
-	function OnMassPlaceOrder(&$event)
+	function OnMassPlaceOrder($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$ids = $this->StoreSelectedIDs($event);
@@ -1985,7 +1985,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function MassInventoryAction(&$event)
+	function MassInventoryAction($event)
 	{
 		if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 			$event->status = kEvent::erFAIL;
@@ -2006,7 +2006,7 @@
 		}
 	}
 
-	function InventoryAction(&$event)
+	function InventoryAction($event)
 	{
 		if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 			$event->status = kEvent::erFAIL;
@@ -2240,7 +2240,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function setNextOrderNumber(&$event)
+	function setNextOrderNumber($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -2294,7 +2294,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterClone(kEvent &$event)
+	protected function OnAfterClone(kEvent $event)
 	{
 		parent::OnAfterClone($event);
 
@@ -2319,7 +2319,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -2367,7 +2367,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -2385,7 +2385,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -2469,7 +2469,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function createAccountFromOrder(&$event)
+	protected function createAccountFromOrder($event)
 	{
 		$order =& $event->getObject();
 		/* @var $order OrdersItem */
@@ -2484,8 +2484,7 @@
 		if ( $order->GetDBField('PortalUserId') == USER_GUEST ) {
 			// will also auto-login user when created
 			$this->Application->SetVar('u_register', Array (USER_GUEST => $user_fields));
-			$user_event = new kEvent('u.register:OnCreate');
-			$this->Application->HandleEvent($user_event);
+			$this->Application->HandleEvent(new kEvent('u.register:OnCreate'));
 		}
 		else {
 			$user =& $this->Application->recallObject('u.current');
@@ -2506,7 +2505,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
@@ -2558,7 +2557,7 @@
 		return $type2special[$type];
 	}
 
-	function LockTables(&$event)
+	function LockTables($event)
 	{
 		$read = Array();
 		$write_lock = '';
@@ -2582,7 +2581,7 @@
 	 * @param kEvent $event
 	 * @return bool
 	 */
-	function CheckQuantites(&$event)
+	function CheckQuantites($event)
 	{
 		if ( $this->OnRecalculateItems($event) ) { // if something has changed in the order
 			if ( $this->Application->isAdminUser ) {
@@ -2600,7 +2599,7 @@
 		return true;
 	}
 
-	function DoPlaceOrder(&$event)
+	function DoPlaceOrder($event)
 	{
 		$order =& $event->getObject();
 
@@ -2616,7 +2615,7 @@
 		return true;
 	}
 
-	function &queryOrderItems(&$event, $table_prefix)
+	function &queryOrderItems($event, $table_prefix)
 	{
 		$order =& $event->getObject();
 		$ord_id = $order->GetId();
@@ -2643,7 +2642,7 @@
 		return $items;
 	}
 
-	function ReserveItems(&$event)
+	function ReserveItems($event)
 	{
 		$table_prefix = $this->TablePrefix($event);
 		$items =& $this->queryOrderItems($event, $table_prefix);
@@ -2693,7 +2692,7 @@
 		}
 	}
 
-	function FreeItems(&$event)
+	function FreeItems($event)
 	{
 		$table_prefix = $this->TablePrefix($event);
 		$items =& $this->queryOrderItems($event, $table_prefix);
@@ -2745,7 +2744,7 @@
 	 * @param kEvent $event
 	 * @param OrdersItem $object
 	 */
-	function SplitOrder(&$event, &$object)
+	function SplitOrder($event, &$object)
 	{
 		$affiliate_event = new kEvent('affil:OnOrderApprove');
 		$affiliate_event->setEventParam('Order_PrefixSpecial', $object->getPrefixSpecial() );
@@ -3004,7 +3003,7 @@
 	 * @param kEvent $event
 	 * @param int $item_id
 	 */
-	function AddItemToOrder(&$event, $item_id, $qty = null, $package_num = null)
+	function AddItemToOrder($event, $item_id, $qty = null, $package_num = null)
 	{
 		if (!isset($qty)) {
 			$qty = 1;
@@ -3048,7 +3047,7 @@
 		$manager->setOrder($order);
 		$manager->addProduct($product, $event->getEventParam('ItemData'), $qty, $package_num);
 
-		$this->Application->HandleEvent($ord_event, 'ord:OnRecalculateItems');
+		$this->Application->HandleEvent(new kEvent('ord:OnRecalculateItems'));
 	}
 
 	/**
@@ -3056,7 +3055,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function UpdateShippingTotal(&$event)
+	function UpdateShippingTotal($event)
 	{
 		if ( $this->Application->GetVar('ebay_notification') == 1 ) {
 			// TODO: get rid of this "if"
@@ -3092,7 +3091,7 @@
 	 * @param kEvent $event
 	 * @return bool Returns true if items splitting/grouping were changed
 	 */
-	function OnRecalculateItems(&$event)
+	function OnRecalculateItems($event)
 	{
 		if (is_object($event->MasterEvent) && ($event->MasterEvent->status != kEvent::erSUCCESS)) {
 			// e.g. master order update failed, don't recalculate order products
@@ -3192,7 +3191,7 @@
 		return $price_id;
 	}
 
-	function UpdateShippingOption(&$event)
+	function UpdateShippingOption($event)
 	{
 		$object =& $event->getObject();
 		$shipping_option = $object->GetDBField('ShippingOption');
@@ -3223,7 +3222,7 @@
 	 * @param kEvent $event
 	 * @return bool
 	 */
-	function UpdateShippingTypes(&$event)
+	function UpdateShippingTypes($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3305,7 +3304,7 @@
 		return true;
 	}*/
 
-	function RecalculateTax(&$event)
+	function RecalculateTax($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3317,7 +3316,7 @@
 		$object->RecalculateTax();
 	}
 
-	function RecalculateProcessingFee(&$event)
+	function RecalculateProcessingFee($event)
 	{
 		$object =& $event->getObject();
 
@@ -3331,7 +3330,7 @@
 		$this->UpdateTotals($event);
 	}
 
-	function UpdateTotals(&$event)
+	function UpdateTotals($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3339,7 +3338,7 @@
 		$object->UpdateTotals();
 	}
 
-	/*function CalculateDiscount(&$event)
+	/*function CalculateDiscount($event)
 	{
 		$object =& $event->getObject();
 
@@ -3388,7 +3387,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnGoToOrder(&$event)
+	function OnGoToOrder($event)
 	{
 		$id = array_shift( $this->StoreSelectedIDs($event) );
 
@@ -3424,7 +3423,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnResetToPending(&$event)
+	function OnResetToPending($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -3453,7 +3452,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnLoadSelected(&$event)
+	function OnLoadSelected($event)
 	{
 		$event->setPseudoClass('_List');
 		$object =& $event->getObject( Array('selected_only' => true) );
@@ -3483,7 +3482,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCheckRecurringOrders(&$event)
+	function OnCheckRecurringOrders($event)
 	{
 		$skip_clause = Array();
 		$ord_table = $this->Application->getUnitOption($event->Prefix, 'TableName');
@@ -3552,7 +3551,7 @@
 	}
 
 
-	function OnGeneratePDF(&$event)
+	function OnGeneratePDF($event)
 	{
 		$this->OnLoadSelected($event);
 
@@ -3635,7 +3634,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
@@ -3700,7 +3699,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeExportBegin(kEvent &$event)
+	protected function OnBeforeExportBegin(kEvent $event)
 	{
 		parent::OnBeforeExportBegin($event);
 
@@ -3734,7 +3733,7 @@
 	 * @return Array
 	 * @access protected
 	 */
-	public function getCustomExportColumns(kEvent &$event)
+	public function getCustomExportColumns(kEvent $event)
 	{
 		$columns = parent::getCustomExportColumns($event);
 
@@ -3758,7 +3757,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
@@ -3784,7 +3783,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeCopyToLive(kEvent &$event)
+	protected function OnBeforeCopyToLive(kEvent $event)
 	{
 		parent::OnBeforeCopyToLive($event);
 
@@ -3802,7 +3801,7 @@
 	 * @return bool
 	 * @access protected
 	 */
-	protected function checkItemStatus(kEvent &$event)
+	protected function checkItemStatus(kEvent $event)
 	{
 		if ( $this->Application->isAdminUser ) {
 			return true;
@@ -3824,7 +3823,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnApplyGiftCertificate(&$event)
+	function OnApplyGiftCertificate($event)
 	{
 		$code = $this->Application->GetVar('giftcert_code');
 
@@ -3871,7 +3870,7 @@
 	 * @param kEvent $event
 	 * @deprecated
 	 */
-	function OnRemoveGiftCertificate(&$event)
+	function OnRemoveGiftCertificate($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3887,7 +3886,7 @@
 		$object->RemoveGiftCertificate();
 	}
 
-	function RecalculateGift(&$event)
+	function RecalculateGift($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object OrdersItem */
@@ -3915,7 +3914,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDownloadLabel(&$event)
+	function OnDownloadLabel($event)
 	{
 		$event->status = kEvent::erSTOP;
 		ini_set('memory_limit', '300M');
@@ -3943,7 +3942,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemValidate(kEvent &$event)
+	protected function OnBeforeItemValidate(kEvent $event)
 	{
 		parent::OnBeforeItemValidate($event);
 
@@ -3975,7 +3974,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnUpdateAjax(&$event)
+	function OnUpdateAjax($event)
 	{
 		$ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
 		/* @var $ajax_form_helper AjaxFormHelper */
Index: in-commerce/units/orders/orders_item.php
===================================================================
--- in-commerce/units/orders/orders_item.php	(revision 15111)
+++ in-commerce/units/orders/orders_item.php	(working copy)
@@ -279,7 +279,7 @@
 		}
 
 		// ===== Gift Certificates Related =====
-		function RecalculateGift(&$event)
+		function RecalculateGift($event)
 		{
 			$gc_id = $this->GetDBField('GiftCertificateId');
 			if ($gc_id < 1) {
Index: in-commerce/units/payment_type/payment_type_event_handler.php
===================================================================
--- in-commerce/units/payment_type/payment_type_event_handler.php	(revision 15111)
+++ in-commerce/units/payment_type/payment_type_event_handler.php	(working copy)
@@ -59,7 +59,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSetPrimary(&$event)
+	function OnSetPrimary($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$this->StoreSelectedIDs($event);
@@ -75,7 +75,7 @@
 		$event->SetRedirectParam('opener', 's');
 	}
 
-	function OnMassDecline(&$event)
+	function OnMassDecline($event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -113,7 +113,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -136,7 +136,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -151,7 +151,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 			$object =& $event->getObject();
@@ -183,7 +183,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		$this->Application->StoreVar('check_unused_currencies', 1);
 
@@ -197,7 +197,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
@@ -213,7 +213,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function convertGroups(&$event)
+	function convertGroups($event)
 	{
 		$object =& $event->getObject();
 
@@ -236,7 +236,7 @@
 	 * @return int
 	 * @access public
 	 */
-	public function getPassedID(kEvent &$event)
+	public function getPassedID(kEvent $event)
 	{
 		if ( $event->Special == 'auto-ord' ) {
 			$main_object =& $this->Application->recallObject('ord');
@@ -263,7 +263,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		parent::SetCustomQuery($event);
 
Index: in-commerce/units/payment_type_currencies/payment_type_currencies_event_handler.php
===================================================================
--- in-commerce/units/payment_type_currencies/payment_type_currencies_event_handler.php	(revision 15111)
+++ in-commerce/units/payment_type_currencies/payment_type_currencies_event_handler.php	(working copy)
@@ -22,7 +22,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCreate(kEvent &$event)
+		protected function OnCreate(kEvent $event)
 		{
 			$currency_id_list = $this->Application->GetVar('currency_list');
 
Index: in-commerce/units/pricing/pricing_event_handler.php
===================================================================
--- in-commerce/units/pricing/pricing_event_handler.php	(revision 15111)
+++ in-commerce/units/pricing/pricing_event_handler.php	(working copy)
@@ -60,7 +60,7 @@
 		$this->eventMethods = array_merge($this->eventMethods, $brackets_events);
 	}
 
-	function PricingBracketsAction(&$event)
+	function PricingBracketsAction($event)
 	{
 		$event->redirect=false;
 		$temp = $this->Application->GetVar($event->getPrefixSpecial(true));
@@ -184,7 +184,7 @@
 		$this->Application->SetVar($event->getPrefixSpecial(true), $temp); // store pr_tang var
 	}
 
-	function OnPreSaveBrackets(&$event)
+	function OnPreSaveBrackets($event)
 	{
 		if( $this->Application->GetVar('pr_tang') ) {
 
@@ -250,7 +250,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		$bracket =& $event->getObject();
 		/* @var $bracket kDBItem */
@@ -266,7 +266,7 @@
 		}
 	}
 
-	function OnArrangeBrackets(&$event, &$temp, &$bracket)
+	function OnArrangeBrackets($event, &$temp, &$bracket)
 	{
 		$temp_orig = $temp;
 		reset($temp);
@@ -375,7 +375,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSetPrimary(&$event)
+	function OnSetPrimary($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$this->StoreSelectedIDs($event);
@@ -398,7 +398,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -421,7 +421,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -458,7 +458,7 @@
 	 * @access protected
 	 * @see kDBEventHandler::OnListBuild()
 	 */
-	protected function SetCustomQuery(kEvent &$event)
+	protected function SetCustomQuery(kEvent $event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBList */
Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php
===================================================================
--- in-commerce/units/product_option_combinations/product_option_combinations_config.php	(revision 15111)
+++ in-commerce/units/product_option_combinations/product_option_combinations_config.php	(working copy)
@@ -20,8 +20,8 @@
 					'EventHandlerClass'	=>	Array ('class' => 'ProductOptionCombinationsEventHandler', 'file' => 'product_option_combinations_event_handler.php', 'build_event' => 'OnBuild'),
 					'TagProcessorClass' =>	Array ('class' => 'ProductOptionCombinationsTagProcessor', 'file' => 'product_option_combinations_tag_processor.php', 'build_event' => 'OnBuild'),
 					'RegisterClasses'	=>	Array (
-												Array ('pseudo' => 'kCombinationFormatter', 'class' => 'kCombinationFormatter', 'file' => 'product_option_formatters.php', 'build_event' => '', 'require_classes' => 'kFormatter'),
-												Array ('pseudo' => 'kCombPriceFormatter', 'class' => 'kCombPriceFormatter', 'file' => 'product_option_formatters.php', 'build_event' => '', 'require_classes' => 'kFormatter'),
+												Array ('pseudo' => 'kCombinationFormatter', 'class' => 'kCombinationFormatter', 'file' => 'product_option_formatters.php', 'build_event' => ''),
+												Array ('pseudo' => 'kCombPriceFormatter', 'class' => 'kCombPriceFormatter', 'file' => 'product_option_formatters.php', 'build_event' => ''),
 											),
 					'AutoLoad'			=>	true,
 					'Hooks'				=>	Array (
Index: in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php
===================================================================
--- in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php	(revision 15111)
+++ in-commerce/units/product_option_combinations/product_option_combinations_event_handler.php	(working copy)
@@ -23,7 +23,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $type == 'after' ) {
 			return;
@@ -61,7 +61,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function GetOptionValues(&$event, $option_id)
+	function GetOptionValues($event, $option_id)
 	{
 		$object =& $event->getObject();
 		if ($object->IsTempTable()) {
@@ -74,7 +74,7 @@
 		return explode(',', $this->Conn->GetOne($query));
 	}
 
-	function CreateCombinations(&$event, $fields, $current_option=null)
+	function CreateCombinations($event, $fields, $current_option=null)
 	{
 		$recursed = false;
 		$combination = $fields['Combination'];
@@ -117,7 +117,7 @@
 		}
 	}
 
-	function UpdateCombinations(&$event, $fields, $current_option=null)
+	function UpdateCombinations($event, $fields, $current_option=null)
 	{
 		$recursed = false;
 		$combination = $fields['Combination'];
@@ -164,7 +164,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCreate(kEvent &$event)
+	protected function OnCreate(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -196,7 +196,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnUpdate(kEvent &$event)
+	protected function OnUpdate(kEvent $event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -241,7 +241,7 @@
 	 * @param kEvent $event
 	 * @access protected
 	 */
-	protected function OnItemBuild(kEvent &$event)
+	protected function OnItemBuild(kEvent $event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -274,7 +274,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function LoadItem(kEvent &$event)
+	protected function LoadItem(kEvent $event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -302,7 +302,7 @@
 	 * @return string
 	 * @access protected
 	 */
-	protected function getMainSpecial(kEvent &$event)
+	protected function getMainSpecial(kEvent $event)
 	{
 		$special = $event->getEventParam('main_special');
 
@@ -325,7 +325,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeClone(kEvent &$event)
+	protected function OnBeforeClone(kEvent $event)
 	{
 		parent::OnBeforeClone($event);
 
@@ -363,7 +363,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeDeleteFromLive(kEvent &$event)
+	protected function OnBeforeDeleteFromLive(kEvent $event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
@@ -405,7 +405,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSearch(kEvent &$event)
+	protected function OnSearch(kEvent $event)
 	{
 		parent::OnSearch($event);
 
@@ -419,7 +419,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSearchReset(kEvent &$event)
+	protected function OnSearchReset(kEvent $event)
 	{
 		parent::OnSearchReset($event);
 
@@ -431,7 +431,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _saveProduct(&$event)
+	function _saveProduct($event)
 	{
 		$product_id = $this->Application->GetVar('p_id');
 
Index: in-commerce/units/product_options/product_options_event_handler.php
===================================================================
--- in-commerce/units/product_options/product_options_event_handler.php	(revision 15111)
+++ in-commerce/units/product_options/product_options_event_handler.php	(working copy)
@@ -23,7 +23,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -46,7 +46,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterCopyToLive(kEvent &$event)
+		protected function OnAfterCopyToLive(kEvent $event)
 		{
 			parent::OnAfterCopyToLive($event);
 
@@ -90,7 +90,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterClone(kEvent &$event)
+		protected function OnAfterClone(kEvent $event)
 		{
 			parent::OnAfterClone($event);
 
Index: in-commerce/units/products/products_config.php
===================================================================
--- in-commerce/units/products/products_config.php	(revision 15111)
+++ in-commerce/units/products/products_config.php	(working copy)
@@ -15,10 +15,10 @@
 
 	$config =	Array (
 					'Prefix'			=>	'p',
-					'ItemClass'			=>	Array ('class' => 'ProductsItem', 'file' => 'products_item.php', 'require_classes' => Array ('kCatDBItem'), 'build_event' => 'OnItemBuild'),
+					'ItemClass'			=>	Array ('class' => 'ProductsItem', 'file' => 'products_item.php', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array ('class' => 'ProductsEventHandler', 'file' => 'products_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array ('class' => 'ProductsTagProcessor', 'file' => 'products_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'),
+					'EventHandlerClass'	=>	Array ('class' => 'ProductsEventHandler', 'file' => 'products_event_handler.php', 'build_event' => 'OnBuild'),
+					'TagProcessorClass' =>	Array ('class' => 'ProductsTagProcessor', 'file' => 'products_tag_processor.php', 'build_event' => 'OnBuild'),
 					'AutoLoad'			=>	true,
 					'QueryString'		=>	Array (
 												1	=>	'id',
Index: in-commerce/units/products/products_event_handler.php
===================================================================
--- in-commerce/units/products/products_event_handler.php	(revision 15111)
+++ in-commerce/units/products/products_event_handler.php	(working copy)
@@ -76,7 +76,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -105,7 +105,7 @@
 	 * @param kEvent $event
 	 * @access private
 	 */
-	function InventoryAction(&$event)
+	function InventoryAction($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -224,7 +224,7 @@
 		$this->modifyInventory($action, $product, $qty, $combination_id);
 	}
 
-	function RunScheduledInventoryActions(&$event)
+	function RunScheduledInventoryActions($event)
 	{
 		$inv_actions = $this->Application->GetVar('inventory_actions');
 		if (!$inv_actions) {
@@ -315,7 +315,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeDeleteFromLive(kEvent &$event)
+	protected function OnBeforeDeleteFromLive(kEvent $event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
@@ -348,7 +348,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function clearSelectedIDs(kEvent &$event)
+	protected function clearSelectedIDs(kEvent $event)
 	{
 		parent::clearSelectedIDs($event);
 
@@ -364,7 +364,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		parent::OnSave($event);
 
@@ -382,7 +382,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(kEvent &$event)
+	protected function OnPreCreate(kEvent $event)
 	{
 		parent::onPreCreate($event);
 
@@ -401,7 +401,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreSaveAndGo(kEvent &$event)
+	protected function OnPreSaveAndGo(kEvent $event)
 	{
 		$event->CallSubEvent('OnPreSave');
 		$this->LoadItem($event);
@@ -494,7 +494,7 @@
 	 * @param kEvent $event
 	 * @return Array
 	 */
-	function getTypeClauses(&$event)
+	function getTypeClauses($event)
 	{
 		$types = $event->getEventParam('types');
 		$types = $types ? explode(',', $types) : Array ();
@@ -668,7 +668,7 @@
 		return $type_clauses;
 	}
 
-	function OnClearRecent(&$event)
+	function OnClearRecent($event)
 	{
 		$this->Application->RemoveVar('recent_products');
 	}
@@ -678,7 +678,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnRateProduct(&$event)
+	function OnRateProduct($event)
 	{
 		$event->SetRedirectParam('pass', 'all,p');
 		$event->redirect = $this->Application->GetVar('success_template');
@@ -739,7 +739,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCancelAction(&$event)
+	function OnCancelAction($event)
 	{
 		$event->SetRedirectParam('pass', 'all,p');
 		$event->redirect = $this->Application->GetVar('cancel_template');
@@ -750,7 +750,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnRecommendProduct(&$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
@@ -797,7 +797,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSaveVirtualProduct(&$event)
+	function OnSaveVirtualProduct($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$listing_type =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true));
@@ -861,7 +861,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDeleteListingType(&$event)
+	function OnDeleteListingType($event)
 	{
 		$listing_type =& $event->MasterEvent->getObject();
 		/* @var $listing_type kDBItem */
@@ -879,7 +879,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSubscriptionApprove(&$event)
+	function OnSubscriptionApprove($event)
 	{
 		$field_values = $event->getEventParam('field_values');
 		$item_data = unserialize($field_values['ItemData']);
@@ -932,7 +932,7 @@
 		$sub_order->SetDBField('NextCharge_time', $expire);
 	}
 
-	function OnDownloadableApprove(&$event)
+	function OnDownloadableApprove($event)
 	{
 		$field_values = $event->getEventParam('field_values');
 		$product_id = $field_values['ProductId'];
@@ -943,7 +943,7 @@
 		$this->Conn->Query($sql);
 	}
 
-	function OnPackageApprove(&$event){
+	function OnPackageApprove($event){
 		$field_values = $event->getEventParam('field_values');
 		$item_data = unserialize($field_values['ItemData']);
 		$package_content_ids = $item_data['PackageContent'];
@@ -986,7 +986,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreSave(kEvent &$event)
+	protected function OnPreSave(kEvent $event)
 	{
 		$this->CheckRequiredOptions($event);
 
@@ -1000,7 +1000,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(kEvent &$event)
+	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -1014,7 +1014,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemUpdate(kEvent &$event)
+	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -1026,7 +1026,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function _updateProductPrice(&$event)
+	function _updateProductPrice($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -1042,7 +1042,7 @@
 		}
 	}
 
-	function CheckRequiredOptions(&$event)
+	function CheckRequiredOptions($event)
 	{
 		$object =& $event->getObject();
 		if ($object->GetDBField('ProductId') == '') return ; // if product does not have ID - it's not yet created
@@ -1103,7 +1103,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemDelete(kEvent &$event)
+	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
@@ -1130,7 +1130,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -1160,7 +1160,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProcessSelected(&$event)
+	function OnProcessSelected($event)
 	{
 		$dst_field = $this->Application->RecallVar('dst_field');
 
@@ -1185,7 +1185,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnAddToPackage(&$event)
+	function OnAddToPackage($event)
 	{
 		$selected_ids = $this->Application->GetVar('selected_ids');
 
@@ -1217,7 +1217,7 @@
 	}
 
 
-	function ProcessPackageItems(&$event)
+	function ProcessPackageItems($event)
 	{
 		//$this->Application->SetVar('p_mode', 't');
 
@@ -1271,7 +1271,7 @@
 	 * @param kEvent $event
 	 */
 
-	function OnSaveItems(&$event)
+	function OnSaveItems($event)
 	{
 		//$event->CallSubEvent('OnUpdate');
 		$event->redirect = false;
@@ -1283,7 +1283,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnRemovePackageItem(&$event) {
+	function OnRemovePackageItem($event) {
 
 		$this->Application->SetVar('p_mode', 't');
 
@@ -1318,7 +1318,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemDelete(kEvent &$event)
+	protected function OnBeforeItemDelete(kEvent $event)
 	{
 		parent::OnBeforeItemDelete($event);
 
@@ -1342,7 +1342,7 @@
 	 * @return Array
 	 * @access protected
 	 */
-	public function getCustomExportColumns(kEvent &$event)
+	public function getCustomExportColumns(kEvent $event)
 	{
 		$columns = parent::getCustomExportColumns($event);
 
@@ -1359,7 +1359,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function setCustomExportColumns(&$event)
+	function setCustomExportColumns($event)
 	{
 		parent::setCustomExportColumns($event);
 
@@ -1369,7 +1369,7 @@
 		$this->setPrimaryPrice($object->GetID(), (double)$object->GetDBField('Price'), Array ('Cost' => (double)$object->GetDBField('Cost')));
 	}
 
-	function OnPreSaveAndOpenPopup(&$event)
+	function OnPreSaveAndOpenPopup($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -1395,7 +1395,7 @@
 	 * @return int
 	 * @access public
 	 */
-	public function getPassedID(kEvent &$event)
+	public function getPassedID(kEvent $event)
 	{
 		if ( $this->Application->isAdminUser ) {
 			$event->setEventParam('raise_warnings', 0);
@@ -1427,7 +1427,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
@@ -1464,7 +1464,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnEdit(kEvent &$event)
+	protected function OnEdit(kEvent $event)
 	{
 		$this->Application->RemoveVar('inventory_actions');
 
@@ -1476,7 +1476,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnModifyPaidListingConfig(&$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);
@@ -1490,7 +1490,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCloneSubItem(kEvent &$event)
+	protected function OnCloneSubItem(kEvent $event)
 	{
 		parent::OnCloneSubItem($event);
 
@@ -1516,7 +1516,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAddToCompare(kEvent &$event)
+	protected function OnAddToCompare(kEvent $event)
 	{
 		$products = $this->getCompareProducts();
 		$product_id = (int)$this->Application->GetVar($event->Prefix . '_id');
@@ -1545,7 +1545,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnRemoveFromCompare(kEvent &$event)
+	protected function OnRemoveFromCompare(kEvent $event)
 	{
 		$products = $this->getCompareProducts();
 
@@ -1568,7 +1568,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCancelCompare(kEvent &$event)
+	protected function OnCancelCompare(kEvent $event)
 	{
 		$this->Application->Session->SetCookie('compare_products', '', -1);
 
Index: in-commerce/units/reports/reports_event_handler.php
===================================================================
--- in-commerce/units/reports/reports_event_handler.php	(revision 15111)
+++ in-commerce/units/reports/reports_event_handler.php	(working copy)
@@ -39,7 +39,7 @@
 		$this->permMapping = array_merge($this->permMapping, $permissions);
 	}
 
-	function OnRunReport(&$event)
+	function OnRunReport($event)
 	{
 		$this->Application->LinkVar('reports_finish_t');
 		$progress_t = $this->Application->GetVar('progress_t');
@@ -330,7 +330,7 @@
 		$this->Application->StoreVar('report_options', serialize($field_values));
 	}
 
-	function OnUpdateConfig(&$event)
+	function OnUpdateConfig($event)
 	{
 		$report = $this->Application->RecallVar('report_options');
 		if (!$report) {
@@ -645,12 +645,12 @@
 		return $a_ret;
 	}
 
-	function OnChangeStatistics(&$event)
+	function OnChangeStatistics($event)
 	{
 		$this->Application->StoreVar('ChartMetric', $this->Application->GetVar('metric'));
 	}
 
-	function OnPieChart(&$event)
+	function OnPieChart($event)
 	{
 
 		$ChartHelper =& $this->Application->RecallObject('ChartHelper');
@@ -689,7 +689,7 @@
 	 * @param kEvent $event
 	 */
 
-	function OnPrintChart(&$event)
+	function OnPrintChart($event)
 	{
 		$ChartHelper =& $this->Application->RecallObject('ChartHelper');
 
@@ -747,7 +747,7 @@
 
 	}
 
-	function OnExportReport(&$event)
+	function OnExportReport($event)
 	{
 		$report =& $this->Application->recallObject($event->getPrefixSpecial(),'rep_List',Array('skip_counting'=>true,'per_page'=>-1) );
 		/* @var $report kDBList*/
Index: in-commerce/units/sections/section_eh.php
===================================================================
--- in-commerce/units/sections/section_eh.php	(revision 15111)
+++ in-commerce/units/sections/section_eh.php	(working copy)
@@ -20,7 +20,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnModifySiteDomainConfig(&$event)
+		function OnModifySiteDomainConfig($event)
 		{
 			$edit_tab_presets = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'EditTabPresets');
 			$edit_tab_presets['Default']['in-commerce'] = Array (
Index: in-commerce/units/shipping/shipping_event_handler.php
===================================================================
--- in-commerce/units/shipping/shipping_event_handler.php	(revision 15111)
+++ in-commerce/units/shipping/shipping_event_handler.php	(working copy)
@@ -41,7 +41,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -76,7 +76,7 @@
 	 * @param kEvent $event
 	 * @return unknown
 	 */
-	function OnApplyModifier(&$event)
+	function OnApplyModifier($event)
 	{
 		$cost_object =& $this->Application->recallObject('sc');
 		/* @var $cost_object kDBItem */
@@ -143,7 +143,7 @@
 		$this->finalizePopup($event);
 	}
 
-	function OnFlip(&$event)
+	function OnFlip($event)
 	{
 		$object =& $event->getObject();
 		$aligment = $this->Application->GetLinkedVar('CostsTableAligment');
@@ -164,7 +164,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(kEvent &$event)
+	protected function OnSave(kEvent $event)
 	{
 		$this->OnAfterItemLoad($event);
 
@@ -178,7 +178,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(kEvent &$event)
+	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -192,7 +192,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemUpdate(kEvent &$event)
+	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -207,14 +207,14 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemDelete(kEvent &$event)
+	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
 		$event->CallSubEvent('OnAnyChange');
 	}
 
-	function OnAnyChange(&$event)
+	function OnAnyChange($event)
 	{
 		$sql = 'DELETE FROM ' . TABLE_PREFIX . 'SystemCache
 				WHERE VarName LIKE "ShippingQuotes%"';
@@ -229,7 +229,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreSaveCreated(kEvent &$event)
+	protected function OnPreSaveCreated(kEvent $event)
 	{
 		parent::OnPreSaveCreated($event);
 
@@ -239,7 +239,7 @@
 		$object->SetDBField('PortalGroups', ',' . $this->Application->ConfigValue('User_LoggedInGroup') . ',');
 	}
 
-	function UpdateGroups(&$event)
+	function UpdateGroups($event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -267,7 +267,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		$this->UpdateGroups($event);
 	}
Index: in-commerce/units/shipping_costs/shipping_costs_event_handler.php
===================================================================
--- in-commerce/units/shipping_costs/shipping_costs_event_handler.php	(revision 15111)
+++ in-commerce/units/shipping_costs/shipping_costs_event_handler.php	(working copy)
@@ -42,7 +42,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCreate(kEvent &$event)
+	protected function OnCreate(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -87,9 +87,9 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnPropagate(&$event)
+	function OnPropagate($event)
 	{
-	//	$this->OnCreate(&$event);
+	//	$this->OnCreate($event);
 
 		$object =& $event->getObject();
 
@@ -158,11 +158,9 @@
 			}
 		}
 
-	/*	$shipping_event = new kEvent();
-		$shipping_event->Init('s');
-		$shipping_event->Name = 'OnPreSave';
+		/*$shipping_event = new kEvent('s:OnPreSave');
 		$shipping_event->status = kEvent::erFATAL;
-		$this->Application->HandleEvent(&$shipping_event);*/
+		$this->Application->HandleEvent($shipping_event);*/
 	}
 
 	/**
@@ -170,7 +168,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnClearAll(&$event)
+	function OnClearAll($event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -199,7 +197,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		if ( $type == 'before' && $this->Application->GetVar('sc') ) {
 			$shipping_obj =& $this->Application->recallObject('s');
@@ -226,7 +224,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSaveCreated(&$event)
+	function OnSaveCreated($event)
 	{
 		$event->CallSubEvent('OnCreate');
 		$event->redirect = false;
@@ -241,7 +239,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterCopyToTemp(kEvent &$event)
+	protected function OnAfterCopyToTemp(kEvent $event)
 	{
 		parent::OnAfterCopyToTemp($event);
 
@@ -274,7 +272,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeCopyToLive(kEvent &$event)
+	protected function OnBeforeCopyToLive(kEvent $event)
 	{
 		parent::OnBeforeCopyToLive($event);
 
Index: in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php
===================================================================
--- in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(revision 15111)
+++ in-commerce/units/shipping_quote_engines/shipping_quote_engine_event_handler.php	(working copy)
@@ -22,7 +22,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -72,7 +72,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function iterateItems(kEvent &$event)
+	protected function iterateItems(kEvent $event)
 	{
 		parent::iterateItems($event);
 
@@ -89,7 +89,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(kEvent &$event)
+	protected function OnAfterItemLoad(kEvent $event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -110,7 +110,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(kEvent &$event)
+	protected function OnAfterItemCreate(kEvent $event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -124,7 +124,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemUpdate(kEvent &$event)
+	protected function OnAfterItemUpdate(kEvent $event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -138,7 +138,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemDelete(kEvent &$event)
+	protected function OnAfterItemDelete(kEvent $event)
 	{
 		parent::OnAfterItemDelete($event);
 
Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php
===================================================================
--- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php	(revision 15111)
+++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php	(working copy)
@@ -21,10 +21,10 @@
 					'TagProcessorClass' =>	Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
 					'RegisterClasses'	=>	Array (
 												Array ('pseudo' => 'ShippingQuoteEngine', 'class' => 'ShippingQuoteEngine', 'file' => 'shipping_quote_engine.php', 'build_event' => ''),
-												Array ('pseudo' => 'CustomShippingQuoteEngine', 'class' => 'CustomShippingQuoteEngine', 'file' => 'custom_shipping_quote_engine.php', 'require_classes' => 'ShippingQuoteEngine', 'build_event' => ''),
-												Array ('pseudo' => 'Intershipper', 'class' => 'Intershipper', 'file' => 'intershipper.php', 'require_classes' => 'ShippingQuoteEngine', 'build_event' => ''),
-												Array ('pseudo' => 'USPS', 'class' => 'USPS', 'file' => 'usps.php', 'require_classes' => 'ShippingQuoteEngine', 'build_event' => ''),
-												Array ('pseudo' => 'ShippingQuoteCollector', 'class' => 'ShippingQuoteCollector', 'file' => 'shipping_quote_collector.php', 'build_event' => '', 'require_classes' => 'ShippingQuoteEngine'),
+												Array ('pseudo' => 'CustomShippingQuoteEngine', 'class' => 'CustomShippingQuoteEngine', 'file' => 'custom_shipping_quote_engine.php', 'build_event' => ''),
+												Array ('pseudo' => 'Intershipper', 'class' => 'Intershipper', 'file' => 'intershipper.php', 'build_event' => ''),
+												Array ('pseudo' => 'USPS', 'class' => 'USPS', 'file' => 'usps.php', 'build_event' => ''),
+												Array ('pseudo' => 'ShippingQuoteCollector', 'class' => 'ShippingQuoteCollector', 'file' => 'shipping_quote_collector.php', 'build_event' => ''),
 											),
 					'AutoLoad'			=>	true,
 					'Hooks'				=>	Array (
Index: in-commerce/units/taxes/taxes_event_handler.php
===================================================================
--- in-commerce/units/taxes/taxes_event_handler.php	(revision 15111)
+++ in-commerce/units/taxes/taxes_event_handler.php	(working copy)
@@ -64,7 +64,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		$zone_object =& $event->getObject();
 		/* @var $zone_object kDBItem */
@@ -88,8 +88,7 @@
 				$this->Application->SetVar('taxdst', $temp);
 			}
 
-			$dst_event = new kEvent('taxdst:OnCreate');
-			$this->Application->HandleEvent($dst_event);
+			$this->Application->HandleEvent(new kEvent('taxdst:OnCreate'));
 		}
 	}
 
@@ -98,7 +97,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnTypeChange(&$event)
+	function OnTypeChange($event)
 	{
 		$this->Application->DeleteVar('taxdst');
 		$event->CallSubEvent('OnPreSave');
@@ -110,7 +109,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function DestinationAction(&$event)
+	function DestinationAction($event)
 	{
 		$event->redirect = false;
 
@@ -238,7 +237,7 @@
 		$event->CallSubEvent("OnPreSave");
 	}
 
-	function OnCountryChange(&$event)
+	function OnCountryChange($event)
 	{
 		$destinations = &$this->Application->recallObject('taxdst');
 
Index: in-commerce/units/taxesdestinations/taxes_dst_event_handler.php
===================================================================
--- in-commerce/units/taxesdestinations/taxes_dst_event_handler.php	(revision 15111)
+++ in-commerce/units/taxesdestinations/taxes_dst_event_handler.php	(working copy)
@@ -20,7 +20,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnSaveDestinations(&$event)
+	function OnSaveDestinations($event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -71,7 +71,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCreate(kEvent &$event)
+	protected function OnCreate(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -105,7 +105,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		switch ($type) {
 			case 'before':
@@ -133,9 +133,10 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnZoneUpdate(&$event) {
+	function OnZoneUpdate($event) {
 
-		$object = &$event->getObject();
+		$object =& $event->getObject();
+		/* @var $object kDBItem */
 
 		$zone_object = &$this->Application->recallObject('tax');
 		$zone_id = (int)$this->Application->GetVar('tax_id');
Index: in-commerce/units/zones/zones_event_handler.php
===================================================================
--- in-commerce/units/zones/zones_event_handler.php	(revision 15111)
+++ in-commerce/units/zones/zones_event_handler.php	(working copy)
@@ -64,7 +64,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(kEvent &$event, $type)
+	protected function customProcessing(kEvent $event, $type)
 	{
 		$zone_object =& $event->getObject();
 		/* @var $zone_object kDBItem */
@@ -93,8 +93,7 @@
 					$this->Application->SetVar('dst', $temp);
 				}
 
-				$dst_event = new kEvent('dst:OnCreate');
-				$this->Application->HandleEvent($dst_event);
+				$this->Application->HandleEvent(new kEvent('dst:OnCreate'));
 				break;
 		}
 	}
@@ -104,7 +103,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnTypeChange(&$event)
+	function OnTypeChange($event)
 	{
 		$this->Application->DeleteVar('dst');
 
@@ -117,7 +116,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function DestinationAction(&$event)
+	function DestinationAction($event)
 	{
 		$event->redirect = false;
 
@@ -219,7 +218,7 @@
 		}
 	}
 
-	function OnCountryChange(&$event)
+	function OnCountryChange($event)
 	{
 		$destinations = &$this->Application->recallObject('dst');
 
@@ -239,7 +238,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCancel(kEvent &$event)
+	protected function OnCancel(kEvent $event)
 	{
 		parent::OnCancel($event);
 
@@ -266,7 +265,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnNew(kEvent &$event)
+	protected function OnNew(kEvent $event)
 	{
 		parent::OnNew($event);
 
Index: in-link/units/helpers/helpers_config.php
===================================================================
--- in-link/units/helpers/helpers_config.php	(revision 15111)
+++ in-link/units/helpers/helpers_config.php	(working copy)
@@ -19,6 +19,6 @@
 		'EventHandlerClass' => Array ('class' => 'kEventHandler', 'file' => '', 'build_event' => 'OnBuild'),
 
 		'RegisterClasses' => Array (
-			Array ('pseudo' => 'LinkHelper', 'class' => 'LinkHelper', 'file' => 'link_helper.php', 'build_event' => '', 'require_classes' => 'kHelper'),
+			Array ('pseudo' => 'LinkHelper', 'class' => 'LinkHelper', 'file' => 'link_helper.php', 'build_event' => ''),
 		),
 	);
\ No newline at end of file
Index: in-link/units/l-visits/l-visit_eh.php
===================================================================
--- in-link/units/l-visits/l-visit_eh.php	(revision 15111)
+++ in-link/units/l-visits/l-visit_eh.php	(working copy)
@@ -21,7 +21,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnDeleteVisits(&$event)
+	function OnDeleteVisits($event)
 	{
 		$key_field = $event->MasterEvent->Prefix == 'u' ? 'PortalUserId' : 'ResourceId';
 		$table_name = $this->Application->getUnitOption($this->Prefix, 'TableName');
Index: in-link/units/link_validation/link_validation_eh.php
===================================================================
--- in-link/units/link_validation/link_validation_eh.php	(revision 15111)
+++ in-link/units/link_validation/link_validation_eh.php	(working copy)
@@ -66,7 +66,7 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(kEvent &$event)
+		public function CheckPermission(kEvent $event)
 		{
 			$check_events = Array ('OnApproveLinks', 'OnDeclineLinks', 'OnDeleteLinks');
 
@@ -107,7 +107,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function prepareObject(&$object, kEvent &$event)
+		protected function prepareObject(&$object, kEvent $event)
 		{
 			parent::prepareObject($object, $event);
 
@@ -122,7 +122,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -141,7 +141,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnRestartValidation(&$event)
+		function OnRestartValidation($event)
 		{
 			$this->_resetValidation($event);
 
@@ -153,7 +153,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function _resetValidation(&$event)
+		function _resetValidation($event)
 		{
 			// 1. delete previous validation results
 			$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
@@ -173,7 +173,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnValidateSelected(&$event)
+		function OnValidateSelected($event)
 		{
 			$link_ids = $this->_getSelectedIds($event);
 			if (!$link_ids) {
@@ -195,7 +195,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnContinueValidation(&$event)
+		function OnContinueValidation($event)
 		{
 			$have_data = $this->_prepareValidation($event);
 			if ($have_data) {
@@ -209,7 +209,7 @@
 		 * @param kEvent $event
 		 * @param bool $from_ajax
 		 */
-		function _validate(&$event, $from_ajax = true)
+		function _validate($event, $from_ajax = true)
 		{
 			$validation_data = unserialize( $this->Application->RecallVar($event->Prefix . '_status') );
 
@@ -253,7 +253,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnValidateProgress(&$event)
+		function OnValidateProgress($event)
 		{
 			$done = $this->_validate($event, true);
 
@@ -362,7 +362,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnCancelValidation(&$event)
+		function OnCancelValidation($event)
 		{
 			$this->Application->RemoveVar($event->Prefix . '_status');
 		}
@@ -372,7 +372,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnResetValidationStatus(&$event)
+		function OnResetValidationStatus($event)
 		{
 			$ids = $this->_getSelectedIds($event, true);
 			if (!$ids) {
@@ -392,7 +392,7 @@
 		 * @param bool $transform convert link ids to link validation ids
 		 * @return Array
 		 */
-		function _getSelectedIds(&$event, $transform = false)
+		function _getSelectedIds($event, $transform = false)
 		{
 			$ids = Array();
 
@@ -423,7 +423,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function iterateItems(kEvent &$event)
+		protected function iterateItems(kEvent $event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
@@ -465,7 +465,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnDeleteLinks(&$event)
+		function OnDeleteLinks($event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
 				$event->status = kEvent::erFAIL;
@@ -488,7 +488,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnPrepareLinkEditing(&$event)
+		function OnPrepareLinkEditing($event)
 		{
 			// hook to OnAfterConfigRead instead of OnEdit, because fake ids should be available in CheckPermission
 			if ($this->Application->GetVar('l_event') != 'OnEdit') {
@@ -513,7 +513,7 @@
 		 *
 		 * @return bool
 		 */
-		function _prepareValidation(&$event)
+		function _prepareValidation($event)
 		{
 			// 2. get ids of all links and put them into validation queue
 			$id_field = $this->Application->getUnitOption('l', 'IDField');
@@ -540,7 +540,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnCronValidation(&$event)
+		function OnCronValidation($event)
 		{
 			$this->_resetValidation($event); // remove this for continuing to non validated before links
 
@@ -559,7 +559,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
Index: in-link/units/links/links_config.php
===================================================================
--- in-link/units/links/links_config.php	(revision 15111)
+++ in-link/units/links/links_config.php	(working copy)
@@ -18,8 +18,8 @@
 					'Prefix'			=>	'l',
 					'ItemClass'			=>	Array ('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array ('class' => 'LinksEventHandler', 'file' => 'links_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array ('class' => 'LinkTagProcessor', 'file' => 'link_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'),
+					'EventHandlerClass'	=>	Array ('class' => 'LinksEventHandler', 'file' => 'links_event_handler.php', 'build_event' => 'OnBuild'),
+					'TagProcessorClass' =>	Array ('class' => 'LinkTagProcessor', 'file' => 'link_tag_processor.php', 'build_event' => 'OnBuild'),
 					'AutoLoad'			=>	true,
 
 					'ConfigPriority' => 0,
Index: in-link/units/links/links_event_handler.php
===================================================================
--- in-link/units/links/links_event_handler.php	(revision 15111)
+++ in-link/units/links/links_event_handler.php	(working copy)
@@ -46,7 +46,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -93,7 +93,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnSetGrouping(&$event)
+		function OnSetGrouping($event)
 		{
 			$this->Application->LinkVar($event->getPrefixSpecial(true).'_dupe_fields', $event->getPrefixSpecial().'_dupe_fields');
 		}
@@ -103,7 +103,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnMerge(&$event)
+		function OnMerge($event)
 		{
 			$link_helper =& $this->Application->recallObject('LinkHelper');
 			/* @var $link_helper LinkHelper */
@@ -194,7 +194,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnStoreSelected(kEvent &$event)
+		protected function OnStoreSelected(kEvent $event)
 		{
 			$this->StoreSelectedIDs($event);
 
@@ -208,7 +208,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCreate(kEvent &$event)
+		protected function OnCreate(kEvent $event)
 		{
 			parent::OnCreate($event);
 
@@ -241,7 +241,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterConfigRead(kEvent &$event)
+		protected function OnAfterConfigRead(kEvent $event)
 		{
 			parent::OnAfterConfigRead($event);
 
@@ -274,7 +274,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnContactFormSubmit(&$event)
+		function OnContactFormSubmit($event)
 		{
 			$fields = Array (
 				'ContactFormFullName', 'ContactFormEmail', 'ContactFormSubject', 'ContactFormBody', 'ContactFormCaptcha'
@@ -357,7 +357,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -371,7 +371,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -383,7 +383,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function _checkLink(&$event)
+		function _checkLink($event)
 		{
 			if (!$this->Application->ConfigValue('ReciprocalLinkChecking')) {
 				return ;
@@ -413,7 +413,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnProcessReciprocalLinks(&$event)
+		function OnProcessReciprocalLinks($event)
 		{
 			if ( !$this->Application->ConfigValue('ReciprocalLinkChecking') ) {
 				return;
@@ -481,7 +481,7 @@
 		 * @return int
 		 * @access public
 		 */
-		public function getPassedID(kEvent &$event)
+		public function getPassedID(kEvent $event)
 		{
 			$id = parent::getPassedID($event);
 
@@ -522,7 +522,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCloneSubItem(kEvent &$event)
+		protected function OnCloneSubItem(kEvent $event)
 		{
 			parent::OnCloneSubItem($event);
 
@@ -553,7 +553,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteOriginal(kEvent &$event)
+		protected function OnBeforeDeleteOriginal(kEvent $event)
 		{
 			parent::OnBeforeDeleteOriginal($event);
 
@@ -579,7 +579,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterDeleteOriginal(kEvent &$event)
+		protected function OnAfterDeleteOriginal(kEvent $event)
 		{
 			parent::OnAfterDeleteOriginal($event);
 
Index: in-link/units/listing_types/listing_types_event_handler.php
===================================================================
--- in-link/units/listing_types/listing_types_event_handler.php	(revision 15111)
+++ in-link/units/listing_types/listing_types_event_handler.php	(working copy)
@@ -39,7 +39,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnProcessSelected(&$event)
+		function OnProcessSelected($event)
 		{
 			$object =& $event->getObject();
 			$selected_ids = $this->Application->GetVar('selected_ids');
@@ -52,7 +52,7 @@
 		}
 
 
-		function OnPreSaveListingType(&$event)
+		function OnPreSaveListingType($event)
 		{
 			$event->redirect = false;
 			$object =& $event->getObject( Array('skip_autoload' => true) );
@@ -69,7 +69,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnEdit(kEvent &$event)
+		protected function OnEdit(kEvent $event)
 		{
 			if ( $this->Application->prefixRegistred('p') ) {
 				$this->Application->recallObject('p', null, Array ('skip_autoload' => true));
@@ -85,7 +85,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: in-link/units/listings/listings_event_handler.php
===================================================================
--- in-link/units/listings/listings_event_handler.php	(revision 15111)
+++ in-link/units/listings/listings_event_handler.php	(working copy)
@@ -42,7 +42,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnProcessSelected(&$event)
+	function OnProcessSelected($event)
 	{
 		$object =& $event->getObject();
 
@@ -62,7 +62,7 @@
 		$this->finalizePopup($event);
 	}
 
-	function OnPreSaveListing(&$event)
+	function OnPreSaveListing($event)
 	{
 		$event->redirect=false;
 		$object =& $event->getObject( Array('skip_autoload' => true) );
@@ -80,7 +80,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(kEvent &$event)
+	protected function OnBeforeItemUpdate(kEvent $event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -97,7 +97,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(kEvent &$event)
+	protected function OnBeforeItemCreate(kEvent $event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -118,7 +118,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeDeleteFromLive(kEvent &$event)
+	protected function OnBeforeDeleteFromLive(kEvent $event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
@@ -269,7 +269,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnRequestEnhancement(&$event)
+	function OnRequestEnhancement($event)
 	{
 		if ($this->Application->isModuleEnabled('In-Commerce')) {
 			$l_info = $this->Application->GetVar('l');
@@ -303,7 +303,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnListingCreate(&$event)
+	function OnListingCreate($event)
 	{
 		$new_processing = false;
 		$link_id = $listing_type_id = 0;
@@ -433,7 +433,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function EnhancedLinkOnCompleteOrder(&$event)
+	function EnhancedLinkOnCompleteOrder($event)
 	{
 		// create enhancement, but pending
 		$this->OnListingCreate($event);
@@ -456,7 +456,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function EnhanceLinkAfterOrderApprove(&$event)
+	function EnhanceLinkAfterOrderApprove($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		/* @var $object kDBItem */
@@ -493,7 +493,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function EnhanceLinkAfterOrderDeny(&$event)
+	function EnhanceLinkAfterOrderDeny($event)
 	{
 		$object =& $event->getObject( Array('skip_autoload' => true) );
 		$fields = $event->getEventParam('field_values');
@@ -509,7 +509,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function ExpireLink(&$event)
+	function ExpireLink($event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -541,7 +541,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function iterateItems(kEvent &$event)
+	protected function iterateItems(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -635,7 +635,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCancel(kEvent &$event)
+	protected function OnCancel(kEvent $event)
 	{
 		parent::OnCancel($event);
 
@@ -651,7 +651,7 @@
 	 * @param kEvent $event
 	 * @return mixed
 	 */
-	function verifyListingOwner(&$event)
+	function verifyListingOwner($event)
 	{
 		$link_id = $this->Application->GetVar('l_id');
 		$user_id = $this->Application->RecallVar('user_id');
@@ -672,7 +672,7 @@
 		return $this->Conn->GetOne($sql);
 	}
 
-	function OnExtendEnhancement(&$event)
+	function OnExtendEnhancement($event)
 	{
 		$listing_id = $this->verifyListingOwner($event);
 		if (!$listing_id) {
@@ -697,7 +697,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCancelEnhancement(&$event)
+	function OnCancelEnhancement($event)
 	{
 		$listing_id = $this->verifyListingOwner($event);
 		if ( !$listing_id ) {
@@ -727,7 +727,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnCheckExpiredPaidListings(&$event)
+	function OnCheckExpiredPaidListings($event)
 	{
 		$sql = 'SELECT ListingId FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
 				WHERE ExpiresOn < '.adodb_mktime().' AND Status = 1';
@@ -784,7 +784,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnMassDelete(kEvent &$event)
+	protected function OnMassDelete(kEvent $event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -807,7 +807,7 @@
 	 *
 	 * @param kEvent $event
 	 */
-	function OnMoveEnhancement(&$event)
+	function OnMoveEnhancement($event)
 	{
 		$id_field = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'IDField');
 		$item_table_name = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'TableName');
@@ -834,7 +834,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterConfigRead(kEvent &$event)
+	protected function OnAfterConfigRead(kEvent $event)
 	{
 		parent::OnAfterConfigRead($event);
 
Index: in-news/units/articles/articles_config.php
===================================================================
--- in-news/units/articles/articles_config.php	(revision 15111)
+++ in-news/units/articles/articles_config.php	(working copy)
@@ -19,8 +19,8 @@
 
 					'ItemClass'			=>	Array ('class' => 'kCatDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 					'ListClass'			=>	Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'),
-					'EventHandlerClass'	=>	Array ('class' => 'ArticlesEventHandler', 'file' => 'articles_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'),
-					'TagProcessorClass' =>	Array ('class' => 'ArticlesTagProcessor', 'file' => 'articles_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'),
+					'EventHandlerClass'	=>	Array ('class' => 'ArticlesEventHandler', 'file' => 'articles_event_handler.php', 'build_event' => 'OnBuild'),
+					'TagProcessorClass' =>	Array ('class' => 'ArticlesTagProcessor', 'file' => 'articles_tag_processor.php', 'build_event' => 'OnBuild'),
 					'AutoLoad'			=>	true,
 
 					'ConfigPriority' => 0,
Index: in-news/units/articles/articles_event_handler.php
===================================================================
--- in-news/units/articles/articles_event_handler.php	(revision 15111)
+++ in-news/units/articles/articles_event_handler.php	(working copy)
@@ -24,7 +24,7 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(kEvent &$event)
+		protected function SetCustomQuery(kEvent $event)
 		{
 			parent::SetCustomQuery($event);
 
@@ -43,7 +43,7 @@
 		 * @param kEvent $event
 		 * @return Array
 		 */
-		function getTypeClauses(&$event)
+		function getTypeClauses($event)
 		{
 			$type_clauses = parent::getTypeClauses($event);
 
@@ -64,7 +64,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnUpdateRSSArticles(&$event)
+		function OnUpdateRSSArticles($event)
 		{
 			if ( defined('IS_INSTALL') && IS_INSTALL ) {
 				return;
@@ -148,7 +148,7 @@
 		 * @param kEvent $event
 		 * @return Array
 		 */
-		function getFeedArticles(&$event)
+		function getFeedArticles($event)
 		{
 			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
@@ -168,7 +168,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function parseFeed(&$event)
+		function parseFeed($event)
 		{
 			$source_urls = explode(',', $event->getEventParam('source_url'));
 			if (count($source_urls) > 1) {
@@ -262,7 +262,7 @@
 		 * @param kXMLNode $root_node
 		 * @param kEvent $event
 		 */
-		function parseRssFeed(&$root_node, &$event)
+		function parseRssFeed(&$root_node, $event)
 		{
 			$current_node = $root_node->firstChild;
 			$feed_articles = $this->getFeedArticles($event);
@@ -350,7 +350,7 @@
 		 * @param kXMLNode $root_node
 		 * @param kEvent $event
 		 */
-		function parseAtomFeed(&$root_node, &$event)
+		function parseAtomFeed(&$root_node, $event)
 		{
 			$current_node = $root_node->firstChild;
 			$feed_articles = $this->getFeedArticles($event);
@@ -426,7 +426,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent &$event)
+		protected function OnBeforeItemUpdate(kEvent $event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -441,7 +441,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(kEvent &$event)
+		protected function OnBeforeItemCreate(kEvent $event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -454,7 +454,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function createExcerpt(&$event)
+		function createExcerpt($event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -497,7 +497,7 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function OnUpdateCategoryCustomFields(&$event)
+		function OnUpdateCategoryCustomFields($event)
 		{
 			$new_virtual_fields =	Array(
 											'cust_RssSource'				=>	Array('type' => 'string', 'default' => ''),
@@ -523,7 +523,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(kEvent &$event)
+		protected function OnPreCreate(kEvent $event)
 		{
 			parent::OnPreCreate($event);
 
@@ -549,7 +549,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCloneSubItem(kEvent &$event)
+		protected function OnCloneSubItem(kEvent $event)
 		{
 			parent::OnCloneSubItem($event);