Index: branches/5.2.x/core/units/email_templates/email_template_eh.php
===================================================================
diff -u -N -r16415 -r16513
--- branches/5.2.x/core/units/email_templates/email_template_eh.php	(.../email_template_eh.php)	(revision 16415)
+++ branches/5.2.x/core/units/email_templates/email_template_eh.php	(.../email_template_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_template_eh.php 16415 2016-11-13 20:59:35Z alex $
+* @version	$Id: email_template_eh.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -91,8 +91,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			if ( $event->Special == 'module' ) {
 				$module = $this->Application->GetVar('module');
@@ -122,11 +122,11 @@
 			$mapping = Array ('conf' => 'VariableValue', 'site-domain' => 'DefaultEmailRecipients');
 
 			if ( isset($mapping[$event->Special]) ) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
+				/** @var kDBList $target_object */
 				$target_object = $this->Application->recallObject($event->Special);
-				/* @var $target_object kDBList */
 
 				$object->SetDBField('Recipients', $target_object->GetDBField($mapping[$event->Special]));
 			}
@@ -143,8 +143,8 @@
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('Headers', $this->Application->ConfigValue('Smtp_DefaultHeaders'));
 			$this->setRequired($event);
@@ -267,8 +267,8 @@
 				return;
 			}
 
+			/** @var MailingListHelper $mailing_list_helper */
 			$mailing_list_helper = $this->Application->recallObject('MailingListHelper');
-			/* @var $mailing_list_helper MailingListHelper */
 
 			$mailing_list_helper->processQueue($messages);
 
@@ -342,8 +342,8 @@
 		{
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->isDebugMode(false) ) {
 				if ( $object->GetDBField('AllowChangingRecipient') ) {
@@ -363,8 +363,8 @@
 				$records[] = Array ('Tag' => $tag, 'Replacement' => $replacement);
 			}
 
+			/** @var MInputHelper $minput_helper */
 			$minput_helper = $this->Application->recallObject('MInputHelper');
-			/* @var $minput_helper MInputHelper */
 
 			$xml = $minput_helper->prepareMInputXML($records, Array ('Tag', 'Replacement'));
 			$object->SetDBField('ReplacementTagsXML', $xml);
@@ -379,8 +379,8 @@
 		 */
 		function _itemChanged($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( !$this->Application->isDebugMode(false) ) {
 				// only allow to enable/disable event while in debug mode
@@ -406,8 +406,8 @@
 
 			// process replacement tags
 			if ( $object->GetDBField('ReplacementTagsXML') ) {
+				/** @var MInputHelper $minput_helper */
 				$minput_helper = $this->Application->recallObject('MInputHelper');
-				/* @var $minput_helper MInputHelper */
 
 				$replacement_tags = Array ();
 				$records = $minput_helper->parseMInputXML($object->GetDBField('ReplacementTagsXML'));
@@ -436,8 +436,8 @@
 		 */
 		protected function setRequired(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$language_prefix = 'l' . $this->Application->GetVar('m_lang') . '_';
 
@@ -559,8 +559,8 @@
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// validate email subject and body for parsing errors
 			$this->_validateEmailTemplate($object);
@@ -583,8 +583,8 @@
 		 */
 		protected function _validateEmailTemplate($object)
 		{
+			/** @var kEmailTemplateHelper $email_template_helper */
 			$email_template_helper = $this->Application->recallObject('kEmailTemplateHelper');
-			/* @var $email_template_helper kEmailTemplateHelper */
 
 			$email_template_helper->parseField($object, 'Subject');
 			$email_template_helper->parseField($object, 'HtmlBody');
@@ -601,8 +601,8 @@
 		 */
 		protected function _validateAddress($event, $field_prefix)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$address_type = $object->GetDBField($field_prefix . 'AddressType');
 			$object->setRequired($field_prefix . 'Address', $address_type > 0);
@@ -700,8 +700,8 @@
 		{
 			parent::OnAfterItemDelete($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT SubscriptionId
 					FROM ' . TABLE_PREFIX . 'SystemEventSubscriptions
@@ -712,8 +712,8 @@
 				return;
 			}
 
+			/** @var kTempTablesHandler $temp_handler */
 			$temp_handler = $this->Application->recallObject('system-event-subscription_TempHandler', 'kTempTablesHandler');
-			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems('system-event-subscription', '', $ids);
 		}
@@ -727,8 +727,8 @@
 		 */
 		protected function OnSend(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject(Array ('skip_autoload' => true));
-			/* @var $object kDBItem */
 
 			$ids = $this->StoreSelectedIDs($event);