Index: branches/5.2.x/core/units/forms/forms/forms_eh.php
===================================================================
diff -u -N -r16016 -r16513
--- branches/5.2.x/core/units/forms/forms/forms_eh.php	(.../forms_eh.php)	(revision 16016)
+++ branches/5.2.x/core/units/forms/forms/forms_eh.php	(.../forms_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: forms_eh.php 16016 2014-03-19 20:18:21Z alex $
+* @version	$Id: forms_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
@@ -181,8 +181,8 @@
 	 */
 	protected function OnFormSubmit($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$fields = explode(',',$this->Application->GetVar('fields'));
 		$required_fields = explode(',', $this->Application->GetVar('required_fields'));
@@ -297,8 +297,8 @@
 	 */
 	function _validatePopSettings($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$modes = Array ('Reply', 'Bounce');
 		$fields = Array ('Server', 'Port', 'Username', 'Password');
@@ -329,8 +329,8 @@
 					$connection_info[ strtolower($field) ] = $object->GetDBField($mode . $field);
 				}
 
+				/** @var POP3Helper $pop3_helper */
 				$pop3_helper = $this->Application->makeClass('POP3Helper', Array ($connection_info, 10));
-				/* @var $pop3_helper POP3Helper */
 
 				switch ( $pop3_helper->initMailbox(true) ) {
 					case 'socket':
@@ -357,8 +357,8 @@
 	 */
 	function _setRequired($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		$required = $object->GetDBField('EnableEmailCommunication');
 		$fields = Array (
@@ -380,8 +380,8 @@
 	 */
 	function _disableSecurityImage($event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject();
-		/* @var $object kDBItem */
 
 		if ($object->GetDBField('RequireLogin')) {
 			$object->SetDBField('UseSecurityImage', 0);
@@ -426,8 +426,8 @@
 				WHERE EnableEmailCommunication = 1';
 		$forms = $this->Conn->Query($sql, $id_field);
 
+		/** @var MailboxHelper $mailbox_helper */
 		$mailbox_helper = $this->Application->recallObject('MailboxHelper');
-		/* @var $mailbox_helper MailboxHelper */
 
 		$field_prefix = $bounce_mode ? 'Bounce' : 'Reply';
 
@@ -458,8 +458,8 @@
 
 	function isValidRecipient($params)
 	{
+		/** @var MailboxHelper $mailbox_helper */
 		$mailbox_helper = $this->Application->recallObject('MailboxHelper');
-		/* @var $mailbox_helper MailboxHelper */
 
 		$recipients = $mailbox_helper->getRecipients();
 		$recipient_email = $params['recipient_email'];
@@ -491,8 +491,8 @@
 		if ($params['bounce_mode']) {
 			// mark original message as bounced
 
+			/** @var MailboxHelper $mailbox_helper */
 			$mailbox_helper = $this->Application->recallObject('MailboxHelper');
-			/* @var $mailbox_helper MailboxHelper */
 
 			if (!array_key_exists('attachments', $mailbox_helper->parsedMessage)) {
 				// for now only parse bounces based on attachments, skip other bounce types
@@ -505,8 +505,8 @@
 				switch ($attachment['headers']['content-type']) {
 					case 'message/delivery-status':
 						// save as BounceInfo
+						/** @var MimeDecodeHelper $mime_decode_helper */
 						$mime_decode_helper = $this->Application->recallObject('MimeDecodeHelper');
-						/* @var $mime_decode_helper MimeDecodeHelper */
 
 						$charset = $mailbox_helper->parsedMessage[ $fields_hash['MessageType'] ][0]['charset'];
 						$fields_hash['Message'] = $mime_decode_helper->convertEncoding($charset, $attachment['data']);
@@ -564,8 +564,8 @@
 					// remove object, because it's linked to single form upon creation forever
 					$this->Application->removeObject('formsubs.-item');
 
+					/** @var kDBItem $form_submission */
 					$form_submission = $this->Application->recallObject('formsubs.-item', null, Array ('skip_autoload' => true));
-					/* @var $form_submission kDBItem */
 
 					// in case that other non-role mapped fields are required
 					$form_submission->IgnoreValidation = true;
@@ -592,8 +592,8 @@
 			return false;
 		}
 
+		/** @var kDBItem $reply_to */
 		$reply_to = $this->Application->recallObject('submission-log.-reply-to', null, Array ('skip_autoload' => true));
-		/* @var $reply_to kDBItem */
 
 		$reply_to->Load($regs[2], 'VerifyCode');
 		if (!$reply_to->isLoaded()) {
@@ -612,8 +612,8 @@
 			return true;
 		}
 
+		/** @var kDBItem $reply */
 		$reply = $this->Application->recallObject('submission-log.-reply', null, Array ('skip_autoload' => true));
-		/* @var $reply kDBItem */
 
 		$reply->SetDBFieldsFromHash($fields_hash);
 		$reply->SetDBField('ReplyTo', $reply_to->GetID());