Index: branches/5.2.x/units/link_validation/link_validation_eh.php
===================================================================
diff -u -N -r14877 -r14987
--- branches/5.2.x/units/link_validation/link_validation_eh.php	(.../link_validation_eh.php)	(revision 14877)
+++ branches/5.2.x/units/link_validation/link_validation_eh.php	(.../link_validation_eh.php)	(revision 14987)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: link_validation_eh.php 14877 2011-12-16 15:06:23Z alex $
+* @version	$Id: link_validation_eh.php 14987 2012-01-04 16:12:42Z alex $
 * @package	In-Link
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,8 +19,11 @@
 		/**
 		 * Allows to override standard permission mapping
 		 *
+		 * @return void
+		 * @access protected
+		 * @see kEventHandler::$permMapping
 		 */
-		function mapPermissions()
+		protected function mapPermissions()
 		{
 			parent::mapPermissions();
 
@@ -37,7 +40,14 @@
 			$this->permMapping = array_merge($this->permMapping, $permissions);
 		}
 
-		function mapEvents()
+		/**
+		 * Define alternative event processing method names
+		 *
+		 * @return void
+		 * @see kEventHandler::$eventMethods
+		 * @access protected
+		 */
+		protected function mapEvents()
 		{
 			parent::mapEvents();
 
@@ -56,28 +66,29 @@
 		 * @return bool
 		 * @access public
 		 */
-		public function CheckPermission(&$event)
+		public function CheckPermission(kEvent &$event)
 		{
 			$check_events = Array ('OnApproveLinks', 'OnDeclineLinks', 'OnDeleteLinks');
-			if (in_array($event->Name, $check_events)) {
+
+			if ( in_array($event->Name, $check_events) ) {
 				$ids = $this->_getSelectedIds($event);
 
 				$perm_value = true;
-				if ($ids) {
+				if ( $ids ) {
 					$perm_helper =& $this->Application->recallObject('PermissionsHelper');
 					/* @var $perm_helper kPermissionsHelper */
 
 					$items = $perm_helper->GetCategoryItemData('l', $ids);
 					$check_method = $event->Name == 'OnDeleteLinks' ? 'DeleteCheckPermission' : 'ModifyCheckPermission';
 					foreach ($items as $item_id => $item_data) {
-						if ($perm_helper->$check_method($item_data['CreatedById'], $item_data['CategoryId'], 'l') == 0) {
+						if ( $perm_helper->$check_method($item_data['CreatedById'], $item_data['CategoryId'], 'l') == 0 ) {
 							// one of items selected has no permission
 							$perm_value = false;
 							break;
 						}
 					}
 
-					if (!$perm_value) {
+					if ( !$perm_value ) {
 						$event->status = kEvent::erPERM_FAIL;
 					}
 				}
@@ -96,11 +107,11 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function prepareObject(&$object, &$event)
+		protected function prepareObject(&$object, kEvent &$event)
 		{
 			parent::prepareObject($object, $event);
 
-			$object->addCalculatedField('CachedNavbar', 'c.l'.$this->Application->GetVar('m_lang').'_CachedNavbar');
+			$object->addCalculatedField('CachedNavbar', 'c.l' . $this->Application->GetVar('m_lang') . '_CachedNavbar');
 		}
 
 		/**
@@ -111,14 +122,16 @@
 		 * @access protected
 		 * @see kDBEventHandler::OnListBuild()
 		 */
-		protected function SetCustomQuery(&$event)
+		protected function SetCustomQuery(kEvent &$event)
 		{
+			parent::SetCustomQuery($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBList */
 
 			$object->addFilter('primary_category_filter', 'ci.PrimaryCat = 1');
 
-			if ($event->Special == 'invalid') {
+			if ( $event->Special == 'invalid' ) {
 				$object->addFilter('status_filter', '%1$s.ValidationStatus = ' . LINK_VALIDATION_INVALID);
 			}
 		}