Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r16435 -r16513
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 16435)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 16435 2016-11-18 10:46:05Z alex $
+* @version	$Id: application.php 16513 2017-01-20 14:10:53Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -450,8 +450,8 @@
 		}
 
 		// use makeClass over recallObject, since used before kApplication initialization during installation
+		/** @var kModulesHelper $modules_helper */
 		$modules_helper = $this->makeClass('ModulesHelper');
-		/* @var $modules_helper kModulesHelper */
 
 		$this->Conn->nextQueryCachable = true;
 		$sql = 'SELECT *
@@ -667,7 +667,7 @@
 
 		if ( !$this->siteDomain ) {
 			$this->siteDomain = $this->recallObject('site-domain.current', null, Array ('live_table' => true));
-			/* @var $site_domain kDBItem */
+			/** @var kDBItem $site_domain */
 		}
 
 		if ( $this->siteDomain->isLoaded() ) {
@@ -1033,8 +1033,8 @@
 			}
 		}
 		elseif ( $this->GetVar('admin') ) {
+			/** @var Session $admin_session */
 			$admin_session = $this->recallObject('Session.admin');
-			/* @var $admin_session Session */
 
 			// store Admin Console User's ID to Front-End's session for cross-session permission checks
 			$this->StoreVar('admin_user_id', (int)$admin_session->RecallVar('user_id'));
@@ -1055,8 +1055,8 @@
 		$t = $this->GetVar('render_template', $this->GetVar('t'));
 
 		if ( !$this->TemplatesCache->TemplateExists($t) && !$this->isAdmin ) {
+			/** @var CategoriesEventHandler $cms_handler */
 			$cms_handler = $this->recallObject('st_EventHandler');
-			/* @var $cms_handler CategoriesEventHandler */
 
 			$t = ltrim($cms_handler->GetDesignTemplate(), '/');
 
@@ -1335,8 +1335,8 @@
 	 */
 	public function GetSID()
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		return $session->GetID();
 	}
@@ -1350,8 +1350,8 @@
 	 */
 	public function DestroySession()
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$session->Destroy();
 	}
@@ -1521,8 +1521,8 @@
 	 */
 	public function StoreVar($var, $val, $optional = false)
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$this->Session->StoreVar($var, $val, $optional);
 	}
@@ -1554,8 +1554,8 @@
 	 */
 	public function StoreVarDefault($var, $val, $optional = false)
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$this->Session->StoreVarDefault($var, $val, $optional);
 	}
@@ -1623,8 +1623,8 @@
 	 */
 	public function ProcessParsedTag($prefix, $tag, $params)
 	{
+		/** @var kDBTagProcessor $processor */
 		$processor = $this->Parser->GetProcessor($prefix);
-		/* @var $processor kDBTagProcessor */
 
 		return $processor->ProcessParsedTag($tag, $params, $prefix);
 	}
@@ -1919,8 +1919,8 @@
 
 		// session expiration is called from session initialization,
 		// that's why $this->Session may be not defined here
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		if ( $this->InitDone ) {
 			// if redirect happened in the middle of application initialization don't call event,
@@ -2000,8 +2000,8 @@
 	 */
 	protected function ValidateLogin()
 	{
+		/** @var Session $session */
 		$session = $this->recallObject('Session');
-		/* @var $session Session */
 
 		$user_id = $session->GetField('PortalUserId');
 
@@ -2022,8 +2022,8 @@
 
 		if ( $this->GetVar('expired') == 1 ) {
 			// this parameter is set only from admin
+			/** @var UsersItem $user */
 			$user = $this->recallObject('u.login-admin', null, Array ('form_name' => 'login'));
-			/* @var $user UsersItem */
 
 			$user->SetError('UserLogin', 'session_expired', 'la_text_sess_expired');
 		}
@@ -2210,8 +2210,8 @@
 	 */
 	public function registerAggregateTag($tag_info)
 	{
+		/** @var kArray $aggregator */
 		$aggregator = $this->recallObject('TagsAggregator', 'kArray');
-		/* @var $aggregator kArray */
 
 		$tag_data = Array (
 			$tag_info['LocalPrefix'],
@@ -2535,8 +2535,8 @@
 	 */
 	protected function _email($email_template_name, $email_template_type, $to_user_id = null, $send_params = Array ())
 	{
+		/** @var kEmail $email */
 		$email = $this->makeClass('kEmail');
-		/* @var $email kEmail */
 
 		if ( !$email->findTemplate($email_template_name, $email_template_type) ) {
 			return false;
@@ -2570,8 +2570,8 @@
 	 */
 	public function CheckPermission($name, $type = 1, $cat_id = null)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		return $perm_helper->CheckPermission($name, $type, $cat_id);
 	}
@@ -2587,8 +2587,8 @@
 	 */
 	public function CheckAdminPermission($name, $type = 1, $cat_id = null)
 	{
+		/** @var kPermissionsHelper $perm_helper */
 		$perm_helper = $this->recallObject('PermissionsHelper');
-		/* @var $perm_helper kPermissionsHelper */
 
 		return $perm_helper->CheckAdminPermission($name, $type, $cat_id);
 	}
@@ -2609,8 +2609,8 @@
 			return;
 		}
 
+		/** @var kDBItem $visit */
 		$visit = $this->recallObject('visits', null, Array ('raise_warnings' => 0));
-		/* @var $visit kDBItem */
 
 		if ( $visit->isLoaded() ) {
 			$visit->SetDBField($field, $value);
@@ -2858,8 +2858,8 @@
 	 */
 	public function getCounter($name, $params = Array (), $query_name = null, $multiple_results = false)
 	{
+		/** @var kCountHelper $count_helper */
 		$count_helper = $this->recallObject('CountHelper');
-		/* @var $count_helper kCountHelper */
 
 		return $count_helper->getCounter($name, $params, $query_name, $multiple_results);
 	}
@@ -2877,8 +2877,8 @@
 			return;
 		}
 
+		/** @var kCountHelper $count_helper */
 		$count_helper = $this->recallObject('CountHelper');
-		/* @var $count_helper kCountHelper */
 
 		$count_helper->resetCounters($tables);
 	}