Index: branches/5.3.x/units/posts/post_eh.php
===================================================================
diff -u -N -r16397 -r16521
--- branches/5.3.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 16397)
+++ branches/5.3.x/units/posts/post_eh.php	(.../post_eh.php)	(revision 16521)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: post_eh.php 16397 2016-11-12 17:36:29Z alex $
+* @version	$Id: post_eh.php 16521 2017-01-20 20:26:22Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -45,8 +45,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$user_id = $this->Application->RecallVar('user_id');
 
@@ -68,8 +68,8 @@
 			$object->SetDBField('PosterAlias', $this->Conn->GetOne($sql));
 
 			// set post options
+			/** @var PostHelper $post_helper */
 			$post_helper = $this->Application->recallObject('PostHelper');
-			/* @var $post_helper PostHelper */
 
 			$options_map = $post_helper->getOptionsMap();
 			$post_options = $object->GetDBField('Options');
@@ -91,8 +91,8 @@
 		 */
 		function checkPostPermission($event, $permissions)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT ci.CategoryId, p.CreatedById
 					FROM '.$object->TableName.' p
@@ -101,8 +101,8 @@
 					WHERE p.'.$object->IDField.' = '.$object->GetID();
 			$post_info = $this->Conn->GetRow($sql);
 
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			$is_owner = $post_info['CreatedById'] == $this->Application->RecallVar('user_id');
 			$params['permissions'] = 'TOPIC.REPLY.MODIFY|TOPIC.REPLY.OWNER.MODIFY';
@@ -122,17 +122,17 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$perm_status = $this->checkPostPermission($event, 'TOPIC.REPLY.MODIFY|TOPIC.REPLY.OWNER.MODIFY');
 			if ( !$perm_status ) {
 				$event->status = kEvent::erFAIL;
 				return;
 			}
 
+			/** @var PostHelper $post_helper */
 			$post_helper = $this->Application->recallObject('PostHelper');
-			/* @var $post_helper PostHelper */
 
 			$options_map = $post_helper->getOptionsMap();
 			$post_options = $object->GetDBField('Options');
@@ -171,8 +171,8 @@
 		{
 			parent::OnBeforeItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->checkPostPermission($event, 'TOPIC.REPLY.OWNER.DELETE|TOPIC.REPLY.DELETE') ) {
 				$event->status = kEvent::erFAIL;
@@ -190,11 +190,11 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var PostHelper $post_helper */
 			$post_helper = $this->Application->recallObject('PostHelper');
-			/* @var $post_helper PostHelper */
 
 			$options_map = $post_helper->getOptionsMap();
 			$post_options = $object->GetDBField('Options');
@@ -216,22 +216,22 @@
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$parent_prefix = $event->getUnitConfig()->getParentPrefix();
 
+			/** @var kCatDBItem $main_object */
 			$main_object = $this->Application->recallObject($parent_prefix);
-			/* @var $main_object kCatDBItem */
 
 			if ( $this->Application->LoggedIn() ) {
 				// Update user posts counter.
 				$user_posts = $this->Application->RecallPersistentVar('bb_posts');
 				$this->Application->StorePersistentVar('bb_posts', $user_posts + 1);
 			}
 
+			/** @var PostHelper $post_helper */
 			$post_helper = $this->Application->recallObject('PostHelper');
-			/* @var $post_helper PostHelper */
 
 			$category_id = $this->Application->GetVar('m_cat_id');
 			$post_helper->PropagateCategoryField($category_id, 'Modified', $object->GetDBField('CreatedOn'));
@@ -281,8 +281,8 @@
 		 */
 		function updateTopicInfo($event, &$main_object)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$main_object->SetDBField('Modified_date', $object->GetDBField('Modified'));
 			$main_object->SetDBField('Modified_time', $object->GetDBField('Modified'));
@@ -341,17 +341,17 @@
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$topic_id = $object->GetDBField('TopicId');
 			if ( !$topic_id ) {
 				// deleting post from non-existing topic
 				return;
 			}
 
+			/** @var PostHelper $post_helper */
 			$post_helper = $this->Application->recallObject('PostHelper');
-			/* @var $post_helper PostHelper */
 
 			// update posts count in topic
 			$post_helper->updatePostCount($topic_id, -1);
@@ -363,8 +363,8 @@
 			$this->Conn->Query($sql);
 
 
+			/** @var kCatDBItem $main_object */
 			$main_object = $this->Application->recallObject('bb.-item', null, Array ('skip_autoload' => true));
-			/* @var $main_object kCatDBItem */
 
 			$main_object->Load($topic_id);
 
@@ -445,11 +445,11 @@
 			$reply_to = $this->Application->GetVar('reply_to');
 
 			if ( $reply_to > 0 ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
+				/** @var kDBItem $source_post */
 				$source_post = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $source_post kDBItem */
 
 				$source_post->Load($reply_to);