Index: branches/5.2.x/core/units/modules/modules_event_handler.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/modules/modules_event_handler.php	(.../modules_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: modules_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
@@ -127,7 +127,7 @@
 
 			if ( $updated ) {
 				$event->status = kEvent::erSUCCESS;
-				$event->setRedirectParams(Array ('opener' => 's'), true);
+				$event->SetRedirectParam('opener', 's');
 
 				$this->Application->DeleteUnitCache();
 				$this->Application->DeleteSectionCache();
@@ -140,8 +140,10 @@
 		 * Occurs after list is queried
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterListQuery(&$event)
+		protected function OnAfterListQuery(kEvent &$event)
 		{
 			parent::OnAfterListQuery($event);
 
@@ -150,8 +152,8 @@
 
 			$new_modules = $modules_helper->getModules(kModulesHelper::NOT_INSTALLED);
 
-			if (!$new_modules || $this->Application->RecallVar('user_id') != USER_ROOT) {
-				return ;
+			if ( !$new_modules || $this->Application->RecallVar('user_id') != USER_ROOT ) {
+				return;
 			}
 
 			require_once FULL_PATH . '/core/install/install_toolkit.php';
Index: branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: custom_fields_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
@@ -130,7 +130,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -153,14 +153,17 @@
 		 * is stored as 'id' param of event
 		 *
 		 * @param kEvent $event
-		 * @access public
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
+			parent::OnAfterItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			$main_prefix = $this->getPrefixByItemType( $object->GetDBField('Type') );
+			$main_prefix = $this->getPrefixByItemType($object->GetDBField('Type'));
 
 			$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
 			/* @var $ml_helper kMultiLanguageHelper */
@@ -222,7 +225,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnMassDelete(&$event)
+		protected function OnMassDelete(kEvent &$event)
 		{
 			parent::OnMassDelete($event);
 
@@ -238,7 +241,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			parent::OnPreCreate($event);
 
@@ -255,7 +258,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -308,7 +311,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r15050 -r15065
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15050)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 15050 2012-01-16 15:47:23Z alex $
+* @version	$Id: users_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
@@ -395,7 +395,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -408,8 +408,10 @@
 		 * Performs user registration
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			if ( $this->Application->isAdmin ) {
 				parent::OnCreate($event);
@@ -513,7 +515,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -925,7 +927,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -1312,8 +1314,10 @@
 		 * Sends approved/declined email event on user status change
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -1371,7 +1375,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteFromLive(&$event)
+		protected function OnBeforeDeleteFromLive(kEvent &$event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
@@ -1388,8 +1392,10 @@
 		 * Sends approved/declined email event on user status change (in temp tables during editing)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterCopyToLive(&$event)
+		protected function OnAfterCopyToLive(kEvent &$event)
 		{
 			parent::OnAfterCopyToLive($event);
 
@@ -1623,7 +1629,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeClone(&$event)
+		protected function OnBeforeClone(kEvent &$event)
 		{
 			parent::OnBeforeClone($event);
 
@@ -1706,7 +1712,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -1769,7 +1775,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			parent::OnPreCreate($event);
 
Index: branches/5.2.x/core/units/images/image_event_handler.php
===================================================================
diff -u -N -r15012 -r15065
--- branches/5.2.x/core/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 15012)
+++ branches/5.2.x/core/units/images/image_event_handler.php	(.../image_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_event_handler.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: image_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
@@ -83,7 +83,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function customProcessing(&$event, $type)
+	protected function customProcessing(kEvent &$event, $type)
 	{
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
@@ -117,7 +117,7 @@
 			$event->setEventParam('ids', $ids);
 		}
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'before' :
 				// empty unused fields
 				$object->SetDBField($object->GetDBField('LocalImage') ? 'Url' : 'LocalPath', '');
@@ -265,7 +265,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -279,7 +279,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(kEvent &$event)
 	{
 		parent::OnAfterItemCreate($event);
 
Index: branches/5.2.x/core/units/skins/skin_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/skins/skin_eh.php	(.../skin_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/skins/skin_eh.php	(.../skin_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: skin_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: skin_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -94,7 +94,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeClone(&$event)
+		protected function OnBeforeClone(kEvent &$event)
 		{
 			parent::OnBeforeClone($event);
 
@@ -108,15 +108,17 @@
 		 * Re-compile skin, after it's changed (live table only)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if (!$object->IsTempTable()) {
+			if ( !$object->IsTempTable() ) {
 				$skin_helper =& $this->Application->recallObject('SkinHelper');
 				/* @var $skin_helper SkinHelper */
 
Index: branches/5.2.x/core/units/files/file_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/files/file_eh.php	(.../file_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/files/file_eh.php	(.../file_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: file_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: file_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -41,7 +41,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -58,7 +58,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/core/units/themes/themes_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/themes/themes_eh.php	(.../themes_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: themes_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: themes_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -96,15 +96,19 @@
 		 * Set's primary theme (when checkbox used on editing form)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterCopyToLive(&$event)
+		protected function OnAfterCopyToLive(kEvent &$event)
 		{
-			$object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true, 'live_table' => true));
+			parent::OnAfterCopyToLive($event);
+
+			$object =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true, 'live_table' => true));
 			/* @var $object kDBItem */
 
 			$object->Load($event->getEventParam('id'));
 
-			if ($object->GetDBField('PrimaryTheme')) {
+			if ( $object->GetDBField('PrimaryTheme') ) {
 				$this->setPrimary($event->getEventParam('id'));
 			}
 		}
@@ -116,7 +120,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSave(&$event)
+		protected function OnSave(kEvent &$event)
 		{
 			parent::OnSave($event);
 
Index: branches/5.2.x/core/units/forms/forms/forms_eh.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/forms/forms/forms_eh.php	(.../forms_eh.php)	(revision 15049)
+++ branches/5.2.x/core/units/forms/forms/forms_eh.php	(.../forms_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_eh.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: forms_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -99,7 +99,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(&$event)
+	protected function OnSave(kEvent &$event)
 	{
 		parent::OnSave($event);
 
@@ -118,7 +118,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnMassDelete(&$event)
+	protected function OnMassDelete(kEvent &$event)
 	{
 		parent::OnMassDelete($event);
 
@@ -257,7 +257,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -271,7 +271,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php	(.../submission_log_eh.php)	(revision 15049)
+++ branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php	(.../submission_log_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: submission_log_eh.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: submission_log_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -68,9 +68,10 @@
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
@@ -89,7 +90,7 @@
 			$from_email = $form->GetDBField('ReplyFromEmail');
 			$to_email = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
 
-			if ($this->Application->GetVar('client_mode')) {
+			if ( $this->Application->GetVar('client_mode') ) {
 				// debug code for sending email from client
 				$object->SetDBField('FromEmail', $to_email);
 				$object->SetDBField('ToEmail', $from_email);
@@ -104,26 +105,26 @@
 			$object->SetDBField('Bcc', $form->GetDBField('ReplyBcc'));
 
 			$ids = $this->StoreSelectedIDs($event);
-			if ($ids) {
+			if ( $ids ) {
 				$org_message =& $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
 				/* @var $org_message kDBItem */
 
-				$org_message->Load( array_shift($ids) );
+				$org_message->Load(array_shift($ids));
 				// client could reply from different email, so compare to admin email!
-				if ($org_message->GetDBField('ToEmail') == $from_email) {
+				if ( $org_message->GetDBField('ToEmail') == $from_email ) {
 					// can reply only to client email, not own :)
 
 					// transform subject
 					$message_subject = $org_message->GetDBField('Subject');
 
-					if ($message_subject) {
+					if ( $message_subject ) {
 						$object->SetDBField('Subject', $this->_transformSubject($message_subject, 'Re'));
 					}
 
 					// add signature
 					$message_body = $form->GetDBField('ReplyMessageSignature');
 
-					if ($org_message->GetDBField('Message')) {
+					if ( $org_message->GetDBField('Message') ) {
 						// add replied marks
 						$message_body .= '> ' . preg_replace('/([\r]*\n)/', '\\1> ', $org_message->GetDBField('Message'));
 					}
@@ -139,11 +140,11 @@
 						WHERE FormSubmissionId = ' . $form_submission->GetID();
 				$replies_found = $this->Conn->GetOne($sql);
 
-				if (!$replies_found) {
+				if ( !$replies_found ) {
 					// 1st message from admin -> quote subject & text from feedback
 					$message_subject = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT, true);
 
-					if ($message_subject) {
+					if ( $message_subject ) {
 						$object->SetDBField('Subject', $this->_transformSubject($message_subject, 'Re'));
 					}
 
@@ -153,7 +154,7 @@
 					// add replied marks
 					$original_message_body = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_BODY);
 
-					if ($original_message_body) {
+					if ( $original_message_body ) {
 						$message_body .= '> ' . preg_replace('/([\r]*\n)/', '\\1> ', $original_message_body);
 					}
 
@@ -246,7 +247,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -261,7 +262,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -409,7 +410,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -471,8 +472,10 @@
 		 * Updates last update time for submission
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -482,9 +485,9 @@
 			/* @var $object kDBItem */
 
 			// send out email event to admin for bouncing
-			if ( $object->GetOriginalField('SentStatus') != $object->GetDBField('SentStatus')
-				 && $object->GetDBField('SentStatus') == SUBMISSION_LOG_BOUNCE ) {
+			$sent_status = $object->GetDBField('SentStatus');
 
+			if ( $object->GetOriginalField('SentStatus') != $sent_status && $sent_status == SUBMISSION_LOG_BOUNCE ) {
 				$this->Application->EmailEventAdmin('FORM.SUBMISSION.REPLY.FROM.USER.BOUNCED');
 			}
 		}
Index: branches/5.2.x/core/units/category_items/category_items_event_handler.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/category_items/category_items_event_handler.php	(.../category_items_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: category_items_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: category_items_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
@@ -57,7 +57,7 @@
 				$this->Conn->Query('UPDATE ' . $object->TableName . ' SET PrimaryCat = 1 WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (CategoryId = ' . $id . ')');
 			}
 
-			$event->setRedirectParams(Array ('opener' => 's'), true);
+			$event->SetRedirectParam('opener', 's');
 		}
 
 		/**
@@ -68,32 +68,42 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
-			if($event->Name == 'OnMassDelete')
-			{
+			if ( $event->Name == 'OnMassDelete' ) {
 				$object =& $event->getObject();
 				$table_info = $object->getLinkedInfo();
 
-				switch ($type)
-				{
+				switch ($type) {
 					case 'before':
 						$ids = $event->getEventParam('ids');
-						if($ids)
-						{
-							$ids = $this->Conn->GetCol('SELECT CategoryId FROM '.$object->TableName.' WHERE (PrimaryCat=0) AND ('.$table_info['ForeignKey'].'='.$table_info['ParentId'].') AND CategoryId IN ('.implode(',',$ids).')');
-							$event->setEventParam('ids',$ids);
+
+						if ( $ids ) {
+							$sql = 'SELECT CategoryId
+									FROM ' . $object->TableName . '
+									WHERE (PrimaryCat = 0) AND (' . $table_info['ForeignKey'] . '=' . $table_info['ParentId'] . ') AND CategoryId IN (' . implode(',', $ids) . ')';
+							$event->setEventParam('ids', $this->Conn->GetCol($sql));
 						}
 						break;
 
-						// not needed because 'before' does not allow to delete primary cat!
+					// not needed because 'before' does not allow to delete primary cat!
 					/*case 'after':
 						// set 1st not deleted category as primary
-						$has_primary = $this->Conn->GetOne('SELECT COUNT(*) FROM '.$object->TableName.' WHERE (PrimaryCat=1) AND ('.$table_info['ForeignKey'].' = '.$table_info['ParentId'].')');
-						if(!$has_primary)
-						{
-							$cat_id = $this->Conn->GetOne('SELECT CategoryId FROM '.$object->TableName.' WHERE '.$table_info['ForeignKey'].' = '.$table_info['ParentId']);
-							$this->Conn->Query('UPDATE '.$object->TableName.' SET PrimaryCat = 1 WHERE ('.$table_info['ForeignKey'].' = '.$table_info['ParentId'].') AND (CategoryId = '.$cat_id.')');
+						$sql = 'SELECT COUNT(*)
+								FROM ' . $object->TableName . '
+								WHERE (PrimaryCat = 1) AND (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ')';
+						$has_primary = $this->Conn->GetOne($sql);
+
+						if ( !$has_primary ) {
+							$sql = 'SELECT CategoryId
+									FROM ' . $object->TableName . '
+									WHERE ' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'];
+							$cat_id = $this->Conn->GetOne($sql);
+
+							$sql = 'UPDATE ' . $object->TableName . '
+									SET PrimaryCat = 1
+									WHERE (' . $table_info['ForeignKey'] . ' = ' . $table_info['ParentId'] . ') AND (CategoryId = ' . $cat_id . ')';
+							$this->Conn->Query($sql);
 						}
 						break;*/
 				}
@@ -104,15 +114,21 @@
 		 * Removes primary mark from cloned category items record
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterClone(&$event)
+		protected function OnAfterClone(kEvent &$event)
 		{
+			parent::OnAfterClone($event);
+
 			$id = $event->getEventParam('id');
 			$table = $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
-			$sql = 'UPDATE %s SET PrimaryCat = 0 WHERE %s = %s';
 
-			$this->Conn->Query( sprintf($sql, $table, $id_field, $id) );
+			$sql = 'UPDATE %s
+					SET PrimaryCat = 0
+					WHERE %s = %s';
+			$this->Conn->Query(sprintf($sql, $table, $id_field, $id));
 		}
 
 		/**
Index: branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php
===================================================================
diff -u -N -r15033 -r15065
--- branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php	(.../scheduled_task_eh.php)	(revision 15033)
+++ branches/5.2.x/core/units/scheduled_tasks/scheduled_task_eh.php	(.../scheduled_task_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: scheduled_task_eh.php 15033 2012-01-10 14:39:36Z alex $
+* @version	$Id: scheduled_task_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -95,25 +95,24 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
-			if ($event->Name == 'OnMassDelete' && $type == 'before') {
-				if ($this->Application->isDebugMode()) {
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
+				if ( $this->Application->isDebugMode() ) {
 					// allow to delete system scheduled tasks in debug mode
-					return ;
+					return;
 				}
 
 				$ids = $event->getEventParam('ids');
-				if ($ids) {
+
+				if ( $ids ) {
 					$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 					$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
 					$sql = 'SELECT ' . $id_field . '
 							FROM ' . $table_name . '
 							WHERE ' . $id_field . ' IN (' . implode(',', $ids) . ') AND Type <> ' . ScheduledTask::TYPE_SYSTEM;
-					$allowed_ids = $this->Conn->GetCol($sql);
-
-					$event->setEventParam('ids', $allowed_ids);
+					$event->setEventParam('ids', $this->Conn->GetCol($sql));
 				}
 			}
 		}
Index: branches/5.2.x/core/units/page_revisions/page_revision_eh.php
===================================================================
diff -u -N -r15051 -r15065
--- branches/5.2.x/core/units/page_revisions/page_revision_eh.php	(.../page_revision_eh.php)	(revision 15051)
+++ branches/5.2.x/core/units/page_revisions/page_revision_eh.php	(.../page_revision_eh.php)	(revision 15065)
@@ -129,8 +129,10 @@
 	 * Remembers, who created revision
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -149,8 +151,10 @@
 	 * Updates revision creation time
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -167,8 +171,10 @@
 	 * Creates new content blocks based on source revision
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(kEvent &$event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -197,8 +203,10 @@
 	 * Mark revision as current, once it's approved
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemUpdate(&$event)
+	protected function OnAfterItemUpdate(kEvent &$event)
 	{
 		parent::OnAfterItemUpdate($event);
 
@@ -211,7 +219,7 @@
 			$page =& $this->Application->recallObject('c.revision', null, Array ('skip_autoload' => true));
 			/* @var $page kDBItem */
 
-			$page->Load( $object->GetDBField('PageId') );
+			$page->Load($object->GetDBField('PageId'));
 			$page->SetDBField('LiveRevisionNumber', $object->GetDBField('RevisionNumber'));
 			$page->Update();
 		}
@@ -241,13 +249,15 @@
 	 * Saves user draft into live revision
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnSave(&$event)
+	protected function OnSave(kEvent &$event)
 	{
 		$revision_id = $this->getCurrentDraftRevision($event);
 
 		if ( $revision_id ) {
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
 			$object->Load($revision_id);
Index: branches/5.2.x/core/units/promo_blocks/promo_block_eh.php
===================================================================
diff -u -N -r15034 -r15065
--- branches/5.2.x/core/units/promo_blocks/promo_block_eh.php	(.../promo_block_eh.php)	(revision 15034)
+++ branches/5.2.x/core/units/promo_blocks/promo_block_eh.php	(.../promo_block_eh.php)	(revision 15065)
@@ -64,7 +64,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(&$event)
+	protected function OnPreCreate(kEvent &$event)
 	{
 		parent::OnPreCreate($event);
 
@@ -164,7 +164,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -178,7 +178,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/core/units/promo_block_groups/promo_block_group_eh.php
===================================================================
diff -u -N -r15012 -r15065
--- branches/5.2.x/core/units/promo_block_groups/promo_block_group_eh.php	(.../promo_block_group_eh.php)	(revision 15012)
+++ branches/5.2.x/core/units/promo_block_groups/promo_block_group_eh.php	(.../promo_block_group_eh.php)	(revision 15065)
@@ -23,7 +23,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 		$this->beforeItemChange($event);
@@ -36,7 +36,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 		$this->beforeItemChange($event);
@@ -58,12 +58,14 @@
 	}
 
 	/**
-	 * Occurs before deleting item
+	 * Occurs before deleting item, id of item being
+	 * deleted is stored as 'id' event param
 	 *
 	 * @param kEvent $event
 	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemDelete(&$event)
+	protected function OnBeforeItemDelete(kEvent &$event)
 	{
 		parent::OnBeforeItemDelete($event);
 
@@ -86,8 +88,9 @@
 	 *
 	 * @param kEvent $event
 	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemDelete(&$event)
+	protected function OnAfterItemDelete(kEvent &$event)
 	{
 		parent::OnAfterItemDelete($event);
 
@@ -104,7 +107,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnSave(&$event)
+	protected function OnSave(kEvent &$event)
 	{
 		parent::OnSave($event);
 
@@ -120,7 +123,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnMassDelete(&$event)
+	protected function OnMassDelete(kEvent &$event)
 	{
 		parent::OnMassDelete($event);
 
Index: branches/5.2.x/core/units/selectors/selectors_event_handler.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 15049)
+++ branches/5.2.x/core/units/selectors/selectors_event_handler.php	(.../selectors_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: selectors_event_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: selectors_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
@@ -46,7 +46,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeClone(&$event)
+		protected function OnBeforeClone(kEvent &$event)
 		{
 			parent::OnBeforeClone($event);
 
@@ -126,7 +126,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -140,20 +140,24 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
 			$this->SerializeSelectorData($event);
 		}
 
 		/**
-		 * Enter description here...
+		 * Occurs after updating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
+			parent::OnAfterItemUpdate($event);
+
 			$this->UnserializeSelectorData($event);
 		}
 
@@ -164,7 +168,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -249,7 +253,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: branches/5.2.x/core/units/favorites/favorites_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/favorites/favorites_eh.php	(.../favorites_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/favorites/favorites_eh.php	(.../favorites_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: favorites_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: favorites_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -76,8 +76,10 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
+		parent::OnBeforeItemCreate($event);
+
 		$object =& $event->getObject();
 		/* @var $object kDBItem */
 
Index: branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/mailing_lists/mailing_list_eh.php	(.../mailing_list_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mailing_list_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: mailing_list_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -40,18 +40,20 @@
 		 * Prepare recipient list
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
 			$recipient_type = $this->Application->GetVar('mailing_recipient_type');
-			if (!$recipient_type) {
-				return ;
+			if ( !$recipient_type ) {
+				return;
 			}
 
 			$recipients = $this->Application->GetVar($recipient_type);
-			if ($recipients) {
+			if ( $recipients ) {
 				$object =& $event->getObject();
 				/* @var $object kDBItem */
 
@@ -69,11 +71,12 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
-			if ($event->Name == 'OnMassDelete' && $type == 'before') {
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
-				if ($ids) {
+
+				if ( $ids ) {
 					$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 					$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
@@ -88,11 +91,13 @@
 		}
 
 		/**
-		 * Delete all realted mails in email queue
+		 * Delete all related mails in email queue
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -103,11 +108,11 @@
 
 			// delete mailing attachments after mailing is deleted
 			$attachments = $object->GetField('Attachments', 'file_paths');
-			if ($attachments) {
+			if ( $attachments ) {
 				$attachments = explode('|', $attachments);
 
 				foreach ($attachments as $attachment_file) {
-					if (file_exists($attachment_file)) {
+					if ( file_exists($attachment_file) ) {
 						unlink($attachment_file);
 					}
 				}
@@ -144,7 +149,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -173,16 +178,18 @@
 		 * Deletes mailing list email queue, when it becomes cancelled
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
 			$status = $object->GetDBField('Status');
-			if (($status != $object->GetOriginalField('Status')) && ($status == MailingList::CANCELLED)) {
+			if ( ($status != $object->GetOriginalField('Status')) && ($status == MailingList::CANCELLED) ) {
 				$this->_deleteQueue($event);
 			}
 		}
Index: branches/5.2.x/core/units/theme_files/theme_file_eh.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/theme_files/theme_file_eh.php	(.../theme_file_eh.php)	(revision 15049)
+++ branches/5.2.x/core/units/theme_files/theme_file_eh.php	(.../theme_file_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: theme_file_eh.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: theme_file_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -59,7 +59,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -83,7 +83,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -102,8 +102,10 @@
 		 * Saves updated content to template
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -112,7 +114,7 @@
 
 			$filename = $this->_getTemplatePath($object);
 
-			if (file_exists($filename) && is_writable($filename)) {
+			if ( file_exists($filename) && is_writable($filename) ) {
 				$fp = fopen($filename, 'w');
 				fwrite($fp, $object->GetDBField('FileContents'));
 				fclose($fp);
Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15049)
+++ branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: configuration_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
@@ -86,7 +86,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			static $default_field_options = null;
 
@@ -181,14 +181,18 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Occurs after updating item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			static $skin_deleted = false;
 
+			parent::OnAfterItemUpdate($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
Index: branches/5.2.x/core/kernel/utility/event.php
===================================================================
diff -u -N -r14905 -r15065
--- branches/5.2.x/core/kernel/utility/event.php	(.../event.php)	(revision 14905)
+++ branches/5.2.x/core/kernel/utility/event.php	(.../event.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event.php 14905 2011-12-23 09:42:38Z alex $
+* @version	$Id: event.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -371,17 +371,10 @@
 		 * Allows to merge passed redirect params hash with existing ones
 		 *
 		 * @param Array $params
-		 * @param bool $overwrite
 		 * @access public
 		 */
-		public function setRedirectParams($params, $overwrite = false)
+		public function setRedirectParams($params)
 		{
-			if ($overwrite) {
-				$this->redirectParams = $params;
-
-				return ;
-			}
-
 			// append new parameters to parameters set before
 			$this->redirectParams = kUtil::array_merge_recursive($this->redirectParams, $params);
 		}
Index: branches/5.2.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: phrases_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
@@ -128,7 +128,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			parent::OnPreCreate($event);
 
@@ -142,8 +142,10 @@
 		 * Forces new label in case if issued from get link
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
@@ -203,13 +205,16 @@
 		 * Forces create to use live table
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			if ( $this->Application->GetVar($event->Prefix . '_label') ) {
-				$object =& $event->getObject( Array('skip_autoload' => true) );
+				$object =& $event->getObject(Array ('skip_autoload' => true));
+				/* @var $object kDBItem */
 
-				if ($this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id')) {
+				if ( $this->Application->GetVar('m_lang') != $this->Application->GetVar('lang_id') ) {
 					$object->SwitchToLive();
 				}
 
@@ -239,12 +244,14 @@
 		 * Returns to original template after phrase adding/editing
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function returnToOriginalTemplate(&$event)
+		protected function returnToOriginalTemplate(kEvent &$event)
 		{
 			$next_template = $this->Application->GetVar('next_template');
 
-			if ($next_template) {
+			if ( $next_template ) {
 				$event->redirect = $next_template;
 				$event->SetRedirectParam('opener', 's');
 			}
@@ -257,7 +264,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -291,7 +298,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -409,15 +416,17 @@
 		 * Saves changes & changes language
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveAndChangeLanguage(&$event)
+		protected function OnPreSaveAndChangeLanguage(kEvent &$event)
 		{
 			$label = $this->Application->GetVar($event->getPrefixSpecial() . '_label');
 
-			if ($label && !$this->UseTempTables($event)) {
+			if ( $label && !$this->UseTempTables($event) ) {
 				$phrase_id = $this->_getPhraseId($label);
 
-				if ($phrase_id) {
+				if ( $phrase_id ) {
 					$event->CallSubEvent('OnUpdate');
 					$event->SetRedirectParam('opener', 's');
 				}
@@ -426,15 +435,15 @@
 					$event->SetRedirectParam('opener', 's');
 				}
 
-				if ($event->status != kEvent::erSUCCESS) {
-					return ;
+				if ( $event->status != kEvent::erSUCCESS ) {
+					return;
 				}
 
 				$event->SetRedirectParam($event->getPrefixSpecial() . '_event', 'OnPreparePhrase');
 				$event->SetRedirectParam('pass_events', true);
 			}
 
-			if ($this->Application->GetVar('simple_mode')) {
+			if ( $this->Application->GetVar('simple_mode') ) {
 				$event->SetRedirectParam('simple_mode', 1);
 			}
 
@@ -446,8 +455,10 @@
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnEdit(&$event)
+		protected function OnEdit(kEvent &$event)
 		{
 			parent::OnEdit($event);
 
Index: branches/5.2.x/core/units/reviews/reviews_event_handler.php
===================================================================
diff -u -N -r15045 -r15065
--- branches/5.2.x/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 15045)
+++ branches/5.2.x/core/units/reviews/reviews_event_handler.php	(.../reviews_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: reviews_event_handler.php 15045 2012-01-16 13:56:58Z alex $
+* @version	$Id: reviews_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
@@ -265,7 +265,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -314,7 +314,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -335,7 +335,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -370,8 +370,10 @@
 		 * Updates item review counter
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			parent::OnAfterItemUpdate($event);
 
@@ -380,12 +382,12 @@
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
-			if ($this->Application->isAdminUser && !$object->IsTempTable()) {
+			if ( $this->Application->isAdminUser && !$object->IsTempTable() ) {
 				// send email on review status change from reviews grid in admin
 				$review_status = $object->GetDBField('Status');
 				$process_status = Array (STATUS_ACTIVE, STATUS_DISABLED);
 
-				if (($review_status != $object->GetOriginalField('Status')) && in_array($review_status, $process_status)) {
+				if ( ($review_status != $object->GetOriginalField('Status')) && in_array($review_status, $process_status) ) {
 					$this->_loadMainObject($event);
 
 					$email_event = $this->getPermPrefix($event) . '.REVIEW.' . ($review_status == STATUS_ACTIVE ? 'APPROVE' : 'DENY');
@@ -489,23 +491,28 @@
 			}
 		}
 
-
 		/**
 		 * Updates main item cached review counter
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
+			parent::OnAfterItemDelete($event);
+
 			$this->updateSubitemCounters($event);
 		}
 
 		/**
 		 * Creates review & redirect to confirmation template
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
Index: branches/5.2.x/core/units/languages/languages_event_handler.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 15049)
+++ branches/5.2.x/core/units/languages/languages_event_handler.php	(.../languages_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: languages_event_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: languages_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
@@ -221,8 +221,10 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
+			parent::OnBeforeItemUpdate($event);
+			
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -277,7 +279,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			parent::OnAfterItemCreate($event);
 
@@ -310,7 +312,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSave(&$event)
+		protected function OnSave(kEvent &$event)
 		{
 			parent::OnSave($event);
 
@@ -361,7 +363,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			parent::OnPreCreate($event);
 
@@ -386,7 +388,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteFromLive(&$event)
+		protected function OnBeforeDeleteFromLive(kEvent &$event)
 		{
 			parent::OnBeforeDeleteFromLive($event);
 
@@ -577,9 +579,13 @@
 		 * Do now allow deleting current language
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
+			parent::OnBeforeItemDelete($event);
+
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
@@ -592,8 +598,10 @@
 		 * Deletes phrases and email events on given language
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -610,6 +618,8 @@
 			// clean Phrases table
 			$fields_hash = Array (
 				'l' . $object->GetID() . '_Translation' => NULL,
+				'l' . $object->GetID() . '_HintTranslation' => NULL,
+				'l' . $object->GetID() . '_ColumnTranslation' => NULL,
 			);
 			$this->Conn->doUpdate($fields_hash, $this->Application->getUnitOption('phrases', 'TableName'), 1);
 		}
Index: branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
diff -u -N -r15045 -r15065
--- branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 15045)
+++ branches/5.2.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_eh.php 15045 2012-01-16 13:56:58Z alex $
+* @version	$Id: form_submissions_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -218,13 +218,15 @@
 		 * Creates new form submission from Front-End
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
 			parent::OnCreate($event);
 
-			if ($event->status != kEvent::erSUCCESS) {
-				return ;
+			if ( $event->status != kEvent::erSUCCESS ) {
+				return;
 			}
 
 			$object =& $event->getObject();
@@ -240,7 +242,7 @@
 
 			$notify_email = $form->GetDBField('SubmitNotifyEmail');
 
-			if ($notify_email) {
+			if ( $notify_email ) {
 				$send_params = Array (
 					'to_name' => $notify_email,
 					'to_email' => $notify_email,
@@ -260,7 +262,7 @@
 			$theme =& $this->Application->recallObject('theme.current');
 			/* @var $theme kDBItem */
 
-			$template = kUtil::unhtmlentities( $this->Application->GetVar('success_template') ); // kHTTPQuery do htmlspecialchars on everything
+			$template = kUtil::unhtmlentities($this->Application->GetVar('success_template')); // kHTTPQuery do htmlspecialchars on everything
 			$alias_template = $theme->GetField('TemplateAliases', $template);
 
 			$event->redirect = $alias_template ? $alias_template : $template;
@@ -273,7 +275,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -314,7 +316,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -328,12 +330,14 @@
 		 * Passes form_id, when using "Prev"/"Next" toolbar buttons
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveAndGo(&$event)
+		protected function OnPreSaveAndGo(kEvent &$event)
 		{
 			parent::OnPreSaveAndGo($event);
 
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->SetRedirectParam('pass', 'm,form,formsubs');
 			}
 		}
@@ -343,12 +347,14 @@
 		 * to passed tabs, by redirecting to it with OnPreSave event
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveAndGoToTab(&$event)
+		protected function OnPreSaveAndGoToTab(kEvent &$event)
 		{
 			parent::OnPreSaveAndGoToTab($event);
 
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( $event->status == kEvent::erSUCCESS ) {
 				$event->SetRedirectParam('pass', 'm,form,formsubs');
 			}
 		}
@@ -388,7 +394,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
Index: branches/5.2.x/core/units/fck/fck_eh.php
===================================================================
diff -u -N -r15042 -r15065
--- branches/5.2.x/core/units/fck/fck_eh.php	(.../fck_eh.php)	(revision 15042)
+++ branches/5.2.x/core/units/fck/fck_eh.php	(.../fck_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_eh.php 15042 2012-01-16 09:14:58Z alex $
+* @version	$Id: fck_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -221,7 +221,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnUploadFile(&$event)
+		protected function OnUploadFile(kEvent &$event)
 		{
 			$event->status = kEvent::erSTOP;
 
Index: branches/5.2.x/core/units/translator/translator_event_handler.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/units/translator/translator_event_handler.php	(.../translator_event_handler.php)	(revision 15049)
+++ branches/5.2.x/core/units/translator/translator_event_handler.php	(.../translator_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: translator_event_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: translator_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
@@ -137,7 +137,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreSave(&$event)
+		protected function OnPreSave(kEvent &$event)
 		{
 			$translator =& $event->getObject();
 			/* @var $translator kDBItem */
Index: branches/5.2.x/core/units/related_searches/related_searches_event_handler.php
===================================================================
diff -u -N -r14628 -r15065
--- branches/5.2.x/core/units/related_searches/related_searches_event_handler.php	(.../related_searches_event_handler.php)	(revision 14628)
+++ branches/5.2.x/core/units/related_searches/related_searches_event_handler.php	(.../related_searches_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: related_searches_event_handler.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: related_searches_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
@@ -17,11 +17,13 @@
 	class RelatedSearchEventHandler extends kDBEventHandler
 	{
 		/**
-		 * Initializes new relation
+		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
Index: branches/5.2.x/core/units/relationship/relationship_event_handler.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/relationship/relationship_event_handler.php	(.../relationship_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: relationship_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: relationship_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
@@ -38,8 +38,10 @@
 		 * Initializes new relation
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
@@ -130,7 +132,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -160,23 +162,24 @@
 		 * query
 		 *
 		 * @param kEvent $event
+		 * @return string
 		 * @access protected
 		 */
-		function ListPrepareQuery(&$event)
+		protected function ListPrepareQuery(kEvent &$event)
 		{
 			return $this->BaseQuery($event, 'ListSQLs');
 		}
 
 		/**
 		 * Creates needed sql query to load item,
 		 * if no query is defined in config for
-		 * special requested, then use default
-		 * query
+		 * special requested, then use list query
 		 *
 		 * @param kEvent $event
+		 * @return string
 		 * @access protected
 		 */
-		function ItemPrepareQuery(&$event)
+		protected function ItemPrepareQuery(kEvent &$event)
 		{
 			return $this->BaseQuery($event, 'ItemSQLs');
 		}
Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r15012 -r15065
--- branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15012)
+++ branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: email_events_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
@@ -107,9 +107,10 @@
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
 			parent::OnNew($event);
 
@@ -133,7 +134,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			parent::OnPreCreate($event);
 
@@ -170,31 +171,34 @@
 		 * Sets selected user to email events selected
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnSelectUser(&$event)
+		protected function OnSelectUser(kEvent &$event)
 		{
-			if ($event->Special != 'module') {
+			if ( $event->Special != 'module' ) {
 				parent::OnSelectUser($event);
-				return ;
+				return;
 			}
 
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
-				return ;
+				return;
 			}
 
 			$items_info = $this->Application->GetVar('u');
-			if ($items_info) {
-				$user_id = array_shift( array_keys($items_info) );
+			if ( $items_info ) {
+				$user_id = array_shift(array_keys($items_info));
 
 				$selected_ids = $this->getSelectedIDs($event, true);
 
-				$ids = $this->Application->RecallVar($event->getPrefixSpecial().'_selected_ids');
+				$ids = $this->Application->RecallVar($event->getPrefixSpecial() . '_selected_ids');
 				$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 				$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
-				$sql = 'UPDATE '.$table_name.'
-						SET '.$this->Application->RecallVar('dst_field').' = '.$user_id.'
-						WHERE '.$id_field.' IN ('.$ids.')';
+
+				$sql = 'UPDATE ' . $table_name . '
+						SET ' . $this->Application->RecallVar('dst_field') . ' = ' . $user_id . '
+						WHERE ' . $id_field . ' IN (' . $ids . ')';
 				$this->Conn->Query($sql);
 			}
 
@@ -935,8 +939,10 @@
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnEdit(&$event)
+		protected function OnEdit(kEvent &$event)
 		{
 			parent::OnEdit($event);
 
@@ -951,7 +957,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -1094,7 +1100,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -1108,7 +1114,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/core/units/groups/groups_event_handler.php
===================================================================
diff -u -N -r15012 -r15065
--- branches/5.2.x/core/units/groups/groups_event_handler.php	(.../groups_event_handler.php)	(revision 15012)
+++ branches/5.2.x/core/units/groups/groups_event_handler.php	(.../groups_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_event_handler.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: groups_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
@@ -61,7 +61,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSave(&$event)
+		protected function OnSave(kEvent &$event)
 		{
 			parent::OnSave($event);
 
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);
 
Index: branches/5.2.x/core/units/logs/change_logs/change_log_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/logs/change_logs/change_log_eh.php	(.../change_log_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/logs/change_logs/change_log_eh.php	(.../change_log_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: change_log_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: change_log_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -38,8 +38,10 @@
 	 * Updates affected record count in session, when change log record is deleted
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemDelete(&$event)
+	protected function OnAfterItemDelete(kEvent &$event)
 	{
 		parent::OnAfterItemDelete($event);
 
Index: branches/5.2.x/core/units/logs/session_logs/session_log_eh.php
===================================================================
diff -u -N -r14628 -r15065
--- branches/5.2.x/core/units/logs/session_logs/session_log_eh.php	(.../session_log_eh.php)	(revision 14628)
+++ branches/5.2.x/core/units/logs/session_logs/session_log_eh.php	(.../session_log_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: session_log_eh.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: session_log_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -82,11 +82,11 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
-			if ($event->Name == 'OnMassDelete' && $type == 'before') {
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
-				if ($ids) {
+				if ( $ids ) {
 					$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
 					$table_name = $this->Application->getUnitOption($event->Prefix, 'TableName');
 
@@ -104,8 +104,10 @@
 		 * Delete changes, related to deleted session
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
 			parent::OnAfterItemDelete($event);
 
@@ -117,7 +119,7 @@
 					WHERE SessionLogId = ' . $object->GetID();
 			$related_ids = $this->Conn->GetCol($sql);
 
-			if ($related_ids) {
+			if ( $related_ids ) {
 				$temp_handler =& $this->Application->recallObject('change-log_TempHandler', 'kTempTablesHandler');
 				/* @var $temp_handler kTempTablesHandler */
 
Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 15049)
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: cat_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
@@ -319,7 +319,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;
@@ -854,7 +854,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemUpdate(&$event)
+	protected function OnBeforeItemUpdate(kEvent &$event)
 	{
 		parent::OnBeforeItemUpdate($event);
 
@@ -891,7 +891,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemLoad(&$event)
+	protected function OnAfterItemLoad(kEvent &$event)
 	{
 		parent::OnAfterItemLoad($event);
 
@@ -959,10 +959,13 @@
 	 * Occurs after updating item
 	 *
 	 * @param kEvent $event
-	 * @access public
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemUpdate(&$event)
+	protected function OnAfterItemUpdate(kEvent &$event)
 	{
+		parent::OnAfterItemUpdate($event);
+
 		$this->CalculateHotLimit($event);
 
 		if ( substr($event->Special, -6) == 'import' ) {
@@ -1019,7 +1022,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(kEvent &$event)
 	{
 		parent::OnAfterItemCreate($event);
 
@@ -1882,26 +1885,28 @@
 	 * Shows export dialog
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnExport(&$event)
+	protected function OnExport(kEvent &$event)
 	{
 		$selected_ids = $this->StoreSelectedIDs($event);
-		if (implode(',', $selected_ids) == '') {
+		if ( implode(',', $selected_ids) == '' ) {
 			// K4 fix when no ids found bad selected ids array is formed
 			$selected_ids = false;
 		}
 
 		$selected_cats_ids = $this->Application->GetVar('export_categories');
 
-		$this->Application->StoreVar($event->Prefix.'_export_ids', $selected_ids ? implode(',', $selected_ids) : '' );
-		$this->Application->StoreVar($event->Prefix.'_export_cats_ids', $selected_cats_ids);
+		$this->Application->StoreVar($event->Prefix . '_export_ids', $selected_ids ? implode(',', $selected_ids) : '');
+		$this->Application->StoreVar($event->Prefix . '_export_cats_ids', $selected_cats_ids);
 
 		$export_helper =& $this->Application->recallObject('CatItemExportHelper');
 		/* @var $export_helper kCatDBItemExportHelper */
 
 		$redirect_params = Array (
-			$this->Prefix.'.export_event' => 'OnNew',
-			'pass' => 'all,'.$this->Prefix.'.export'
+			$this->Prefix . '.export_event' => 'OnNew',
+			'pass' => 'all,' . $this->Prefix . '.export'
 		);
 
 		$event->setRedirectParams($redirect_params);
@@ -1951,12 +1956,15 @@
 	 *
 	 * @param kEvent $event
 	 * @return Array
+	 * @access protected
 	 */
-	function getCustomExportColumns(&$event)
+	public function getCustomExportColumns(kEvent &$event)
 	{
-		return Array(	'__VIRTUAL__ThumbnailImage'	=>	'ThumbnailImage',
-						'__VIRTUAL__FullImage' 		=>	'FullImage',
-						'__VIRTUAL__ImageAlt'		=>	'ImageAlt');
+		return Array (
+			'__VIRTUAL__ThumbnailImage'	=>	'ThumbnailImage',
+			'__VIRTUAL__FullImage' 		=>	'FullImage',
+			'__VIRTUAL__ImageAlt'		=>	'ImageAlt'
+		);
 	}
 
 	/**
@@ -2043,8 +2051,10 @@
 	 * Prepares item for import/export operations
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnNew(&$event)
+	protected function OnNew(kEvent &$event)
 	{
 		parent::OnNew($event);
 
@@ -2132,8 +2142,8 @@
 	 */
 	function OnCancelAction(&$event)
 	{
-		$event->setRedirectParams(Array ('pass' => 'all,' . $event->getPrefixSpecial()), true);
 		$event->redirect = $this->Application->GetVar('cancel_template');
+		$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 	}
 
 /* === RELATED TO IMPORT/EXPORT: END === */
@@ -2175,7 +2185,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreSave(&$event)
+	protected function OnPreSave(kEvent &$event)
 	{
 		parent::OnPreSave($event);
 
@@ -2249,7 +2259,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnPreCreate(&$event)
+	protected function OnPreCreate(kEvent &$event)
 	{
 		parent::OnPreCreate($event);
 
@@ -2296,7 +2306,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeClone(&$event)
+	protected function OnBeforeClone(kEvent &$event)
 	{
 		parent::OnBeforeClone($event);
 
@@ -2317,7 +2327,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -2371,10 +2381,13 @@
 	 * Creates category item & redirects to confirmation template (front-end only)
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnCreate(&$event)
+	protected function OnCreate(kEvent &$event)
 	{
 		parent::OnCreate($event);
+
 		$this->SetFrontRedirectTemplate($event, 'suggest');
 	}
 
@@ -2538,7 +2551,7 @@
 	 */
 	function SetFrontRedirectTemplate(&$event, $template_key)
 	{
-		if ( $this->Application->isAdminUser || $event->status != kEvent::erSUCCESS ) {
+		if ( $this->Application->isAdmin || $event->status != kEvent::erSUCCESS ) {
 			return;
 		}
 
@@ -2580,7 +2593,7 @@
 	 * @return void
 	 * @access protected
 	 */
-	protected function iterateItems(&$event)
+	protected function iterateItems(kEvent &$event)
 	{
 		if ( $event->Name != 'OnMassApprove' && $event->Name != 'OnMassDecline' ) {
 			parent::iterateItems($event);
@@ -2626,12 +2639,14 @@
 	 * Deletes items & preserves clean env
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnDelete(&$event)
+	protected function OnDelete(kEvent &$event)
 	{
 		parent::OnDelete($event);
 
-		if ($event->status == kEvent::erSUCCESS && !$this->Application->isAdmin) {
+		if ( $event->status == kEvent::erSUCCESS && !$this->Application->isAdmin ) {
 			$event->SetRedirectParam('pass', 'm');
 			$event->SetRedirectParam('m_cat_id', 0);
 		}
@@ -2899,12 +2914,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 == 'fav') {
+		if ( $event->MasterEvent->Prefix == 'fav' ) {
 			$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
 			$subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix;
 
Index: branches/5.2.x/core/units/forms/drafts/draft_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/forms/drafts/draft_eh.php	(.../draft_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/forms/drafts/draft_eh.php	(.../draft_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: draft_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: draft_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -23,7 +23,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
Index: branches/5.2.x/core/units/permission_types/permission_type_eh.php
===================================================================
diff -u -N -r14662 -r15065
--- branches/5.2.x/core/units/permission_types/permission_type_eh.php	(.../permission_type_eh.php)	(revision 14662)
+++ branches/5.2.x/core/units/permission_types/permission_type_eh.php	(.../permission_type_eh.php)	(revision 15065)
@@ -20,8 +20,10 @@
 	 * Cant delete system permissions
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemDelete(&$event)
+	protected function OnBeforeItemDelete(kEvent &$event)
 	{
 		parent::OnBeforeItemDelete($event);
 
Index: branches/5.2.x/core/units/spam_reports/spam_report_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/spam_reports/spam_report_eh.php	(.../spam_report_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/spam_reports/spam_report_eh.php	(.../spam_report_eh.php)	(revision 15065)
@@ -56,8 +56,10 @@
 	 * Prefills missing fields
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeItemCreate(&$event)
+	protected function OnBeforeItemCreate(kEvent &$event)
 	{
 		parent::OnBeforeItemCreate($event);
 
@@ -79,8 +81,10 @@
 	 * Send e-mail after new spam report was created
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnAfterItemCreate(&$event)
+	protected function OnAfterItemCreate(kEvent &$event)
 	{
 		parent::OnAfterItemCreate($event);
 
Index: branches/5.2.x/core/units/site_domains/site_domain_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_domain_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: site_domain_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -194,7 +194,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSave(&$event)
+		protected function OnSave(kEvent &$event)
 		{
 			parent::OnSave($event);
 
@@ -226,7 +226,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 			parent::OnAfterItemLoad($event);
 
@@ -240,7 +240,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -254,7 +254,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
Index: branches/5.2.x/core/units/country_states/country_state_eh.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/country_states/country_state_eh.php	(.../country_state_eh.php)	(revision 14989)
+++ branches/5.2.x/core/units/country_states/country_state_eh.php	(.../country_state_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: country_state_eh.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: country_state_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -67,7 +67,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 			parent::OnBeforeItemCreate($event);
 
@@ -81,7 +81,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 			parent::OnBeforeItemUpdate($event);
 
@@ -116,8 +116,10 @@
 		 * Don't allow to delete countries, that have states
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
 			parent::OnBeforeItemDelete($event);
 
@@ -127,9 +129,9 @@
 			$cs_helper =& $this->Application->recallObject('CountryStatesHelper');
 			/* @var $cs_helper kCountryStatesHelper */
 
-			if ($cs_helper->CountryHasStates( $object->GetDBField('IsoCode') )) {
+			if ( $cs_helper->CountryHasStates($object->GetDBField('IsoCode')) ) {
 				$event->status = kEvent::erFAIL;
-				return ;
+				return;
 			}
 		}
 
Index: branches/5.2.x/core/units/permissions/permissions_event_handler.php
===================================================================
diff -u -N -r14989 -r15065
--- branches/5.2.x/core/units/permissions/permissions_event_handler.php	(.../permissions_event_handler.php)	(revision 14989)
+++ branches/5.2.x/core/units/permissions/permissions_event_handler.php	(.../permissions_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: permissions_event_handler.php 14989 2012-01-04 16:24:42Z alex $
+* @version	$Id: permissions_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
@@ -239,9 +239,13 @@
 	 * perform any sql queries here!
 	 *
 	 * @param kEvent $event
+	 * @return void
+	 * @access protected
 	 */
-	function OnBeforeDeleteFromLive(&$event)
+	protected function OnBeforeDeleteFromLive(kEvent &$event)
 	{
+		parent::OnBeforeDeleteFromLive($event);
+
 		if ( $event->Prefix == 'c-perm' ) {
 			// only when saving category permissions, not group permissions
 			$foreign_keys = $event->getEventParam('foreign_key');
Index: branches/5.2.x/core/units/user_groups/user_groups_eh.php
===================================================================
diff -u -N -r15012 -r15065
--- branches/5.2.x/core/units/user_groups/user_groups_eh.php	(.../user_groups_eh.php)	(revision 15012)
+++ branches/5.2.x/core/units/user_groups/user_groups_eh.php	(.../user_groups_eh.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_groups_eh.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: user_groups_eh.php 15065 2012-01-17 15:11:29Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -115,15 +115,15 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
-			if ($event->Name == 'OnMassDelete' && $type == 'before') {
+			if ( $event->Name == 'OnMassDelete' && $type == 'before' ) {
 				$ids = $event->getEventParam('ids');
 
-				if ($ids) {
-					$object =& $event->getObject( Array('skip_autoload' => true) );
+				if ( $ids ) {
+					$object =& $event->getObject(Array ('skip_autoload' => true));
 
-					if ($event->Prefix == 'u-ug') {
+					if ( $event->Prefix == 'u-ug' ) {
 						// allow deleting non-primary group of current user ($ids - groups)
 						$sql = 'SELECT PrimaryGroupId
 								FROM ' . $this->Application->GetTempName(TABLE_PREFIX . 'Users', 'prefix:u') . '
@@ -132,12 +132,12 @@
 
 						$index = array_search($primary_group_id, $ids);
 
-						if ($index !== false) {
+						if ( $index !== false ) {
 							unset($ids[$index]);
 							$event->setEventParam('ids', $ids);
 						}
 					}
-					elseif ($event->Prefix == 'g-ug') {
+					elseif ( $event->Prefix == 'g-ug' ) {
 						// allow deleting users from group record, then it's not their primary group ($ids - users)
 						$group_id = (int)$this->Application->GetVar('g_id');
 
Index: branches/5.2.x/core/units/config_search/config_search_event_handler.php
===================================================================
diff -u -N -r15012 -r15065
--- branches/5.2.x/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 15012)
+++ branches/5.2.x/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: config_search_event_handler.php 15012 2012-01-06 20:38:49Z alex $
+* @version	$Id: config_search_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
@@ -91,7 +91,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		function OnCancel(&$event)
+		protected function OnCancel(kEvent &$event)
 		{
 			parent::OnCancel($event);
 
Index: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r15049 -r15065
--- branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15049)
+++ branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15065)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 15049 2012-01-16 15:22:04Z alex $
+* @version	$Id: db_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
@@ -1337,9 +1337,10 @@
 		 * Set's new sorting for list
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnSetSorting(&$event)
+		protected function OnSetSorting(kEvent &$event)
 		{
 			$sorting_settings = $this->getListSetting($event, 'Sortings');
 			$cur_sort1 = getArrayValue($sorting_settings, 'Sort1');
@@ -1380,8 +1381,10 @@
 		 * Set sorting directly to session (used for category item sorting (front-end), grid sorting (admin, view menu)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnSetSortingDirect(&$event)
+		protected function OnSetSortingDirect(kEvent &$event)
 		{
 			// used on Front-End in category item lists
 			$prefix_special = $event->getPrefixSpecial();
@@ -1425,8 +1428,10 @@
 		 * Reset grid sorting to default (from config)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnResetSorting(&$event)
+		protected function OnResetSorting(kEvent &$event)
 		{
 			$this->setListSetting($event, 'Sortings');
 		}
@@ -1435,48 +1440,52 @@
 		 * Sets grid refresh interval
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnSetAutoRefreshInterval(&$event)
+		protected function OnSetAutoRefreshInterval(kEvent &$event)
 		{
 			$refresh_interval = $this->Application->GetVar('refresh_interval');
 
-			$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
-			$this->Application->StorePersistentVar($event->getPrefixSpecial().'_refresh_interval.'.$view_name, $refresh_interval);
+			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
+			$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_refresh_interval.' . $view_name, $refresh_interval);
 		}
 
 		/**
 		 * Changes auto-refresh state for grid
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAutoRefreshToggle(&$event)
+		protected function OnAutoRefreshToggle(kEvent &$event)
 		{
 			$refresh_intervals = $this->Application->ConfigValue('AutoRefreshIntervals');
-			if (!$refresh_intervals) {
-				return ;
+			if ( !$refresh_intervals ) {
+				return;
 			}
 
-			$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
-			$auto_refresh = $this->Application->RecallPersistentVar($event->getPrefixSpecial().'_auto_refresh.'.$view_name);
+			$view_name = $this->Application->RecallVar($event->getPrefixSpecial() . '_current_view');
+			$auto_refresh = $this->Application->RecallPersistentVar($event->getPrefixSpecial() . '_auto_refresh.' . $view_name);
 
-			if ($auto_refresh === false) {
+			if ( $auto_refresh === false ) {
 				$refresh_intervals = explode(',', $refresh_intervals);
-				$this->Application->StorePersistentVar($event->getPrefixSpecial().'_refresh_interval.'.$view_name, $refresh_intervals[0]);
+				$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_refresh_interval.' . $view_name, $refresh_intervals[0]);
 			}
 
-			$this->Application->StorePersistentVar($event->getPrefixSpecial().'_auto_refresh.'.$view_name, $auto_refresh ? 0 : 1);
+			$this->Application->StorePersistentVar($event->getPrefixSpecial() . '_auto_refresh.' . $view_name, $auto_refresh ? 0 : 1);
 		}
 
 		/**
 		 * Creates needed sql query to load item,
 		 * if no query is defined in config for
-		 * special requested, then use default
-		 * query
+		 * special requested, then use list query
 		 *
 		 * @param kEvent $event
+		 * @return string
 		 * @access protected
 		 */
-		function ItemPrepareQuery(&$event)
+		protected function ItemPrepareQuery(kEvent &$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -1496,16 +1505,17 @@
 		 * query
 		 *
 		 * @param kEvent $event
+		 * @return string
 		 * @access protected
 		 */
-		function ListPrepareQuery(&$event)
+		protected function ListPrepareQuery(kEvent &$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
 			$sqls = $object->getFormOption('ListSQLs', Array ());
 
-			return $sqls[ array_key_exists($event->Special, $sqls) ? $event->Special : '' ];
+			return $sqls[array_key_exists($event->Special, $sqls) ? $event->Special : ''];
 		}
 
 		/**
@@ -1516,7 +1526,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function customProcessing(&$event, $type)
+		protected function customProcessing(kEvent &$event, $type)
 		{
 
 		}
@@ -1527,33 +1537,36 @@
 		 * Creates new kDBItem
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnCreate(&$event)
+		protected function OnCreate(kEvent &$event)
 		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
-			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
-			if ($items_info) {
-				list($id,$field_values) = each($items_info);
-				$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
+			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+
+			if ( !$items_info ) {
+				return;
 			}
 
-			$this->customProcessing($event,'before');
+			list($id, $field_values) = each($items_info);
+			$object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values));
 
-			//look at kDBItem' Create for ForceCreateId description, it's rarely used and is NOT set by default
+			$this->customProcessing($event, 'before');
+
+			// look at kDBItem' Create for ForceCreateId description, it's rarely used and is NOT set by default
 			if ( $object->Create($event->getEventParam('ForceCreateId')) ) {
-				$this->customProcessing($event,'after');
-				$event->status=kEvent::erSUCCESS;
-				$event->setRedirectParams(Array('opener'=>'u'), true);
+				$this->customProcessing($event, 'after');
+				$event->SetRedirectParam('opener', 'u');
+				return;
 			}
-			else {
-				$event->status = kEvent::erFAIL;
-				$event->redirect = false;
-				$this->Application->SetVar($event->getPrefixSpecial().'_SaveEvent','OnCreate');
-				$object->setID($id);
-			}
+
+			$event->redirect = false;
+			$event->status = kEvent::erFAIL;
+			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
+			$object->setID($id);
 		}
 
 		/**
@@ -1612,16 +1625,17 @@
 		 * Delete's kDBItem object
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnDelete(&$event)
+		protected function OnDelete(kEvent &$event)
 		{
-			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
+			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
+			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($this->getPassedID($event)));
@@ -1631,14 +1645,16 @@
 		 * Deletes all records from table
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnDeleteAll(&$event)
+		protected function OnDeleteAll(kEvent &$event)
 		{
 			$sql = 'SELECT ' . $this->Application->getUnitOption($event->Prefix, 'IDField') . '
 					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName');
 			$ids = $this->Conn->GetCol($sql);
 
-			if ($ids) {
+			if ( $ids ) {
 				$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
 				/* @var $temp_handler kTempTablesHandler */
 
@@ -1650,19 +1666,20 @@
 		 * Prepares new kDBItem object
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnNew(&$event)
+		protected function OnNew(kEvent &$event)
 		{
-			$object =& $event->getObject( Array('skip_autoload' => true) );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
 			$object->Clear(0);
-			$this->Application->SetVar($event->getPrefixSpecial().'_SaveEvent', 'OnCreate');
+			$this->Application->SetVar($event->getPrefixSpecial() . '_SaveEvent', 'OnCreate');
 
-			if ($event->getEventParam('top_prefix') != $event->Prefix) {
+			if ( $event->getEventParam('top_prefix') != $event->Prefix ) {
 				// this is subitem prefix, so use main item special
-				$table_info = $object->getLinkedInfo( $this->getMainSpecial($event) );
+				$table_info = $object->getLinkedInfo($this->getMainSpecial($event));
 			}
 			else {
 				$table_info = $object->getLinkedInfo();
@@ -1680,7 +1697,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCancel(&$event)
+		protected function OnCancel(kEvent &$event)
 		{
 			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
@@ -1718,7 +1735,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;
@@ -1745,8 +1762,10 @@
 		 * Sets window id (of first opened edit window) to temp mark in uls
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function setTempWindowID(&$event)
+		protected function setTempWindowID(kEvent &$event)
 		{
 			$prefixes = Array ($event->Prefix, $event->getPrefixSpecial(true));
 
@@ -1766,18 +1785,20 @@
 		 * with items selected in the grid
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnEdit(&$event)
+		protected function OnEdit(kEvent &$event)
 		{
 			$this->setTempWindowID($event);
 			$ids = $this->StoreSelectedIDs($event);
 
-			$this->Application->RemoveVar( $this->_getPendingActionVariableName($event) );
+			$this->Application->RemoveVar($this->_getPendingActionVariableName($event));
 
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 			$this->Application->RemoveVar($changes_var_name);
 
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
+			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->PrepareEdit();
@@ -1795,12 +1816,12 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSave(&$event)
+		protected function OnSave(kEvent &$event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
-			if ($event->status != kEvent::erSUCCESS) {
-				return ;
+			if ( $event->status != kEvent::erSUCCESS ) {
+				return;
 			}
 
 			$skip_master = false;
@@ -1815,7 +1836,7 @@
 				if ( $live_ids === false ) {
 					// coping from table failed, because we have another coping process to same table, that wasn't finished
 					$event->status = kEvent::erFAIL;
-					return ;
+					return;
 				}
 
 				if ( $live_ids ) {
@@ -1835,14 +1856,22 @@
 
 			$this->clearSelectedIDs($event);
 
-			$event->setRedirectParams(Array ('opener' => 'u'), true);
+			$event->SetRedirectParam('opener', 'u');
 			$this->Application->RemoveVar($event->getPrefixSpecial() . '_modified');
 
 			// all temp tables are deleted here => all after hooks should think, that it's live mode now
 			$this->Application->SetVar($event->Prefix . '_mode', '');
 		}
 
-		function SaveLoggedChanges($changes_var_name, $save = true)
+		/**
+		 * Saves changes made in temporary table to log
+		 *
+		 * @param string $changes_var_name
+		 * @param bool $save
+		 * @return void
+		 * @access public
+		 */
+		public function SaveLoggedChanges($changes_var_name, $save = true)
 		{
 			// 1. get changes, that were made
 			$changes = $this->Application->RecallVar($changes_var_name);
@@ -1940,7 +1969,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnCancelEdit(&$event)
+		protected function OnCancelEdit(kEvent &$event)
 		{
 			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
 			/* @var $temp_handler kTempTablesHandler */
@@ -1961,8 +1990,9 @@
 		 *
 		 * @param kEvent $event
 		 * @return bool
+		 * @access public
 		 */
-		function isNewItemCreate(&$event)
+		public function isNewItemCreate(kEvent &$event)
 		{
 			$object =& $event->getObject( Array ('raise_warnings' => 0) );
 			/* @var $object kDBItem */
@@ -1978,7 +2008,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreSave(&$event)
+		protected function OnPreSave(kEvent &$event)
 		{
 			// if there is no id - it means we need to create an item
 			if ( is_object($event->MasterEvent) ) {
@@ -2003,13 +2033,15 @@
 		 * [HOOK] Saves sub-item
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveSubItem(&$event)
+		protected function OnPreSaveSubItem(kEvent &$event)
 		{
 			$not_created = $this->isNewItemCreate($event);
 
 			$event->CallSubEvent($not_created ? 'OnCreate' : 'OnUpdate');
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( $event->status == kEvent::erSUCCESS ) {
 				$object =& $event->getObject();
 				/* @var $object kDBItem */
 
@@ -2028,12 +2060,14 @@
 		 * Used in Prev/Next buttons
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveAndGo(&$event)
+		protected function OnPreSaveAndGo(kEvent &$event)
 		{
 			$event->CallSubEvent('OnPreSave');
 
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( $event->status == kEvent::erSUCCESS ) {
 				$id = $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoId');
 				$event->SetRedirectParam($event->getPrefixSpecial() . '_id', $id);
 			}
@@ -2044,12 +2078,15 @@
 		 * to passed tabs, by redirecting to it with OnPreSave event
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveAndGoToTab(&$event)
+		protected function OnPreSaveAndGoToTab(kEvent &$event)
 		{
 			$event->CallSubEvent('OnPreSave');
-			if ($event->status==kEvent::erSUCCESS) {
-				$event->redirect=$this->Application->GetVar($event->getPrefixSpecial(true).'_GoTab');
+
+			if ( $event->status == kEvent::erSUCCESS ) {
+				$event->redirect = $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoTab');
 			}
 		}
 
@@ -2058,13 +2095,16 @@
 		 * by redirecting to it with empty event
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnUpdateAndGoToTab(&$event)
+		protected function OnUpdateAndGoToTab(kEvent &$event)
 		{
 			$event->setPseudoClass('_List');
 			$event->CallSubEvent('OnUpdate');
-			if ($event->status==kEvent::erSUCCESS) {
-				$event->redirect=$this->Application->GetVar($event->getPrefixSpecial(true).'_GoTab');
+
+			if ( $event->status == kEvent::erSUCCESS ) {
+				$event->redirect = $this->Application->GetVar($event->getPrefixSpecial(true) . '_GoTab');
 			}
 		}
 
@@ -2077,13 +2117,13 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreCreate(&$event)
+		protected function OnPreCreate(kEvent &$event)
 		{
 			$this->setTempWindowID($event);
 			$this->clearSelectedIDs($event);
 			$this->Application->SetVar('m_lang', $this->Application->GetDefaultLanguageId());
 
-			$object =& $event->getObject( Array ('skip_autoload' => true) );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
 			$temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
@@ -2109,7 +2149,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreSaveCreated(&$event)
+		protected function OnPreSaveCreated(kEvent &$event)
 		{
 			$object =& $event->getObject( Array('skip_autoload' => true) );
 			/* @var $object kDBItem */
@@ -2137,7 +2177,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnReset(&$event)
+		protected function OnReset(kEvent &$event)
 		{
 			//do nothing - should reset :)
 			if ( $this->isNewItemCreate($event) ) {
@@ -2157,7 +2197,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;
@@ -2213,15 +2253,17 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Clones selected items in list
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnMassClone(&$event)
+		protected function OnMassClone(kEvent &$event)
 		{
 			if ( $this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1) ) {
 				$event->status = kEvent::erFAIL;
-				return ;
+				return;
 			}
 
 			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => &$event));
@@ -2236,13 +2278,23 @@
 			$this->clearSelectedIDs($event);
 		}
 
-		function check_array($records, $field, $value)
+		/**
+		 * Checks if given value is present in given array
+		 *
+		 * @param Array $records
+		 * @param string $field
+		 * @param mixed $value
+		 * @return bool
+		 * @access protected
+		 */
+		protected function check_array($records, $field, $value)
 		{
 			foreach ($records as $record) {
 				if ($record[$field] == $value) {
 					return true;
 				}
 			}
+
 			return false;
 		}
 
@@ -2253,7 +2305,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnPreSavePopup(&$event)
+		protected function OnPreSavePopup(kEvent &$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -2270,13 +2322,14 @@
 		// III. Events that allow to put some code before and after Update,Load,Create and Delete methods of item
 
 		/**
-		 * Occurse before loading item, 'id' parameter
-		 * allows to get id of item beeing loaded
+		 * Occurs before loading item, 'id' parameter
+		 * allows to get id of item being loaded
 		 *
 		 * @param kEvent $event
-		 * @access public
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemLoad(&$event)
+		protected function OnBeforeItemLoad(kEvent &$event)
 		{
 
 		}
@@ -2289,7 +2342,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemLoad(&$event)
+		protected function OnAfterItemLoad(kEvent &$event)
 		{
 
 		}
@@ -2301,7 +2354,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemCreate(&$event)
+		protected function OnBeforeItemCreate(kEvent &$event)
 		{
 
 		}
@@ -2313,7 +2366,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnAfterItemCreate(&$event)
+		protected function OnAfterItemCreate(kEvent &$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -2330,7 +2383,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(&$event)
+		protected function OnBeforeItemUpdate(kEvent &$event)
 		{
 
 		}
@@ -2339,9 +2392,10 @@
 		 * Occurs after updating item
 		 *
 		 * @param kEvent $event
-		 * @access public
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemUpdate(&$event)
+		protected function OnAfterItemUpdate(kEvent &$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
@@ -2356,21 +2410,23 @@
 		 * deleted is stored as 'id' event param
 		 *
 		 * @param kEvent $event
-		 * @access public
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeItemDelete(&$event)
+		protected function OnBeforeItemDelete(kEvent &$event)
 		{
 
 		}
 
 		/**
-		 * Occurse after deleting item, id of deleted item
+		 * Occurs after deleting item, id of deleted item
 		 * is stored as 'id' param of event
 		 *
 		 * @param kEvent $event
-		 * @access public
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterItemDelete(&$event)
+		protected function OnAfterItemDelete(kEvent &$event)
 		{
 
 		}
@@ -2400,12 +2456,14 @@
 		}
 
 		/**
-		 * Occures after an item has been copied to temp
+		 * Occurs after an item has been copied to temp
 		 * Id of copied item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterCopyToTemp(&$event)
+		protected function OnAfterCopyToTemp(kEvent &$event)
 		{
 
 		}
@@ -2419,29 +2477,33 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeDeleteFromLive(&$event)
+		protected function OnBeforeDeleteFromLive(kEvent &$event)
 		{
 
 		}
 
 		/**
-		 * Occures before an item is copied to live table (after all foreign keys have been updated)
+		 * Occurs before an item is copied to live table (after all foreign keys have been updated)
 		 * Id of item being copied is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeCopyToLive(&$event)
+		protected function OnBeforeCopyToLive(kEvent &$event)
 		{
 
 		}
 
 		/**
-		 * Occures after an item has been copied to live table
+		 * Occurs after an item has been copied to live table
 		 * Id of copied item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterCopyToLive(&$event)
+		protected function OnAfterCopyToLive(kEvent &$event)
 		{
 			$this->_proccessPendingActions($event);
 		}
@@ -2450,8 +2512,10 @@
 		 * Processing file pending actions (e.g. delete scheduled files)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function _proccessPendingActions(&$event)
+		protected function _proccessPendingActions(kEvent &$event)
 		{
 			$var_name = $this->_getPendingActionVariableName($event);
 			$schedule = $this->Application->RecallVar($var_name);
@@ -2461,7 +2525,7 @@
 
 				foreach ($schedule as $data) {
 					if ( $data['action'] == 'delete' ) {
-						unlink( $data['file'] );
+						unlink($data['file']);
 					}
 				}
 
@@ -2474,8 +2538,9 @@
 		 *
 		 * @param kEvent $event
 		 * @return string
+		 * @access protected
 		 */
-		function _getPendingActionVariableName(&$event)
+		protected function _getPendingActionVariableName(kEvent &$event)
 		{
 			$window_id = $this->Application->GetTopmostWid($event->Prefix);
 
@@ -2490,28 +2555,32 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeClone(&$event)
+		protected function OnBeforeClone(kEvent &$event)
 		{
 
 		}
 
 		/**
-		 * Occures after an item has been cloned
+		 * Occurs after an item has been cloned
 		 * Id of newly created item is passed as event' 'id' param
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterClone(&$event)
+		protected function OnAfterClone(kEvent &$event)
 		{
 
 		}
 
 		/**
-		 * Occures after list is queried
+		 * Occurs after list is queried
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnAfterListQuery(&$event)
+		protected function OnAfterListQuery(kEvent &$event)
 		{
 
 		}
@@ -2526,7 +2595,7 @@
 		 * @access protected
 		 * @deprecated
 		 */
-		protected function finalizePopup(&$event)
+		protected function finalizePopup(kEvent &$event)
 		{
 			$event->SetRedirectParam('opener', 'u');
 		}
@@ -2535,9 +2604,10 @@
 		 * Create search filters based on search query
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnSearch(&$event)
+		protected function OnSearch(kEvent &$event)
 		{
 			$event->setPseudoClass('_List');
 
@@ -2551,9 +2621,10 @@
 		 * Clear search keywords
 		 *
 		 * @param kEvent $event
+		 * @return void
 		 * @access protected
 		 */
-		function OnSearchReset(&$event)
+		protected function OnSearchReset(kEvent &$event)
 		{
 			$search_helper =& $this->Application->recallObject('SearchHelper');
 			/* @var $search_helper kSearchHelper */
@@ -2565,18 +2636,21 @@
 		 * Set's new filter value (filter_id meaning from config)
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 * @deprecated
 		 */
-		function OnSetFilter(&$event)
+		protected function OnSetFilter(kEvent &$event)
 		{
 			$filter_id = $this->Application->GetVar('filter_id');
 			$filter_value = $this->Application->GetVar('filter_value');
 
-			$view_filter = $this->Application->RecallVar($event->getPrefixSpecial().'_view_filter');
-			$view_filter = $view_filter ? unserialize($view_filter) : Array();
+			$view_filter = $this->Application->RecallVar($event->getPrefixSpecial() . '_view_filter');
+			$view_filter = $view_filter ? unserialize($view_filter) : Array ();
 
 			$view_filter[$filter_id] = $filter_value;
 
-			$this->Application->StoreVar( $event->getPrefixSpecial().'_view_filter', serialize($view_filter) );
+			$this->Application->StoreVar($event->getPrefixSpecial() . '_view_filter', serialize($view_filter));
 		}
 
 		/**
@@ -2586,7 +2660,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnSetFilterPattern(&$event)
+		protected function OnSetFilterPattern(kEvent &$event)
 		{
 			$filters = $this->Application->GetVar($event->getPrefixSpecial(true) . '_filters');
 			if ( !$filters ) {
@@ -2611,28 +2685,37 @@
 		 * Add/Remove all filters applied to list from "View" menu
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function FilterAction(&$event)
+		protected function FilterAction(kEvent &$event)
 		{
-			$view_filter = Array();
-			$filter_menu = $this->Application->getUnitOption($event->Prefix,'FilterMenu');
-			switch ($event->Name)
-			{
+			$view_filter = Array ();
+			$filter_menu = $this->Application->getUnitOption($event->Prefix, 'FilterMenu');
+
+			switch ($event->Name) {
 				case 'OnRemoveFilters':
 					$filter_value = 1;
 					break;
 
 				case 'OnApplyFilters':
 					$filter_value = 0;
 					break;
+
+				default:
+					$filter_value = 0;
+					break;
 			}
 
-			foreach($filter_menu['Filters'] as $filter_key => $filter_params)
-			{
-				if(!$filter_params) continue;
+			foreach ($filter_menu['Filters'] as $filter_key => $filter_params) {
+				if ( !$filter_params ) {
+					continue;
+				}
+
 				$view_filter[$filter_key] = $filter_value;
 			}
-			$this->Application->StoreVar( $event->getPrefixSpecial().'_view_filter', serialize($view_filter) );
+
+			$this->Application->StoreVar($event->getPrefixSpecial() . '_view_filter', serialize($view_filter));
 		}
 
 		/**
@@ -2641,7 +2724,7 @@
 		 * @param kEvent $event
 		 * @access protected
 		 */
-		protected function OnPreSaveAndOpenTranslator(&$event)
+		protected function OnPreSaveAndOpenTranslator(kEvent &$event)
 		{
 			$this->Application->SetVar('allow_translation', true);
 
@@ -2682,7 +2765,7 @@
 					'trans_multi_line'	=>	$this->Application->GetVar('translator_multi_line'),
 				);
 
-				$event->setRedirectParams($redirect_params, true);
+				$event->setRedirectParams($redirect_params);
 
 				// 1. SAVE LAST TEMPLATE TO SESSION (really needed here, because of tweaky redirect)
 				$last_template = $this->Application->RecallVar('last_template');
@@ -2695,8 +2778,10 @@
 		 * Makes all fields non-required
 		 *
 		 * @param kDBItem $object
+		 * @return void
+		 * @access protected
 		 */
-		function RemoveRequiredFields(&$object)
+		protected function RemoveRequiredFields(&$object)
 		{
 			// making all field non-required to achieve successful presave
 			$fields = array_keys( $object->getFields() );
@@ -2712,16 +2797,18 @@
 		 * Saves selected user in needed field
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnSelectUser(&$event)
+		protected function OnSelectUser(kEvent &$event)
 		{
 			$object =& $event->getObject();
 			/* @var $object kDBItem */
 
 			$items_info = $this->Application->GetVar('u');
 
 			if ( $items_info ) {
-				$user_id = array_shift( array_keys($items_info) );
+				$user_id = array_shift(array_keys($items_info));
 
 				$this->RemoveRequiredFields($object);
 
@@ -2755,17 +2842,19 @@
 		 * Shows export dialog
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnExport(&$event)
+		protected function OnExport(kEvent &$event)
 		{
 			$selected_ids = $this->StoreSelectedIDs($event);
 
-			if (implode(',', $selected_ids) == '') {
+			if ( implode(',', $selected_ids) == '' ) {
 				// K4 fix when no ids found bad selected ids array is formed
 				$selected_ids = false;
 			}
 
-			$this->Application->StoreVar($event->Prefix.'_export_ids', $selected_ids ? implode(',', $selected_ids) : '' );
+			$this->Application->StoreVar($event->Prefix . '_export_ids', $selected_ids ? implode(',', $selected_ids) : '');
 
 			$this->Application->LinkVar('export_finish_t');
 			$this->Application->LinkVar('export_progress_t');
@@ -2774,7 +2863,7 @@
 			$export_helper =& $this->Application->recallObject('CatItemExportHelper');
 
 			/*list ($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'));
-			$finish_url = $this->Application->BaseURL('/admin').$index_file.'?'.ENV_VAR_NAME.'='.$env;
+			$finish_url = $this->Application->BaseURL('/admin') . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
 			$this->Application->StoreVar('export_finish_url', $finish_url);*/
 
 			$redirect_params = Array (
@@ -2810,8 +2899,9 @@
 		 *
 		 * @param kEvent $event
 		 * @return Array
+		 * @access public
 		 */
-		function getCustomExportColumns(&$event)
+		public function getCustomExportColumns(kEvent &$event)
 		{
 			return Array();
 		}
@@ -2820,20 +2910,25 @@
 		 * Export form validation & processing
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnExportBegin(&$event)
+		protected function OnExportBegin(kEvent &$event)
 		{
 			$export_helper =& $this->Application->recallObject('CatItemExportHelper');
 			/* @var $export_helper kCatDBItemExportHelper */
+
 			$export_helper->OnExportBegin($event);
 		}
 
 		/**
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnExportCancel(&$event)
+		protected function OnExportCancel(kEvent &$event)
 		{
 			$this->OnGoBack($event);
 		}
@@ -2842,8 +2937,10 @@
 		 * Allows configuring export options
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeExportBegin(&$event)
+		protected function OnBeforeExportBegin(kEvent &$event)
 		{
 
 		}
@@ -2855,7 +2952,7 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnDeleteExportPreset(&$event)
+		protected function OnDeleteExportPreset(kEvent &$event)
 		{
 			$field_values = $this->getSubmittedFields($event);
 
@@ -2895,19 +2992,21 @@
 		 * Saves changes & changes language
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnPreSaveAndChangeLanguage(&$event)
+		protected function OnPreSaveAndChangeLanguage(kEvent &$event)
 		{
-			if ($this->UseTempTables($event)) {
+			if ( $this->UseTempTables($event) ) {
 				$event->CallSubEvent('OnPreSave');
 			}
 
-			if ($event->status == kEvent::erSUCCESS) {
+			if ( $event->status == kEvent::erSUCCESS ) {
 				$this->Application->SetVar('m_lang', $this->Application->GetVar('language'));
 
 				$data = $this->Application->GetVar('st_id');
 
-				if ($data) {
+				if ( $data ) {
 					$event->SetRedirectParam('st_id', $data);
 				}
 			}
@@ -2920,43 +3019,43 @@
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnUploadFile(&$event)
+		protected function OnUploadFile(kEvent &$event)
 		{
 			$event->status = kEvent::erSTOP;
 //			define('DBG_SKIP_REPORTING', 0);
 			$default_msg = "Flash requires that we output something or it won't fire the uploadSuccess event";
 
-			if (!$this->Application->HttpQuery->Post) {
+			if ( !$this->Application->HttpQuery->Post ) {
 				// Variables {field, id, flashsid} are always submitted through POST!
 				// When file size is larger, then "upload_max_filesize" (in php.ini),
 				// then these variables also are not submitted -> handle such case.
 				header('HTTP/1.0 413 File size exceeds allowed limit');
 				echo $default_msg;
-				return ;
+				return;
 			}
 
-			if (!$this->_checkFlashUploaderPermission($event)) {
+			if ( !$this->_checkFlashUploaderPermission($event) ) {
 				// 403 Forbidden
 				header('HTTP/1.0 403 You don\'t have permissions to upload');
 				echo $default_msg;
-				return ;
+				return;
 			}
 
 			$value = $this->Application->GetVar('Filedata');
 
-			if (!$value || ($value['error'] != UPLOAD_ERR_OK)) {
+			if ( !$value || ($value['error'] != UPLOAD_ERR_OK) ) {
 				// 413 Request Entity Too Large (file uploads disabled OR uploaded file was
 				// to large for web server to accept, see "upload_max_filesize" in php.ini)
 				header('HTTP/1.0 413 File size exceeds allowed limit');
 				echo $default_msg;
-				return ;
+				return;
 			}
 
 			$tmp_path = WRITEABLE . '/tmp/';
 			$fname = $value['name'];
 			$id = $this->Application->GetVar('id');
 
-			if ($id) {
+			if ( $id ) {
 				$fname = $id . '_' . $fname;
 			}
 
@@ -2968,30 +3067,30 @@
 			$upload_dir = $field_options['upload_dir'];
 			$storage_format = array_key_exists('storage_format', $field_options) ? $field_options['storage_format'] : false;
 
-			if (!is_writable($tmp_path)) {
+			if ( !is_writable($tmp_path) ) {
 				// 500 Internal Server Error
 				// check both temp and live upload directory
 				header('HTTP/1.0 500 Write permissions not set on the server');
 				echo $default_msg;
-				return ;
+				return;
 			}
 
 			$file_helper =& $this->Application->recallObject('FileHelper');
 			/* @var $file_helper FileHelper */
 
 			$fname = $file_helper->ensureUniqueFilename($tmp_path, $fname);
 
-			if ($storage_format) {
+			if ( $storage_format ) {
 				$image_helper =& $this->Application->recallObject('ImageHelper');
 				/* @var $image_helper ImageHelper */
 
 				move_uploaded_file($value['tmp_name'], $value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
 				$url = $image_helper->ResizeImage($value['tmp_name'] . '.jpg', $storage_format);
 				$tmp_name = preg_replace('/^' . preg_quote($this->Application->BaseURL(), '/') . '/', '/', $url);
-				rename($tmp_name, $tmp_path.$fname);
+				rename($tmp_name, $tmp_path . $fname);
 			}
 			else {
-				move_uploaded_file($value['tmp_name'], $tmp_path.$fname);
+				move_uploaded_file($value['tmp_name'], $tmp_path . $fname);
 			}
 
 			echo preg_replace('/^' . preg_quote($id, '/') . '_/', '', $fname);
@@ -3003,8 +3102,10 @@
 		 * Delete temporary files, that won't be used for sure
 		 *
 		 * @param string $path
+		 * @return void
+		 * @access protected
 		 */
-		function deleteTempFiles($path)
+		protected function deleteTempFiles($path)
 		{
 			$files = glob($path . '*.*');
 			$max_file_date = strtotime('-1 day');
@@ -3022,7 +3123,7 @@
 		 * @param kEvent $event
 		 * @return bool
 		 */
-		function _checkFlashUploaderPermission(&$event)
+		protected function _checkFlashUploaderPermission(kEvent &$event)
 		{
 			// Flash uploader does NOT send correct cookies, so we need to make our own check
 			$cookie_name = 'adm_' . $this->Application->ConfigValue('SessionCookieName');
@@ -3035,7 +3136,7 @@
 			$admin_ses =& $this->Application->recallObject('Session.admin');
 			/* @var $admin_ses Session */
 
-			if ($admin_ses->RecallVar('user_id') == USER_ROOT) {
+			if ( $admin_ses->RecallVar('user_id') == USER_ROOT ) {
 				return true;
 			}
 
@@ -3059,20 +3160,22 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Remembers, that file should be deleted on item's save from temp table
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnDeleteFile(&$event)
+		protected function OnDeleteFile(kEvent &$event)
 		{
 			$event->status = kEvent::erSTOP;
 
-			if (strpos($this->Application->GetVar('file'), '../') !== false) {
-				return ;
+			if ( strpos($this->Application->GetVar('file'), '../') !== false ) {
+				return;
 			}
 
-			$object =& $event->getObject( Array ('skip_autoload' => true) );
-			$options = $object->GetFieldOptions( $this->Application->GetVar('field') );
+			$object =& $event->getObject(Array ('skip_autoload' => true));
+			$options = $object->GetFieldOptions($this->Application->GetVar('field'));
 
 			$var_name = $this->_getPendingActionVariableName($event);
 			$schedule = $this->Application->RecallVar($var_name);
@@ -3082,28 +3185,30 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Returns url for viewing uploaded file
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnViewFile(&$event)
+		protected function OnViewFile(kEvent &$event)
 		{
 			$event->status = kEvent::erSTOP;
 
 			$file = $this->Application->GetVar('file');
-			if ((strpos($file, '../') !== false) || (trim($file) !== $file)) {
+			if ( (strpos($file, '../') !== false) || (trim($file) !== $file) ) {
 				// when relative paths or special chars are found template names from url, then it's hacking attempt
-				return ;
+				return;
 			}
 
-			$object =& $event->getObject( Array ('skip_autoload' => true));
+			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
 			$field = $this->Application->GetVar('field');
 			$options = $object->GetFieldOptions($field);
 
 			// set current uploaded file
-			if ($this->Application->GetVar('tmp')) {
+			if ( $this->Application->GetVar('tmp') ) {
 				$options['upload_dir'] = WRITEBALE_BASE . '/tmp/';
 				unset($options['include_path']);
 				$object->SetFieldOptions($field, $options);
@@ -3115,7 +3220,7 @@
 			}
 
 			// get url to uploaded file
-			if ($this->Application->GetVar('thumb')) {
+			if ( $this->Application->GetVar('thumb') ) {
 				$url = $object->GetField($field, $options['thumb_format']);
 			}
 			else {
@@ -3127,7 +3232,7 @@
 
 			$path = $file_helper->urlToPath($url);
 
-			if (!file_exists($path)) {
+			if ( !file_exists($path) ) {
 				exit;
 			}
 
@@ -3142,8 +3247,10 @@
 		 * Validates MInput control fields
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnValidateMInputFields(&$event)
+		protected function OnValidateMInputFields(kEvent &$event)
 		{
 			$minput_helper =& $this->Application->recallObject('MInputHelper');
 			/* @var $minput_helper MInputHelper */
@@ -3155,8 +3262,10 @@
 		 * Validates individual object field and returns the result
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnValidateField(&$event)
+		protected function OnValidateField(kEvent &$event)
 		{
 			$event->status = kEvent::erSTOP;
 			$field = $this->Application->GetVar('field');
@@ -3203,13 +3312,15 @@
 		 * Returns auto-complete values for ajax-dropdown
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnSuggestValues(&$event)
+		protected function OnSuggestValues(kEvent &$event)
 		{
-			if (!$this->Application->isAdminUser) {
+			if ( !$this->Application->isAdminUser ) {
 				// very careful here, because this event allows to
 				// view every object field -> limit only to logged-in admins
-				return ;
+				return;
 			}
 
 			$event->status = kEvent::erSTOP;
@@ -3220,19 +3331,19 @@
 
 			$object =& $event->getObject();
 
-			if (!$field || !$cur_value || !$object->isField($field)) {
-				return ;
+			if ( !$field || !$cur_value || !$object->isField($field) ) {
+				return;
 			}
 
 			$limit = $this->Application->GetVar('limit');
-			if (!$limit) {
+			if ( !$limit ) {
 				$limit = 20;
 			}
 
-			$sql = 'SELECT DISTINCT '.$field.'
-					FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
-					WHERE '.$field.' LIKE '.$this->Conn->qstr($cur_value.'%').'
-					ORDER BY '.$field.'
+			$sql = 'SELECT DISTINCT ' . $field . '
+					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+					WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($cur_value . '%') . '
+					ORDER BY ' . $field . '
 					LIMIT 0,' . $limit;
 			$data = $this->Conn->GetCol($sql);
 
@@ -3251,8 +3362,10 @@
 		 * Enter description here...
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnSaveWidths(&$event)
+		protected function OnSaveWidths(kEvent &$event)
 		{
 			$event->status = kEvent::erSTOP;
 
@@ -3277,8 +3390,10 @@
 		 * Event status is preset from import script.
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnBeforeCSVLineImport(&$event)
+		protected function OnBeforeCSVLineImport(kEvent &$event)
 		{
 			// abstract, for hooking
 		}
@@ -3287,8 +3402,10 @@
 		 * [HOOK] Allows to add cloned subitem to given prefix
 		 *
 		 * @param kEvent $event
+		 * @return void
+		 * @access protected
 		 */
-		function OnCloneSubItem(&$event)
+		protected function OnCloneSubItem(kEvent &$event)
 		{
 			$clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones');
 
@@ -3305,7 +3422,7 @@
 		 * @see PriorityEventHandler
 		 * @access protected
 		 */
-		protected function OnGetConstrainInfo(&$event)
+		protected function OnGetConstrainInfo(kEvent &$event)
 		{
 			$event->setEventParam('constrain_info', Array ('', ''));
 		}