Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r16417 -r16513
--- branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 16417)
+++ branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 16513)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 16417 2016-11-13 21:29:34Z alex $
+* @version	$Id: configuration_event_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
@@ -59,8 +59,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			$module = $this->Application->GetVar('module');
 			$section = $this->Application->GetVar('section');
@@ -92,8 +92,8 @@
 		{
 			parent::OnPreCreate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$object->SetDBField('Section', $this->Application->GetVar('section'));
 			$object->SetDBField('ModuleOwner', $this->Application->GetVar('module'));
@@ -112,8 +112,8 @@
 
 			parent::OnAfterItemLoad($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// ability to validate each configuration variable separately
 			if ( !isset($default_field_options) ) {
@@ -141,14 +141,14 @@
 		{
 			parent::OnBeforeItemValidate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// if password field is empty, then don't update
 			if ( $object->GetDBField('ElementType') == 'password' ) {
 				if ( trim($object->GetDBField('VariableValue')) != '' ) {
+					/** @var kPasswordFormatter $password_formatter */
 					$password_formatter = $this->Application->recallObject('kPasswordFormatter');
-					/* @var $password_formatter kPasswordFormatter */
 
 					$object->SetDBField('VariableValue', $password_formatter->hashPassword($object->GetDBField('VariableValue')));
 				}
@@ -179,8 +179,8 @@
 				$object->SetDBField('VariableValue', $email_event_data[0]['Recipients']);
 			}
 
+			/** @var kSectionsHelper $sections_helper */
 			$sections_helper = $this->Application->recallObject('SectionsHelper');
-			/* @var $sections_helper kSectionsHelper */
 
 			$section = $object->GetDBField('Section');
 
@@ -197,8 +197,8 @@
 		 */
 		protected function _processCountryState(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$country_iso = $this->_getCountryByState($event);
 			$state_name = $object->GetDBField('VariableValue');
@@ -207,8 +207,8 @@
 				return;
 			}
 
+			/** @var kCountryStatesHelper $cs_helper */
 			$cs_helper = $this->Application->recallObject('CountryStatesHelper');
-			/* @var $cs_helper kCountryStatesHelper */
 
 			$state_iso = $cs_helper->getStateIso($state_name, $country_iso);
 
@@ -230,8 +230,8 @@
 		 */
 		protected function _getCountryByState(kEvent $event)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$variable_name = $object->GetDBField('VariableName');
 
@@ -265,8 +265,8 @@
 		{
 			parent::OnBeforeItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			// if password field is empty, then don't update
 			if ( $object->GetDBField('ElementType') == 'password' && trim($object->GetDBField('VariableValue')) == '' ) {
@@ -287,8 +287,8 @@
 
 			parent::OnAfterItemUpdate($event);
 
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			if ( $object->GetDBField('ElementType') == 'password' && trim($object->GetDBField('VariableValue')) == '' ) {
 				$object->SetFieldOption('VariableValue', 'skip_empty', 0);
@@ -317,8 +317,8 @@
 			if ( $variable_name == 'Require_AdminSSL' || $variable_name == 'AdminSSL_URL' ) {
 				// when administrative console is moved to SSL mode, then delete skin
 				if ( in_array($variable_name, $changed) && !$skin_deleted ) {
+					/** @var SkinHelper $skin_helper */
 					$skin_helper = $this->Application->recallObject('SkinHelper');
-					/* @var $skin_helper SkinHelper */
 
 					$skin_file = $skin_helper->getSkinPath();
 					if ( file_exists($skin_file) ) {
@@ -381,8 +381,8 @@
 				unset($items_info['ModuleRootCategory']);
 			}
 
+			/** @var kDBItem $object */
 			$object = $event->getObject( Array('skip_autoload' => true) );
-			/* @var $object kDBItem */
 
 			if ( $items_info ) {
 				$has_error = false;
@@ -493,8 +493,8 @@
 				$template = $this->Application->ConfigValue('HardMaintenanceTemplate');
 			}
 
+			/** @var kCurlHelper $curl_helper */
 			$curl_helper = $this->Application->recallObject('CurlHelper');
-			/* @var $curl_helper kCurlHelper */
 
 			$html = $curl_helper->Send($this->Application->BaseURL() . '?t=' . $template);
 
@@ -518,8 +518,8 @@
 		 */
 		protected function getAutoCompleteSuggestions(kEvent $event, $term)
 		{
+			/** @var kDBItem $object */
 			$object = $event->getObject();
-			/* @var $object kDBItem */
 
 			$field = $this->Application->GetVar('field');