Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r15055 -r15065
--- branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15055)
+++ branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 15055 2012-01-17 09:22:44Z alex $
+* @version	$Id: categories_event_handler.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -224,17 +224,19 @@
 		 * Set's mark, that root category is edited
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnEdit(&$event)
+		protected function OnEdit(kEvent &$event)
 		{
 			$category_id = $this->Application->GetVar($event->getPrefixSpecial() . '_id');
 			$home_category = $this->Application->getBaseCategory();
 
-			$this->Application->StoreVar('IsRootCategory_'.$this->Application->GetVar('m_wid'), ($category_id === '0') || ($category_id == $home_category));
+			$this->Application->StoreVar('IsRootCategory_' . $this->Application->GetVar('m_wid'), ($category_id === '0') || ($category_id == $home_category));
 
 			parent::OnEdit($event);
 
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( $event->status == kEvent::erSUCCESS ) {
 				// keep "Section Properties" link (in browse modes) clean
 				$this->Application->DeleteVar('admin');
 			}
@@ -702,14 +704,18 @@
 		 * Set correct parent path for newly created categories
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterCopyToLive(&$event)
+		protected function OnAfterCopyToLive(kEvent &$event)
 		{
+			parent::OnAfterCopyToLive($event);
+
 			$object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
 			/* @var $object CategoriesItem */
 
 			$parent_path = false;
-			$object->Load( $event->getEventParam('id') );
+			$object->Load($event->getEventParam('id'));
 
 			if ( $event->getEventParam('temp_id') == 0 ) {
 				if ( $object->isLoaded() ) {
@@ -738,7 +744,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteFromLive(&$event)
+		protected function OnBeforeDeleteFromLive(kEvent &$event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
@@ -806,7 +812,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			// 1. for permission editing of Home category
 			$this->Application->RemoveVar('IsRootCategory_' . $this->Application->GetVar('m_wid'));
@@ -835,7 +841,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSave(&$event)
+		protected function OnSave(kEvent &$event)
 		{
 			// get data from live table before it is overwritten by parent OnSave method call
 			$ids = $this->getSelectedIDs($event, true);
@@ -916,7 +922,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreSaveCreated(&$event)
+		protected function OnPreSaveCreated(kEvent &$event)
 		{
 			$object =& $event->getObject( Array ('skip_autoload' => true) );
 			/* @var $object CategoriesItem */
@@ -933,18 +939,19 @@
 		 * Deletes sym link to other category
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
 			parent::OnAfterItemDelete($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			$sql = 'UPDATE '.$object->TableName.'
+			$sql = 'UPDATE ' . $object->TableName . '
 					SET SymLinkCategoryId = NULL
-					WHERE SymLinkCategoryId = '.$object->GetID();
-
+					WHERE SymLinkCategoryId = ' . $object->GetID();
 			$this->Conn->Query($sql);
 		}
 
@@ -956,7 +963,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
 			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
@@ -1027,7 +1034,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnMassDelete(&$event)
+		protected function OnMassDelete(kEvent &$event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
@@ -1293,7 +1300,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -1307,7 +1314,7 @@
 
 			$this->_beforeItemChange($event);
 
-			if ( $this->Application->isAdminUser || $event->Prefix == 'st' ) {
+			if ( $this->Application->isAdmin || $event->Prefix == 'st' ) {
 				// don't check category permissions when auto-creating structure pages
 				return ;
 			}
@@ -1362,7 +1369,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -1380,14 +1387,16 @@
 		 * Performs redirect to correct suggest confirmation template
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($this->Application->isAdminUser || $event->status != kEvent::erSUCCESS) {
+			if ( $this->Application->isAdmin || $event->status != kEvent::erSUCCESS ) {
 				// don't sent email or rebuild cache directly after category is created by admin
-				return ;
+				return;
 			}
 
 			$object =& $event->getObject();
@@ -1408,8 +1417,8 @@
 			$perm_prefix = $this->Application->getUnitOption($event->Prefix, 'PermItemPrefix');
 
 			$event_suffix = $is_active ? 'ADD' : 'ADD.PENDING';
-			$this->Application->EmailEventAdmin($perm_prefix.'.'.$event_suffix);
-			$this->Application->EmailEventUser($perm_prefix.'.'.$event_suffix, $object->GetDBField('CreatedById'));
+			$this->Application->EmailEventAdmin($perm_prefix . '.' . $event_suffix);
+			$this->Application->EmailEventUser($perm_prefix . '.' . $event_suffix, $object->GetDBField('CreatedById'));
 		}
 
 		/**
@@ -1463,7 +1472,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function iterateItems(&$event)
+		protected function iterateItems(kEvent &$event)
 		{
 			if ( $event->Name != 'OnMassApprove' && $event->Name != 'OnMassDecline' ) {
 				parent::iterateItems($event);
@@ -1739,9 +1748,13 @@
 		 * Don't allow to delete system pages, when not in debug mode
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -2074,7 +2087,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -2106,7 +2119,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -2564,7 +2577,7 @@
 		 * @see PriorityEventHandler
 		 * @access protected
 		 */
-		protected function OnGetConstrainInfo(&$event)
+		protected function OnGetConstrainInfo(kEvent &$event)
 		{
 			$constrain = ''; // for OnSave
 
@@ -2867,7 +2880,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeClone(&$event)
+		protected function OnBeforeClone(kEvent &$event)
 		{
 			parent::OnBeforeClone($event);