Index: branches/5.3.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r16111 -r16519
--- branches/5.3.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 16111)
+++ branches/5.3.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 16111 2014-12-07 14:49:01Z alex $
+* @version	$Id: user_helper.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -59,8 +59,8 @@
 			$super_admin = ($username == 'super-root') && $this->verifySuperAdmin();
 
 			if ( $this->Application->isAdmin && ($username == 'root') || ($super_admin && $username == 'super-root') ) {
+				/** @var kPasswordFormatter $password_formatter */
 				$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-				/* @var $password_formatter kPasswordFormatter */
 
 				if ( !$password_formatter->checkPasswordFromSetting('RootPass', $password) ) {
 					return LoginResult::INVALID_PASSWORD;
@@ -296,8 +296,8 @@
 			$user_id = USER_GUEST;
 			$this->Application->SetVar('u.current_id', $user_id);
 
+			/** @var UsersItem $object */
 			$object = $this->Application->recallObject('u.current', null, Array('skip_autoload' => true));
-			/* @var $object UsersItem */
 
 			$object->Load($user_id);
 
@@ -347,8 +347,8 @@
 					return md5($user_info['Password']) == $password;
 				}
 				else {
+					/** @var kPasswordFormatter $password_formatter */
 					$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-					/* @var $password_formatter kPasswordFormatter */
 
 					$hashing_method = $user_info['PasswordHashingMethod'];
 
@@ -375,8 +375,8 @@
 		 */
 		protected function _fixUserPassword($user_id, $password)
 		{
+			/** @var kPasswordFormatter $password_formatter */
 			$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-			/* @var $password_formatter kPasswordFormatter */
 
 			$fields_hash = Array (
 				'Password' => $password_formatter->hashPassword($password),
@@ -408,8 +408,8 @@
 			}
 
 			// synchronize login
+			/** @var UsersSyncronizeManager $sync_manager */
 			$sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array (), Array ('InPortalSyncronize'));
-			/* @var $sync_manager UsersSyncronizeManager */
 
 			if ( isset($username) && isset($password) ) {
 				$sync_manager->performAction('LoginUser', $username, $password);
@@ -542,8 +542,8 @@
 		{
 			$prefix_special = $this->Application->isAdmin ? 'u.current' : 'u'; // "u" used on front not to change theme
 
+			/** @var UsersItem $object */
 			$object = $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true));
-			/* @var $object UsersItem */
 
 			return $object;
 		}
@@ -712,8 +712,8 @@
 			$email_to_restore = $prev_emails[$hash];
 			unset($prev_emails[$hash]);
 
+			/** @var UsersItem $object */
 			$object = $this->Application->recallObject('u.email-restore', null, Array ('skip_autoload' => true));
-			/* @var $object UsersItem */
 
 			$object->Load($user_info['PortalUserId']);
 			$object->SetDBField('PrevEmails', serialize($prev_emails));