Index: branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php
===================================================================
diff -u -N -r16016 -r16513
--- branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php	(.../submission_log_eh.php)	(revision 16016)
+++ branches/5.2.x/core/units/forms/submission_log/submission_log_eh.php	(.../submission_log_eh.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: submission_log_eh.php 16016 2014-03-19 20:18:21Z alex $
+* @version	$Id: submission_log_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
@@ -75,17 +75,17 @@
 		{
 			parent::OnNew($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $form_submission */
 			$form_submission = $this->Application->recallObject('formsubs');
-			/* @var $form_submission kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
+			/** @var kDBItem $form */
 			$form =& $form_submission_helper->getForm($form_submission);
-			/* @var $form kDBItem */
 
 			$from_email = $form->GetDBField('ReplyFromEmail');
 			$to_email = $form_submission_helper->getFieldByRole($form_submission, SubmissionFormField::COMMUNICATION_ROLE_EMAIL);
@@ -106,8 +106,8 @@
 
 			$ids = $this->StoreSelectedIDs($event);
 			if ( $ids ) {
+				/** @var kDBItem $org_message */
 				$org_message = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $org_message kDBItem */
 
 				$org_message->Load(array_shift($ids));
 				// client could reply from different email, so compare to admin email!
@@ -212,8 +212,8 @@
 				return ;
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			$sql = 'SELECT f.ReplyFromEmail, sl.' . $object->IDField . '
 					FROM ' . $object->TableName . ' sl
@@ -277,11 +277,11 @@
 		 */
 		function _validateRecipients($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			$cc = $object->GetDBField('Cc');
 
@@ -329,8 +329,8 @@
 				$this->_generateVerificationCode($object);
 			}
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 			$form =& $form_submission_helper->getForm($form_submission);
@@ -351,8 +351,8 @@
 				$send_params['to_name'] = $to_name;
 			}
 
+			/** @var kEmailSendingHelper $esender */
 			$esender = $this->Application->recallObject('EmailSender');
-			/* @var $esender kEmailSendingHelper */
 
 			$esender->SetReturnPath( $form->GetDBField('BounceEmail') );
 
@@ -391,8 +391,8 @@
 			$object->SetDBField('BounceDate_time', NULL);
 
 			if ($object->GetDBField('DraftId')) {
+				/** @var kTempTablesHandler $temp_handler */
 				$temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
-				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems('draft', '', Array ($object->GetDBField('DraftId')));
 				$object->SetDBField('DraftId', 0);
@@ -413,8 +413,8 @@
 		{
 			parent::OnAfterItemCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$this->_sendEmail($object); // send email
 
@@ -427,8 +427,8 @@
 
 			if ( $reply_to ) {
 				// this is reply to other message -> mark it as replied
+				/** @var kDBItem $org_message */
 				$org_message = $this->Application->recallObject($event->Prefix . '.-item', null, Array ('skip_autoload' => true));
-				/* @var $org_message kDBItem */
 
 				$org_message->Load($reply_to);
 				$org_message->SetDBField('ReplyStatus', SUBMISSION_LOG_REPLIED);
@@ -450,11 +450,11 @@
 		 */
 		function _getLastMessageId($event, $from_client = false)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 
@@ -480,8 +480,8 @@
 
 			$this->_updateSubmission($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// send out email event to admin for bouncing
 			$sent_status = $object->GetDBField('SentStatus');
@@ -498,8 +498,8 @@
 		 */
 		function _updateStatusDates($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$now = adodb_mktime();
 
@@ -525,11 +525,11 @@
 		 */
 		function _updateSubmission($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
+			/** @var FormSubmissionHelper $form_submission_helper */
 			$form_submission_helper = $this->Application->recallObject('FormSubmissionHelper');
-			/* @var $form_submission_helper FormSubmissionHelper */
 
 			$form_submission = $form_submission_helper->getSubmissionFromLog($object);
 
@@ -571,11 +571,11 @@
 		 */
 		function OnSaveDraft($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
@@ -615,11 +615,11 @@
 		 */
 		function OnUseDraft($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
@@ -653,11 +653,11 @@
 		 */
 		function OnDeleteDraft($event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
+			/** @var kDBItem $draft */
 			$draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true));
-			/* @var $draft kDBItem */
 
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if ($items_info) {
@@ -676,8 +676,8 @@
 	 				// get existing draft for given submission and user
 	 				$draft->Load($load_keys);
 					if ($draft->isLoaded()) {
+						/** @var kTempTablesHandler $temp_handler */
 						$temp_handler = $this->Application->recallObject('draft_TempHandler', 'kTempTablesHandler');
-						/* @var $temp_handler kTempTablesHandler */
 
 						$temp_handler->DeleteItems('draft', '', Array ($draft->GetID()));
 					}