Index: branches/5.3.x/core/units/users/users_tag_processor.php
===================================================================
diff -u -N -r16395 -r16519
--- branches/5.3.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 16395)
+++ branches/5.3.x/core/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 16519)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_tag_processor.php 16395 2016-11-12 12:43:14Z alex $
+* @version	$Id: users_tag_processor.php 16519 2017-01-20 20:21:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -35,8 +35,8 @@
 
 		function ConfirmPasswordLink($params)
 		{
+			/** @var UsersItem $user */
 			$user = $this->Application->recallObject($this->Prefix . '.email-to');
-			/* @var $user UsersItem */
 
 			$code = $this->getCachedCode();
 			$user->SetDBField('PwResetConfirm', $code);
@@ -75,8 +75,8 @@
 
 		function TestCodeIsValid($params)
 		{
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
-			/* @var $user_helper UserHelper */
 
 			$code_type = isset($params['code_type']) ? $params['code_type'] : 'forgot_password';
 			$expiration_timeout = isset($params['expiration_timeout']) ? $params['expiration_timeout'] : null;
@@ -85,7 +85,7 @@
 			if ( !is_numeric($user_id) ) {
 				// used for error reporting only -> rewrite code + theme (by Alex)
 		     	$object = $this->getObject( Array('skip_autoload' => true) ); // TODO: change theme too
-				/* @var $object UsersItem */
+				/** @var UsersItem $object */
 
 				$object->SetError('PwResetConfirm', $user_id, $this->_getUserCodeErrorMsg($user_id, $code_type, $params));
 
@@ -104,16 +104,16 @@
 		 */
 		protected function RestoreEmail($params)
 		{
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
-			/* @var $user_helper UserHelper */
 
 			$hash = $this->Application->GetVar('hash');
 			$error_code = $user_helper->restoreEmail($hash);
 
 			if ( $error_code ) {
 				// used for error reporting only -> rewrite code + theme (by Alex)
 				$object = $this->getObject(Array ('skip_autoload' => true)); // TODO: change theme too
-				/* @var $object UsersItem */
+				/** @var UsersItem $object */
 
 				$object->SetError('PwResetConfirm', 'restore', $params[$error_code]);
 
@@ -181,8 +181,8 @@
 		 */
 		protected function LoginName($params)
 		{
+			/** @var UsersItem $object */
 			$object = $this->getObject($params);
-			/* @var $object UsersItem */
 
 			return $object->GetID() != USER_ROOT ? $object->GetDBField('Username') : 'root';
 		}
@@ -212,8 +212,8 @@
 		 */
 		function HasPermission($params)
 		{
+			/** @var kPermissionsHelper $perm_helper */
 			$perm_helper = $this->Application->recallObject('PermissionsHelper');
-			/* @var $perm_helper kPermissionsHelper */
 
 			return $perm_helper->TagPermissionCheck($params);
 		}
@@ -242,8 +242,8 @@
 		{
 			static $loggedin_status = Array ();
 
+			/** @var kDBList $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBList */
 
 			if (!isset($loggedin_status[$this->Special])) {
 				$user_ids = $object->GetCol($object->IDField);
@@ -264,8 +264,8 @@
 		 */
 		function ActivationLink($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$code = $this->getCachedCode();
 			$object->SetDBField('PwResetConfirm', $code);
@@ -333,11 +333,11 @@
 		 */
 		protected function _updateAndLogin($fields_hash)
 		{
+			/** @var UserHelper $user_helper */
 			$user_helper = $this->Application->recallObject('UserHelper');
-			/* @var $user_helper UserHelper */
 
+			/** @var UsersItem $user */
 			$user = $this->Application->recallObject($this->Prefix . '.activate', null, Array ('skip_autoload' => true));
-			/* @var $user UsersItem */
 
 
 			$user->Load(trim($this->Application->GetVar('user_key')), 'PwResetConfirm');
@@ -369,8 +369,8 @@
 		 */
 		protected function UserTitle(array $params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			return $object->GetDBField('Email') ? $object->GetDBField('Email') : $object->GetDBField('Username');
 		}