Index: branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php
===================================================================
diff -u -N -r16111 -r16519
--- branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 16111)
+++ branches/5.3.x/core/units/forms/form_submissions/form_submissions_eh.php	(.../form_submissions_eh.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_eh.php 16111 2014-12-07 14:49:01Z alex $
+* @version	$Id: form_submissions_eh.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -91,8 +91,8 @@
 
 			$config = $event->getUnitConfig();
 
+			/** @var InpCustomFieldsHelper $helper */
 			$helper = $this->Application->recallObject('InpCustomFieldsHelper');
-			/* @var $helper InpCustomFieldsHelper */
 
 			$sql = 'SELECT *
 					FROM ' . TABLE_PREFIX . 'FormFields
@@ -186,8 +186,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$object->addFilter('form_filter', '%1$s.FormId = ' . (int)$this->Application->GetVar('form_id'));
 		}
@@ -230,14 +230,14 @@
 				return;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// allows user to view only it's last submission
 			$this->Application->StoreVar('last_submission_id', $object->GetID());
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form =& $form_submission_helper->getForm($object);
 
@@ -260,8 +260,8 @@
 			$event->SetRedirectParam('opener', 's');
 			$event->SetRedirectParam('m_cat_id', 0);
 
+			/** @var kDBItem $theme */
 			$theme = $this->Application->recallObject('theme.current');
-			/* @var $theme kDBItem */
 
 			$template = $this->Application->unescapeRequestVariable($this->Application->GetVar('success_template'));
 			$alias_template = $theme->GetField('TemplateAliases', $template);
@@ -280,8 +280,8 @@
 		{
 			parent::OnBeforeItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('IPAddress', $this->Application->getClientIp());
 
@@ -296,15 +296,15 @@
 				$object->SetDBField('ReferrerURL', $referrer);
 			}
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form =& $form_submission_helper->getForm($object);
 
 			// validate captcha code
 			if ( $form->GetDBField('UseSecurityImage') && !$this->Application->LoggedIn() ) {
+				/** @var kCaptchaHelper $captcha_helper */
 				$captcha_helper = $this->Application->recallObject('CaptchaHelper');
-				/* @var $captcha_helper kCaptchaHelper */
 
 				$captcha_helper->validateCode($event, false);
 			}
@@ -321,8 +321,8 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->setRequired('MergeToSubmission', $object->GetDBField('IsMergeToSubmission'));
 		}
@@ -403,8 +403,8 @@
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$form_id = $object->GetDBField('FormId');
 			$email_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
@@ -413,8 +413,8 @@
 				return ;
 			}
 
+			/** @var kDBItem $merge_to */
 			$merge_to = $this->Application->recallObject($event->Prefix . '.merge-to', null, Array ('skip_autoload' => true));
-			/* @var $merge_to kDBItem */
 
 			$sql = $merge_to->GetSelectSQL() . ' WHERE (FormId = ' . $form_id . ') AND (' . $email_field . ' = ' . $this->Conn->qstr( $object->GetDBField($email_field) ) . ')';
 			$submissions = $this->Conn->Query($sql, $object->IDField);
@@ -431,8 +431,8 @@
 			$name_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_NAME);
 			$subject_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);
 
+			/** @var kDBItem $language */
 			$language = $this->Application->recallObject('lang.current');
-			/* @var $language kDBItem */
 
 			$date_format = $language->GetDBField('DateFormat');
 
@@ -488,8 +488,8 @@
 			parent::OnUpdate($event);
 
 			if ($event->status == kEvent::erSUCCESS) {
+				/** @var kDBItem $object */
 				$object = $event->getObject();
-				/* @var $object kDBItem */
 
 				$merge_to = $object->GetDBField('MergeToSubmission');
 
@@ -504,8 +504,8 @@
 						WHERE FormId = ' . $form_id;
 				$form_info = $this->Conn->GetRow($sql);
 
+				/** @var kDBItem $reply */
 				$reply = $this->Application->recallObject('submission-log.merge', null, Array ('skip_autoload' => true));
-				/* @var $reply kDBItem */
 
 				$email_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
 				$subject_field = $this->getFieldNameByRole($form_id, SubmissionFormField::COMMUNICATION_ROLE_SUBJECT);