Index: branches/5.2.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r16434 -r16513
--- branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 16434)
+++ branches/5.2.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 16434 2016-11-18 10:30:05Z alex $
+* @version	$Id: admin_events_handler.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -82,14 +82,14 @@
 			$perm_value = $this->Application->isAdminUser;
 		}
 
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->Application->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		$csv_events = Array ('OnCSVImportBegin', 'OnCSVImportStep', 'OnExportCSV', 'OnGetCSV');
 
 		if ( in_array($event->Name, $csv_events) ) {
+			/** @var kCSVHelper $csv_helper */
 			$csv_helper = $this->Application->recallObject('CSVHelper');
-			/* @var $csv_helper kCSVHelper */
 
 			$prefix = $csv_helper->getPrefix(stripos($event->Name, 'import') !== false);
 
@@ -175,8 +175,8 @@
 
 		$this->OnResetParsedData($event);
 
+		/** @var SkinHelper $skin_helper */
 		$skin_helper = $this->Application->recallObject('SkinHelper');
-		/* @var $skin_helper SkinHelper */
 
 		$skin_helper->deleteCompiled();
 	}
@@ -229,8 +229,8 @@
 	 */
 	protected function OnCompileTemplates(kEvent $event)
 	{
+		/** @var NParserCompiler $compiler */
 		$compiler = $this->Application->recallObject('NParserCompiler');
-		/* @var $compiler NParserCompiler */
 
 		$compiler->CompileTemplatesStep();
 		$event->status = kEvent::erSTOP;
@@ -490,8 +490,8 @@
 			$event->status = kEvent::erSTOP;
 		}
 
+		/** @var kThemesHelper $themes_helper */
 		$themes_helper = $this->Application->recallObject('ThemesHelper');
-		/* @var $themes_helper kThemesHelper */
 
 		$themes_helper->refreshThemes();
 
@@ -607,8 +607,8 @@
 	 */
 	protected function OnExportCSV(kEvent $event)
 	{
+		/** @var kCSVHelper $csv_helper */
 		$csv_helper = $this->Application->recallObject('CSVHelper');
-		/* @var $csv_helper kCSVHelper */
 
 		$csv_helper->PrefixSpecial = $csv_helper->getPrefix(false);
 		$csv_helper->grid = $this->Application->GetVar('grid');
@@ -625,8 +625,8 @@
 	 */
 	protected function OnGetCSV(kEvent $event)
 	{
+		/** @var kCSVHelper $csv_helper */
 		$csv_helper = $this->Application->recallObject('CSVHelper');
-		/* @var $csv_helper kCSVHelper */
 
 		$csv_helper->GetCSV();
 	}
@@ -640,8 +640,8 @@
 	 */
 	protected function OnCSVImportBegin(kEvent $event)
 	{
+		/** @var kDBItem $object */
 		$object = $event->getObject(Array ('skip_autoload' => true));
-		/* @var $object kDBItem */
 
 		$object->setID(0);
 		$field_values = $this->getSubmittedFields($event);
@@ -652,8 +652,8 @@
 		$result = 'required';
 
 		if ( $object->GetDBField('ImportFile') ) {
+			/** @var kCSVHelper $csv_helper */
 			$csv_helper = $this->Application->recallObject('CSVHelper');
-			/* @var $csv_helper kCSVHelper */
 
 			$csv_helper->PrefixSpecial = $csv_helper->getPrefix(true);
 			$csv_helper->grid = $this->Application->GetVar('grid');
@@ -681,8 +681,8 @@
 	 */
 	protected function OnCSVImportStep(kEvent $event)
 	{
+		/** @var kCSVHelper $import_helper */
 		$import_helper = $this->Application->recallObject('CSVHelper');
-		/* @var $import_helper kCSVHelper */
 
 		$import_helper->ImportStep();
 		$event->status = kEvent::erSTOP;
@@ -755,8 +755,8 @@
 	 */
 	protected function OnBackup(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		if ( !$backup_helper->initBackup() ) {
 			$event->status = kEvent::erFAIL;
@@ -774,8 +774,8 @@
 	 */
 	protected function OnBackupProgress(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$done_percent = $backup_helper->performBackup();
 
@@ -809,8 +809,8 @@
 	 */
 	protected function OnRestore(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$backup_helper->initRestore();
 		$event->redirect = 'tools/restore3';
@@ -825,8 +825,8 @@
 	 */
 	protected function OnRestoreProgress(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$done_percent = $backup_helper->performRestore();
 
@@ -869,8 +869,8 @@
 	 */
 	protected function OnDeleteBackup(kEvent $event)
 	{
+		/** @var BackupHelper $backup_helper */
 		$backup_helper = $this->Application->recallObject('BackupHelper');
-		/* @var $backup_helper BackupHelper */
 
 		$backup_helper->delete();
 	}
@@ -1001,8 +1001,8 @@
 			}
 		}
 
+		/** @var JSONHelper $json_helper */
 		$json_helper = $this->Application->recallObject('JSONHelper');
-		/* @var $json_helper JSONHelper */
 
 		echo $json_helper->encode($ret);
 	}
@@ -1032,8 +1032,8 @@
 			$ret['result'] = $res ? 'OK' : 'FAILED';
 		}
 
+		/** @var JSONHelper $json_helper */
 		$json_helper = $this->Application->recallObject('JSONHelper');
-		/* @var $json_helper JSONHelper */
 
 		echo $json_helper->encode($ret);
 	}
@@ -1074,8 +1074,8 @@
 	 */
 	protected function _deploymentAction(kEvent $event, $dry_run = false)
 	{
+		/** @var DeploymentHelper $deployment_helper */
 		$deployment_helper = $this->Application->recallObject('DeploymentHelper');
-		/* @var $deployment_helper DeploymentHelper */
 
 		$deployment_helper->setEvent($event);