Index: branches/5.2.x/units/listing_types/listing_types_event_handler.php
===================================================================
diff -u -N -r14987 -r15062
--- branches/5.2.x/units/listing_types/listing_types_event_handler.php	(.../listing_types_event_handler.php)	(revision 14987)
+++ branches/5.2.x/units/listing_types/listing_types_event_handler.php	(.../listing_types_event_handler.php)	(revision 15062)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listing_types_event_handler.php 14987 2012-01-04 16:12:42Z alex $
+* @version	$Id: listing_types_event_handler.php 15062 2012-01-17 14:50:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,11 +61,20 @@
 			$this->Application->SetVar($event->getPrefixSpecial(true).'_id', $object->GetID());
 		}
 
-		function OnEdit(&$event)
+		/**
+		 * Prepare temp tables and populate it
+		 * with items selected in the grid
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnEdit(kEvent &$event)
 		{
-			if ($this->Application->prefixRegistred('p')) {
-				$this->Application->recallObject('p', null, Array('skip_autoload' => true));
+			if ( $this->Application->prefixRegistred('p') ) {
+				$this->Application->recallObject('p', null, Array ('skip_autoload' => true));
 			}
+
 			parent::OnEdit($event);
 		}
 
@@ -76,7 +85,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/units/link_validation/link_validation_eh.php
===================================================================
diff -u -N -r14987 -r15062
--- branches/5.2.x/units/link_validation/link_validation_eh.php	(.../link_validation_eh.php)	(revision 14987)
+++ branches/5.2.x/units/link_validation/link_validation_eh.php	(.../link_validation_eh.php)	(revision 15062)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_validation_eh.php 14987 2012-01-04 16:12:42Z alex $
+* @version	$Id: link_validation_eh.php 15062 2012-01-17 14:50:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -423,7 +423,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function iterateItems(&$event)
+		protected function iterateItems(kEvent &$event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
Index: branches/5.2.x/units/listings/listings_event_handler.php
===================================================================
diff -u -N -r14987 -r15062
--- branches/5.2.x/units/listings/listings_event_handler.php	(.../listings_event_handler.php)	(revision 14987)
+++ branches/5.2.x/units/listings/listings_event_handler.php	(.../listings_event_handler.php)	(revision 15062)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: listings_event_handler.php 14987 2012-01-04 16:12:42Z alex $
+* @version	$Id: listings_event_handler.php 15062 2012-01-17 14:50:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -80,7 +80,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -97,7 +97,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -118,7 +118,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeDeleteFromLive(&$event)
+	protected function OnBeforeDeleteFromLive(kEvent &$event)
 	{
 		parent::OnBeforeDeleteFromLive($event);
 
@@ -541,7 +541,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function iterateItems(&$event)
+	protected function iterateItems(kEvent &$event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
@@ -610,7 +610,7 @@
 
 					if ( $object->Update() ) {
 						$event->status = kEvent::erSUCCESS;
-						$event->setRedirectParams(Array ('opener' => 's'), true);
+						$event->SetRedirectParam('opener', 's');
 						$this->Application->EmailEventUser('LINK.ENHANCE.RENEW', $owner_id);
 						$this->Application->EmailEventAdmin('LINK.ENHANCE.RENEW');
 					}
@@ -635,7 +635,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnCancel(&$event)
+	protected function OnCancel(kEvent &$event)
 	{
 		parent::OnCancel($event);
 
@@ -784,7 +784,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnMassDelete(&$event)
+	protected function OnMassDelete(kEvent &$event)
 	{
 		$object =& $event->getObject(Array ('skip_autoload' => true));
 		/* @var $object kDBItem */
Index: branches/5.2.x/units/links/links_event_handler.php
===================================================================
diff -u -N -r14987 -r15062
--- branches/5.2.x/units/links/links_event_handler.php	(.../links_event_handler.php)	(revision 14987)
+++ branches/5.2.x/units/links/links_event_handler.php	(.../links_event_handler.php)	(revision 15062)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: links_event_handler.php 14987 2012-01-04 16:12:42Z alex $
+* @version	$Id: links_event_handler.php 15062 2012-01-17 14:50:44Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -205,27 +205,32 @@
 		 * Allows to enhance link after creation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($event->status == kEvent::erSUCCESS) {
-				$object =& $event->getObject();
-				/* @var $object kDBItem */
+			if ( $event->status != kEvent::erSUCCESS ) {
+				return;
+			}
 
-				// replace 0 id in post with actual created id (used in enhancement process)
-				$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-				kUtil::array_rename_key($items_info, 0, $object->GetID());
-				$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
+			$object =& $event->getObject();
+			/* @var $object kDBItem */
 
-				// listing was created -> enhance it right away
-				$enhancement_event = new kEvent('ls:OnRequestEnhancement');
-				$this->Application->HandleEvent($enhancement_event);
-				if (($enhancement_event->status == kEvent::erSUCCESS) && strlen($enhancement_event->redirect)) {
-					$event->SetRedirectParam('next_template', $event->redirect);
-					$event->redirect = $enhancement_event->redirect;
-				}
+			// replace 0 id in post with actual created id (used in enhancement process)
+			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+			kUtil::array_rename_key($items_info, 0, $object->GetID());
+			$this->Application->SetVar($event->getPrefixSpecial(true), $items_info);
+
+			// listing was created -> enhance it right away
+			$enhancement_event = new kEvent('ls:OnRequestEnhancement');
+			$this->Application->HandleEvent($enhancement_event);
+
+			if ( ($enhancement_event->status == kEvent::erSUCCESS) && strlen($enhancement_event->redirect) ) {
+				$event->SetRedirectParam('next_template', $event->redirect);
+				$event->redirect = $enhancement_event->redirect;
 			}
 		}
 
@@ -352,7 +357,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -366,7 +371,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -514,12 +519,14 @@
 		 * [HOOK] Allows to add cloned subitem to given prefix
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCloneSubItem(&$event)
+		protected function OnCloneSubItem(kEvent &$event)
 		{
 			parent::OnCloneSubItem($event);
 
-			if ($event->MasterEvent->Prefix == 'rev') {
+			if ( $event->MasterEvent->Prefix == 'rev' ) {
 				$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
 				$subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;